hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-19 07:53:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

always assign default roles on login

Browse Source 
successful authentication of a user always grants 'user' role

rather than only on first user creation in db
This commit is contained in:
Min RK
2021-12-16 12:42:47 +01:00
parent 92c6a23a13
commit 2a8428dbb0
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jupyterhub/handlers/base.py
View File

@@ -771,8 +771,9 @@ class BaseHandler(RequestHandler):
# Only set `admin` if the authenticator returned an explicit value. # Only set `admin` if the authenticator returned an explicit value.
if admin is not None and admin != user.admin: if admin is not None and admin != user.admin:
user.admin = admin user.admin = admin
roles.assign_default_roles(self.db, entity=user) # always ensure default roles ('user', 'admin' if admin) are assigned
self.db.commit() # after a successful login
roles.assign_default_roles(self.db, entity=user)
# always set auth_state and commit, # always set auth_state and commit,
# because there could be key-rotation or clearing of previous values # because there could be key-rotation or clearing of previous values
# going on. # going on.

5
jupyterhub/tests/test_roles.py
View File

@@ -1365,7 +1365,8 @@ async def test_login_default_role(app, username):
user.roles = [] user.roles = []
app.db.commit() app.db.commit()
# login *again*; user exists, shouldn't trigger change in roles # login *again*; user exists,
# login should always trigger "user" role assignment
cookies = await app.login_user(username) cookies = await app.login_user(username)
user = app.users[username] user = app.users[username]
assert user.roles == [] assert [role.name for role in user.roles] == ["user"]