Confronta il testo

Trova la differenza tra due file di testo

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Strumenti

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Generic Oauth Authenticate Method

Created 5 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

78 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

88 lines

@gen.coroutine

##Version 0.8.0 of the oauthenticator.generic.GenericOAuthenticator.authenticate method

##https://github.com/jupyterhub/oauthenticator/blob/0.8.0/oauthenticator/generic.py

##Modifications noted

@gen.coroutine

def authenticate(self, handler, data=None):

print("Doing custom authenticate method") ##CHANGE

code = handler.get_argument("code")

# TODO: Configure the curl_httpclient for tornado

http_client = AsyncHTTPClient()

params = dict(

redirect_uri=self.get_callback_url(handler),

code=code,

grant_type='authorization_code'

)

params.update(self.extra_params)

if self.token_url:

url = self.token_url

else:

raise ValueError("Please set the OAUTH2_TOKEN_URL environment variable")

b64key = base64.b64encode(

bytes(

"{}:{}".format(self.client_id, self.client_secret),

"utf8"

)

headers = {

"Accept": "application/json",

"User-Agent": "JupyterHub",

"Authorization": "Basic {}".format(b64key.decode("utf8"))

}

req = HTTPRequest(url,

method="POST",

headers=headers,

validate_cert=self.tls_verify,

body=urllib.parse.urlencode(params) # Body is required for a POST...

)

resp = yield http_client.fetch(req)

resp_json = json.loads(resp.body.decode('utf8', 'replace'))

access_token = resp_json['access_token']

refresh_token = resp_json.get('refresh_token', None)

token_type = resp_json['token_type']

scope = (resp_json.get('scope', '')).split(' ')

token_resp = resp_json ##CHANGED: Store original response. AWS sends additional data we need like the idToken

# Determine who the logged in user is

headers = {

"Accept": "application/json",

"User-Agent": "JupyterHub",

"Authorization": "{} {}".format(token_type, access_token)

}

if self.userdata_url:

url = url_concat(self.userdata_url, self.userdata_params)

else:

raise ValueError("Please set the OAUTH2_USERDATA_URL environment variable")

req = HTTPRequest(url,

method=self.userdata_method,

headers=headers,

validate_cert=self.tls_verify,

)

resp = yield http_client.fetch(req)

resp_json = json.loads(resp.body.decode('utf8', 'replace'))

if not resp_json.get(self.username_key):

self.log.error("OAuth user contains no key %s: %s", self.username_key, resp_json)

return

return {

##CHANGED: Store return value for easier debugging

retval = {

'name': resp_json.get(self.username_key),

'auth_state': {

'access_token': access_token,

'refresh_token': refresh_token,

'oauth_user': resp_json,

'scope': scope,

}

'token_resp': token_resp, ##CHANGED: Return the extra information

}

return retval

Diff salvati

Testo originale

Apri file

@gen.coroutine
    def authenticate(self, handler, data=None):
        code = handler.get_argument("code")
        # TODO: Configure the curl_httpclient for tornado
        http_client = AsyncHTTPClient()

params = dict(
            redirect_uri=self.get_callback_url(handler),
            code=code,
            grant_type='authorization_code'
        )
        params.update(self.extra_params)

if self.token_url:
            url = self.token_url
        else:
            raise ValueError("Please set the OAUTH2_TOKEN_URL environment variable")

b64key = base64.b64encode(
            bytes(
                "{}:{}".format(self.client_id, self.client_secret),
                "utf8"
            )
        )

headers = {
            "Accept": "application/json",
            "User-Agent": "JupyterHub",
            "Authorization": "Basic {}".format(b64key.decode("utf8"))
        }
        req = HTTPRequest(url,
                          method="POST",
                          headers=headers,
                          validate_cert=self.tls_verify,
                          body=urllib.parse.urlencode(params)  # Body is required for a POST...
                          )

resp = yield http_client.fetch(req)

resp_json = json.loads(resp.body.decode('utf8', 'replace'))

# Determine who the logged in user is
        headers = {
            "Accept": "application/json",
            "User-Agent": "JupyterHub",
            "Authorization": "{} {}".format(token_type, access_token)
        }
        if self.userdata_url:
            url = url_concat(self.userdata_url, self.userdata_params)
        else:
            raise ValueError("Please set the OAUTH2_USERDATA_URL environment variable")

req = HTTPRequest(url,
                          method=self.userdata_method,
                          headers=headers,
                          validate_cert=self.tls_verify,
                          )
        resp = yield http_client.fetch(req)
        resp_json = json.loads(resp.body.decode('utf8', 'replace'))

if not resp_json.get(self.username_key):
            self.log.error("OAuth user contains no key %s: %s", self.username_key, resp_json)
            return

return {
            'name': resp_json.get(self.username_key),
            'auth_state': {
                'access_token': access_token,
                'refresh_token': refresh_token,
                'oauth_user': resp_json,
                'scope': scope,
            }
        }

Testo modificato

Apri file

##Version 0.8.0 of the oauthenticator.generic.GenericOAuthenticator.authenticate method
    ##https://github.com/jupyterhub/oauthenticator/blob/0.8.0/oauthenticator/generic.py
    ##Modifications noted
    @gen.coroutine
    def authenticate(self, handler, data=None):
        print("Doing custom authenticate method")  ##CHANGE

code = handler.get_argument("code")
        # TODO: Configure the curl_httpclient for tornado
        http_client = AsyncHTTPClient()

params = dict(
            redirect_uri=self.get_callback_url(handler),
            code=code,
            grant_type='authorization_code'
        )
        params.update(self.extra_params)

if self.token_url:
            url = self.token_url
        else:
            raise ValueError("Please set the OAUTH2_TOKEN_URL environment variable")

b64key = base64.b64encode(
            bytes(
                "{}:{}".format(self.client_id, self.client_secret),
                "utf8"
            )
        )

resp = yield http_client.fetch(req)

resp_json = json.loads(resp.body.decode('utf8', 'replace'))

access_token = resp_json['access_token']
        refresh_token = resp_json.get('refresh_token', None)
        token_type = resp_json['token_type']
        scope = (resp_json.get('scope', '')).split(' ')
        token_resp = resp_json  ##CHANGED: Store original response. AWS sends additional data we need like the idToken

if not resp_json.get(self.username_key):
            self.log.error("OAuth user contains no key %s: %s", self.username_key, resp_json)
            return

##CHANGED: Store return value for easier debugging
        retval = {
            'name': resp_json.get(self.username_key),
            'auth_state': {
                'access_token': access_token,
                'refresh_token': refresh_token,
                'oauth_user': resp_json,
                'scope': scope,
                'token_resp': token_resp,  ##CHANGED: Return the extra information
            },
        }

return retval