altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Only show roles in active roups in the oidc roles claim. Fixes #3424. Commit ready for merge.

Browse source 
- Legacy-Id: 19412
This commit is contained in:
Robert Sparks 2021-10-11 19:08:46 +00:00
parent d1a9f0d844
commit 21f5a55e2f
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ietf/ietfauth/tests.py
View file

@ -810,7 +810,8 @@ class OpenIDConnectTests(TestCase):
# Get a user for which we want to get access # Get a user for which we want to get access
person = PersonFactory(with_bio=True) person = PersonFactory(with_bio=True)
RoleFactory(name_id='chair', person=person) active_group = RoleFactory(name_id='chair', person=person).group
closed_group = RoleFactory(name_id='chair', person=person, group__state_id='conclude').group
# an additional email # an additional email
EmailFactory(person=person) EmailFactory(person=person)
email_list = person.email_set.all().values_list('address', flat=True) email_list = person.email_set.all().values_list('address', flat=True)
@ -880,6 +881,8 @@ class OpenIDConnectTests(TestCase):
self.assertTrue(userinfo[key]) self.assertTrue(userinfo[key])
self.assertIn('remote', set(userinfo['reg_type'].split())) self.assertIn('remote', set(userinfo['reg_type'].split()))
self.assertNotIn('hackathon', set(userinfo['reg_type'].split())) self.assertNotIn('hackathon', set(userinfo['reg_type'].split()))
self.assertIn(active_group.acronym, [i[1] for i in userinfo['roles']])
self.assertNotIn(closed_group.acronym, [i[1] for i in userinfo['roles']])
# Create another registration, with a different email # Create another registration, with a different email
MeetingRegistration.objects.create( MeetingRegistration.objects.create(

2
ietf/ietfauth/utils.py
View file

@ -247,7 +247,7 @@ class OidcExtraScopeClaims(oidc_provider.lib.claims.ScopeClaims):
) )
def scope_roles(self): def scope_roles(self):
roles = self.user.person.role_set.values_list('name__slug', 'group__acronym') roles = self.user.person.role_set.filter(group__state_id__in=('active','bof','proposed')).values_list('name__slug', 'group__acronym')
info = { info = {
'roles': list(roles) 'roles': list(roles)
} }