nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2026-01-30 07:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed case munging on Wiki plugin

Browse Source
This commit is contained in:
matalok
2010-03-05 10:20:17 -05:00
committed by Andrew Williams
parent 67b2ae2903
commit 850e63e6ff
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sso/services/wiki/__init__.py
View File

@@ -16,7 +16,7 @@ class MediawikiService(BaseService):
SQL_ADD_USER = r"INSERT INTO user (user_name, user_password, user_newpassword, user_options, user_email) VALUES (%s, %s, '', '', '')" SQL_ADD_USER = r"INSERT INTO user (user_name, user_password, user_newpassword, user_options, user_email) VALUES (%s, %s, '', '', '')"
SQL_DIS_USER = r"UPDATE user SET user_password = '', user_email = '' WHERE username = %s" SQL_DIS_USER = r"UPDATE user SET user_password = '', user_email = '' WHERE user_name = %s"
SQL_ENABLE_USER = r"UPDATE user SET user_password = %s WHERE user_name = %s" SQL_ENABLE_USER = r"UPDATE user SET user_password = %s WHERE user_name = %s"
SQL_CHECK_USER = r"SELECT user_name from user WHERE user_name = %s" SQL_CHECK_USER = r"SELECT user_name from user WHERE user_name = %s"
@@ -44,10 +44,14 @@ class MediawikiService(BaseService):
hash = hashlib.md5('%s-%s' % (salt, hashlib.md5(password).hexdigest())).hexdigest() hash = hashlib.md5('%s-%s' % (salt, hashlib.md5(password).hexdigest())).hexdigest()
return ":B:%s:%s" % (salt, hash) return ":B:%s:%s" % (salt, hash)
def _clean_username(self, username):
username = username.strip()
return username[0].upper() + username[1:]
def add_user(self, username, password): def add_user(self, username, password):
""" Add a user """ """ Add a user """
pwhash = self._gen_mw_hash(password) pwhash = self._gen_mw_hash(password)
self._dbcursor.execute(self.SQL_ADD_USER, [username.strip().capitalize(), pwhash]) self._dbcursor.execute(self.SQL_ADD_USER, [self._clean_username(username), pwhash])
self._db.connection.commit() self._db.connection.commit()
def delete_user(self, username): def delete_user(self, username):
@@ -56,18 +60,18 @@ class MediawikiService(BaseService):
def disable_user(self, username): def disable_user(self, username):
""" Disable a user """ """ Disable a user """
self._dbcursor.execute(self.SQL_DIS_USER, [username]) self._dbcursor.execute(self.SQL_DIS_USER, [self._clean_username(username)])
self._db.connection.commit() self._db.connection.commit()
def enable_user(self, username, password): def enable_user(self, username, password):
""" Enable a user """ """ Enable a user """
pwhash = self._gen_mw_hash(password) pwhash = self._gen_mw_hash(password)
self._dbcursor.execute(self.SQL_ENABLE_USER, [pwhash, username.strip().capitalize()]) self._dbcursor.execute(self.SQL_ENABLE_USER, [pwhash, self._clean_username(username)])
pass pass
def check_user(self, username): def check_user(self, username):
""" Check if the username exists """ """ Check if the username exists """
self._dbcursor.execute(self.SQL_CHECK_USER, [username.strip().capitalize()]) self._dbcursor.execute(self.SQL_CHECK_USER, [self._clean_username(username)])
row = self._dbcursor.fetchone() row = self._dbcursor.fetchone()
if row: if row: