Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introspection fixes #310

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Introspection fixes #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0577e50
Merge pull request #286 from impak-finance/issue-285
juanifioren Sep 29, 2018
64e395c
Revert "Fixed #285 -- Ensured standard and custom claims can be used …
juanifioren Sep 29, 2018
22cda50
Merge pull request #287 from juanifioren/revert-286-issue-285
juanifioren Sep 29, 2018
2028290
Merge branch 'master' of https://github.com/juanifioren/django-oidc-p…
juanifioren Oct 17, 2018
f0daed0
Merge branch 'develop' of https://github.com/juanifioren/django-oidc-…
juanifioren Oct 17, 2018
b06358a
- Fix INTROSPECTION_VALIDATE_AUDIENCE_SCOPE when user related token
esneil Jan 3, 2019
c3292aa
- Add scope to response dict for checking permissions
esneil Jan 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion oidc_provider/lib/endpoints/introspection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def validate_params(self):

self.id_token = self.token.id_token

if settings.get('OIDC_INTROSPECTION_VALIDATE_AUDIENCE_SCOPE'):
if settings.get('OIDC_INTROSPECTION_VALIDATE_AUDIENCE_SCOPE') and self.token.user:
if not self.token.id_token:
logger.debug('[Introspection] Token not an authentication token: %s',
self.params['token'])
Expand All @@ -85,6 +85,7 @@ def create_response_dic(self):
response_dic[k] = self.id_token[k]
response_dic['active'] = True
response_dic['client_id'] = self.token.client.client_id
response_dic['scope'] = ' '.join(self.token.scope)

response_dic = run_processing_hook(response_dic,
'OIDC_INTROSPECTION_PROCESSING_HOOK',
Expand Down
7 changes: 4 additions & 3 deletions oidc_provider/lib/utils/token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,12 @@ def create_id_token(token, user, aud, nonce='', at_hash='', request=None, scope=

# Inlude (or not) user standard claims in the id_token.
if settings.get('OIDC_IDTOKEN_INCLUDE_CLAIMS'):
standard_claims = StandardScopeClaims(token)
dic.update(standard_claims.create_response_dic())
if settings.get('OIDC_EXTRA_SCOPE_CLAIMS'):
custom_claims = settings.get('OIDC_EXTRA_SCOPE_CLAIMS', import_str=True)(token)
dic.update(custom_claims.create_response_dic())
claims = custom_claims.create_response_dic()
else:
claims = StandardScopeClaims(token).create_response_dic()
dic.update(claims)

dic = run_processing_hook(
dic, 'OIDC_IDTOKEN_PROCESSING_HOOK',
Expand Down