Skip to content

Work around double parsing of ui_locales #1469

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.

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

Merged
merged 2 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed
* #1443 Query strings with invalid hex values now raise a SuspiciousOperation exception (in DRF extension) instead of raising a 500 ValueError: Invalid hex encoding in query string.
* #1468 `ui_locales` request parameter triggers `AttributeError` under certain circumstances
### Security

## [2.4.0] - 2024-05-13
Expand Down
4 changes: 4 additions & 0 deletions oauth2_provider/views/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,10 @@ def get(self, request, *args, **kwargs):
# a successful response depending on "approval_prompt" url parameter
require_approval = request.GET.get("approval_prompt", oauth2_settings.REQUEST_APPROVAL_PROMPT)

if "ui_locales" in credentials and isinstance(credentials["ui_locales"], list):
# Make sure ui_locales a space separated string for oauthlib to handle it correctly.
credentials["ui_locales"] = " ".join(credentials["ui_locales"])

try:
# If skip_authorization field is True, skip the authorization screen even
# if this is the first use of the application and there was no previous authorization.
Expand Down
57 changes: 57 additions & 0 deletions tests/test_ui_locales.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
from django.contrib.auth import get_user_model
from django.test import TestCase, override_settings
from django.urls import reverse

from oauth2_provider.models import get_application_model


UserModel = get_user_model()
Application = get_application_model()


@override_settings(
OAUTH2_PROVIDER={
"OIDC_ENABLED": True,
"PKCE_REQUIRED": False,
"SCOPES": {
"openid": "OpenID connect",
},
}
)
class TestUILocalesParam(TestCase):
@classmethod
def setUpTestData(cls):
cls.application = Application.objects.create(
name="Test Application",
client_id="test",
redirect_uris="https://www.example.com/",
client_type=Application.CLIENT_PUBLIC,
authorization_grant_type=Application.GRANT_AUTHORIZATION_CODE,
)
cls.trusted_application = Application.objects.create(
name="Trusted Application",
client_id="trusted",
redirect_uris="https://www.example.com/",
client_type=Application.CLIENT_PUBLIC,
authorization_grant_type=Application.GRANT_AUTHORIZATION_CODE,
skip_authorization=True,
)
cls.user = UserModel.objects.create_user("test_user")
cls.url = reverse("oauth2_provider:authorize")

def setUp(self):
self.client.force_login(self.user)

def test_application_ui_locales_param(self):
response = self.client.get(
f"{self.url}?response_type=code&client_id=test&scope=openid&ui_locales=de",
)
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, "oauth2_provider/authorize.html")

def test_trusted_application_ui_locales_param(self):
response = self.client.get(
f"{self.url}?response_type=code&client_id=trusted&scope=openid&ui_locales=de",
)
self.assertEqual(response.status_code, 302)
self.assertRegex(response.url, r"https://www\.example\.com/\?code=[a-zA-Z0-9]+")
Loading