Skip to content

Do not allow hashed secret to be passed in via client #1078

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

Closed
wants to merge 2 commits into from
Closed

Do not allow hashed secret to be passed in via client #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1336eb
Do not allow hashed secret to be passed in via client
pkarman Jan 8, 2022
e15825e
changelog
pkarman Jan 8, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* #651 Batch expired token deletions in `cleartokens` management command
* Added pt-BR translations.
* #729 Add support for [hashed client_secret values](https://django-oauth-toolkit.readthedocs.io/en/latest/settings.html#client-secret-hasher).
* #1077 Bug fix for hashed client secrets
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for an added changelog entry here as it's just a bug fix for a feature that has not yet been released.


### Fixed
* #1012 Return status for introspecting a nonexistent token from 401 to the correct value of 200 per [RFC 7662](https://datatracker.ietf.org/doc/html/rfc7662#section-2.2).
Expand Down
6 changes: 5 additions & 1 deletion oauth2_provider/oauth2_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,11 @@ def _authenticate_basic_auth(self, request):
# used by our default generator does not include the "$" character.
# However, if a different character set was used to generate the secret, this sentinel
# might be a false positive.
elif "$" in request.client.client_secret and request.client.client_secret != client_secret:
elif (
"$" in request.client.client_secret
and "$" not in client_secret
and request.client.client_secret != client_secret
):
if not check_password(client_secret, request.client.client_secret):
log.debug("Failed basic auth: wrong hashed client secret %s" % client_secret)
return False
Expand Down
5 changes: 5 additions & 0 deletions tests/test_client_credential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ def test_client_credential_with_hashed_client_secret(self):
response = self.client.post(reverse("oauth2_provider:token"), data=token_request_data, **auth_headers)
self.assertEqual(response.status_code, 401)

# sending the hashed secret should return a 401
auth_headers = get_basic_auth_header(self.application.client_id, self.application.client_secret)
response = self.client.post(reverse("oauth2_provider:token"), data=token_request_data, **auth_headers)
self.assertEqual(response.status_code, 401)

def test_client_credential_does_not_issue_refresh_token(self):
token_request_data = {
"grant_type": "client_credentials",
Expand Down