mirror of
https://github.com/nikdoof/test-auth.git
synced 2025-12-23 14:49:31 +00:00
Services now use UID by default.
This commit is contained in:
@@ -31,25 +31,25 @@ class BaseService():
|
||||
'provide_login': False }
|
||||
|
||||
def add_user(self, username, password):
|
||||
""" Add a user """
|
||||
pass
|
||||
|
||||
def delete_user(self, username):
|
||||
""" Delete a user """
|
||||
pass
|
||||
|
||||
def disable_user(self, username):
|
||||
""" Disable a user """
|
||||
pass
|
||||
|
||||
def enable_user(self, username, password):
|
||||
""" Enable a user """
|
||||
""" Add a user, returns a UID for that user """
|
||||
pass
|
||||
|
||||
def check_user(self, username):
|
||||
""" Check if the username exists """
|
||||
pass
|
||||
|
||||
def login(username):
|
||||
def delete_user(self, uid):
|
||||
""" Delete a user by uid """
|
||||
pass
|
||||
|
||||
def disable_user(self, uid):
|
||||
""" Disable a user by uid """
|
||||
pass
|
||||
|
||||
def enable_user(self, uid, password):
|
||||
""" Enable a user by uid """
|
||||
pass
|
||||
|
||||
def login(uid):
|
||||
""" Login the user and provide cookies back """
|
||||
pass
|
||||
|
||||
@@ -30,27 +30,6 @@ class JabberService(BaseService):
|
||||
if self.ejctl.register(username.lower(), settings.JABBER_SERVER, password):
|
||||
return '%s@%s' % (username, settings.JABBER_SERVER)
|
||||
|
||||
def delete_user(self, username):
|
||||
""" Delete a user """
|
||||
if self.method == "xmpp":
|
||||
return self.jabberadmin.deluser('%s@%s' % (username, settings.JABBER_SERVER))
|
||||
else:
|
||||
return self.ejctl.unregister(username.lower(), settings.JABBER_SERVER)
|
||||
|
||||
def disable_user(self, username):
|
||||
""" Disable a user """
|
||||
if self.method == "xmpp":
|
||||
return False
|
||||
else:
|
||||
return self.ejctl.ban_user(settings.JABBER_SERVER, username.lower())
|
||||
|
||||
def enable_user(self, username):
|
||||
""" Enable a user """
|
||||
if self.method == "xmpp":
|
||||
return False
|
||||
else:
|
||||
return self.ejctl.enable_user(settings.JABBER_SERVER, username.lower(), password)
|
||||
|
||||
def check_user(self, username):
|
||||
""" Check if the username exists """
|
||||
if self.method == "xmpp":
|
||||
@@ -60,4 +39,28 @@ class JabberService(BaseService):
|
||||
else:
|
||||
return True
|
||||
|
||||
def delete_user(self, uid):
|
||||
""" Delete a user """
|
||||
if self.method == "xmpp":
|
||||
return self.jabberadmin.deluser(uid)
|
||||
else:
|
||||
username, server = uid.split("@")
|
||||
return self.ejctl.unregister(username, server)
|
||||
|
||||
def disable_user(self, uid):
|
||||
""" Disable a user """
|
||||
if self.method == "xmpp":
|
||||
return False
|
||||
else:
|
||||
username, server = uid.split("@")
|
||||
return self.ejctl.ban_user(server, username)
|
||||
|
||||
def enable_user(self, uid, password):
|
||||
""" Enable a user """
|
||||
if self.method == "xmpp":
|
||||
return False
|
||||
else:
|
||||
username, server = uid.split("@")
|
||||
return self.ejctl.enable_user(server, username, password)
|
||||
|
||||
ServiceClass = 'JabberService'
|
||||
|
||||
@@ -12,7 +12,7 @@ class MediawikiService(BaseService):
|
||||
|
||||
settings = { 'require_user': False,
|
||||
'require_password': False,
|
||||
'provide_login': True }
|
||||
'provide_login': False }
|
||||
|
||||
|
||||
SQL_ADD_USER = r"INSERT INTO user (user_name, user_password, user_newpassword, user_options, user_email) VALUES (%s, %s, '', '', '')"
|
||||
@@ -55,29 +55,27 @@ class MediawikiService(BaseService):
|
||||
self._db.connection.commit()
|
||||
return self._clean_username(username)
|
||||
|
||||
def delete_user(self, username):
|
||||
""" Delete a user """
|
||||
self.disable_user(username)
|
||||
|
||||
def disable_user(self, username):
|
||||
""" Disable a user """
|
||||
self._dbcursor.execute(self.SQL_DIS_USER, [self._clean_username(username)])
|
||||
self._db.connection.commit()
|
||||
|
||||
def enable_user(self, username, password):
|
||||
""" Enable a user """
|
||||
pwhash = self._gen_mw_hash(password)
|
||||
self._dbcursor.execute(self.SQL_ENABLE_USER, [pwhash, self._clean_username(username)])
|
||||
pass
|
||||
|
||||
def check_user(self, username):
|
||||
""" Check if the username exists """
|
||||
self._dbcursor.execute(self.SQL_CHECK_USER, [self._clean_username(username)])
|
||||
row = self._dbcursor.fetchone()
|
||||
|
||||
if row:
|
||||
return True
|
||||
|
||||
return True
|
||||
return False
|
||||
|
||||
def delete_user(self, uid):
|
||||
""" Delete a user """
|
||||
self.disable_user(uid)
|
||||
|
||||
def disable_user(self, uid):
|
||||
""" Disable a user """
|
||||
self._dbcursor.execute(self.SQL_DIS_USER, [uid])
|
||||
self._db.connection.commit()
|
||||
|
||||
def enable_user(self, uid, password):
|
||||
""" Enable a user """
|
||||
pwhash = self._gen_mw_hash(password)
|
||||
self._dbcursor.execute(self.SQL_ENABLE_USER, [pwhash, uid])
|
||||
pass
|
||||
|
||||
ServiceClass = 'MediawikiService'
|
||||
|
||||
Reference in New Issue
Block a user