kumi/django-oidc-provider
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #255 from q3aiml/fix-false-valued-settings

Browse source 
fix settings to support falsy valued overrides
This commit is contained in:
Juan Ignacio Fiorentino 2018-07-04 11:37:14 -03:00 committed by GitHub
parent 72f123c0b5 6900e637ab
commit 784456f4b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
oidc_provider/settings.py
View file

@ -203,7 +203,8 @@ def get(name, import_str=False):
default_value.update(value)
value = default_value
else:
value = value or default_value
if value is None:
value = default_value
value = import_from_str(value) if import_str else value
return value

44
oidc_provider/tests/cases/test_introspection_endpoint.py
View file

@ -46,6 +46,20 @@ class IntrospectionTestCase(TestCase):
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(force_text(response.content), {'active': False})
def _assert_active(self, response, **kwargs):
self.assertEqual(response.status_code, 200)
expected_content = {
'active': True,
'aud': self.resource.client_id,
'client_id': self.client.client_id,
'sub': str(self.user.pk),
'iat': int(self.now),
'exp': int(self.now + 600),
'iss': 'http://localhost:8000/openid',
}
expected_content.update(kwargs)
self.assertJSONEqual(force_text(response.content), expected_content)
def _make_request(self, **kwargs):
url = reverse('oidc_provider:token-introspection')
data = {
@ -89,28 +103,16 @@ class IntrospectionTestCase(TestCase):
def test_valid_request_returns_default_properties(self):
response = self._make_request()
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(force_text(response.content), {
'active': True,
'aud': self.resource.client_id,
'client_id': self.client.client_id,
'sub': str(self.user.pk),
'iat': int(self.now),
'exp': int(self.now + 600),
'iss': 'http://localhost:8000/openid',
})
self._assert_active(response)
@override_settings(OIDC_INTROSPECTION_PROCESSING_HOOK='oidc_provider.tests.app.utils.fake_introspection_processing_hook') # NOQA
def test_custom_introspection_hook_called_on_valid_request(self):
response = self._make_request()
self.assertEqual(response.status_code, 200)
self.assertJSONEqual(force_text(response.content), {
'active': True,
'aud': self.resource.client_id,
'client_id': self.client.client_id,
'sub': str(self.user.pk),
'iat': int(self.now),
'exp': int(self.now + 600),
'iss': 'http://localhost:8000/openid',
'test_introspection_processing_hook': FAKE_RANDOM_STRING
})
self._assert_active(response, test_introspection_processing_hook=FAKE_RANDOM_STRING)
@override_settings(OIDC_INTROSPECTION_VALIDATE_AUDIENCE_SCOPE=False)
def test_disable_audience_validation(self):
self.resource.scope = ['token_introspection']
self.resource.save()
response = self._make_request()
self._assert_active(response)

4
oidc_provider/tests/cases/test_settings.py
View file

@ -23,3 +23,7 @@ class SettingsTest(TestCase):
key1 = settings.get('OIDC_UNAUTHENTICATED_SESSION_MANAGEMENT_KEY')
key2 = settings.get('OIDC_UNAUTHENTICATED_SESSION_MANAGEMENT_KEY')
self.assertEqual(key1, key2)
@override_settings(OIDC_INTROSPECTION_VALIDATE_AUDIENCE_SCOPE=False)
def test_can_override_with_false_value(self):
self.assertFalse(settings.get('OIDC_INTROSPECTION_VALIDATE_AUDIENCE_SCOPE'))