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

add/remove users from whitelist when adding/deleting

Browse Source
This commit is contained in:
MinRK
2014-09-15 01:20:50 -07:00
parent ac6b4788a5
commit 294fa8ceb6
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jupyterhub/apihandlers/users.py
View File

@@ -84,16 +84,34 @@ class UserAPIHandler(BaseUserHandler):
if 'admin' in data:
user.admin = data['admin']
self.db.commit()
# add to whitelist, if a whitelist is in use
if self.authenticator and self.authenticator.whitelist:
self.authenticator.whitelist.add(user.name)
self.write(json.dumps(self.user_model(user)))
self.set_status(201)
@admin_only
@gen.coroutine
def delete(self, name):
user = self.find_user(name)
if user is None:
raise web.HTTPError(404)
if user.name == self.get_current_user().name:
raise web.HTTPError(400, "Cannot delete yourself!")
if user.spawner is not None:
yield self.stop_single_user(user)
# remove the user from the whitelist, if there is one
if self.authenticator and user.name in self.authenticator.whitelist:
self.authenticator.whitelist.remove(user.name)
# remove from the db
self.db.delete(user)
self.db.commit()
self.set_status(204)
@admin_only

6
jupyterhub/handlers/base.py
View File

@@ -52,6 +52,10 @@ class BaseHandler(RequestHandler):
def hub(self):
return self.settings['hub']
@property
def authenticator(self):
return self.settings.get('authenticator', None)
#---------------------------------------------------------------
# Login and cookie-related
#---------------------------------------------------------------
@@ -139,7 +143,7 @@ class BaseHandler(RequestHandler):
@gen.coroutine
def authenticate(self, data):
auth = self.settings.get('authenticator', None)
auth = self.authenticator
if auth is not None:
result = yield auth.authenticate(self, data)
raise gen.Return(result)