diff --git a/sso/services/mumble/__init__.py b/sso/services/mumble/__init__.py index 5f89e5a..7afe277 100644 --- a/sso/services/mumble/__init__.py +++ b/sso/services/mumble/__init__.py @@ -26,9 +26,9 @@ class MumbleService(BaseService): if tag: username = "[%s]%s" % (tag, username) - return self.raw_add_user(username, password, user) + return self.raw_add_user(username, password) - def raw_add_user(username, password): + def raw_add_user(self, username, password): mumbleuser = MumbleUser() mumbleuser.name = username mumbleuser.password = password @@ -48,8 +48,14 @@ class MumbleService(BaseService): def delete_user(self, uid): """ Delete a user by uid """ - mumbleuser = MumbleUser.objects.get(name=uid, server=self._get_server()) - mumbleuser.delete() + try: + mumbleuser = MumbleUser.objects.get(name=uid, server=self._get_server()) + except MumbleUser.DoesNotExist: + return True + try: + mumbleuser.delete() + except: + pass return True def disable_user(self, uid): diff --git a/sso/services/wiki/__init__.py b/sso/services/wiki/__init__.py index 8f58cb2..026a2fc 100644 --- a/sso/services/wiki/__init__.py +++ b/sso/services/wiki/__init__.py @@ -78,11 +78,13 @@ class MediawikiService(BaseService): self._dbcursor.execute(self.SQL_DEL_REV, [uid]) self._dbcursor.execute(self.SQL_DEL_USER, [uid]) self._db.connection.commit() + return True def disable_user(self, uid): """ Disable a user """ self._dbcursor.execute(self.SQL_DIS_USER, [uid]) self._db.connection.commit() + return True def enable_user(self, uid, password): """ Enable a user """