nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2026-01-31 08:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update services for new in-model settings

Browse Source
This commit is contained in:
Andrew Williams
2010-05-11 14:32:20 +01:00
parent 1240120c01
commit 465ce3a5c4
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sso/services/miningbuddy/__init__.py
View File

@@ -13,7 +13,9 @@ class MiningBuddyService(BaseService):
settings = { 'require_user': False, settings = { 'require_user': False,
'require_password': False, 'require_password': False,
'provide_login': False } 'provide_login': False,
'database_name': 'dreddit_miningbuddy',
'password_salt': 'asdqwdqweqweqweqweqw' }
SQL_ADD_USER = r"INSERT INTO users (username, password, email, emailvalid, confirmed, rank) VALUES (%s, %s, %s, 1, 1, 2)" SQL_ADD_USER = r"INSERT INTO users (username, password, email, emailvalid, confirmed, rank) VALUES (%s, %s, %s, 1, 1, 2)"
@@ -29,7 +31,7 @@ class MiningBuddyService(BaseService):
backend = load_backend(settings.DATABASE_ENGINE) backend = load_backend(settings.DATABASE_ENGINE)
self._db = backend.DatabaseWrapper({ self._db = backend.DatabaseWrapper({
'DATABASE_HOST': settings.DATABASE_HOST, 'DATABASE_HOST': settings.DATABASE_HOST,
'DATABASE_NAME': settings.MINING_DATABASE, 'DATABASE_NAME': self.settings['database_name'],
'DATABASE_OPTIONS': {}, 'DATABASE_OPTIONS': {},
'DATABASE_PASSWORD': settings.DATABASE_PASSWORD, 'DATABASE_PASSWORD': settings.DATABASE_PASSWORD,
'DATABASE_PORT': settings.DATABASE_PORT, 'DATABASE_PORT': settings.DATABASE_PORT,
@@ -43,7 +45,7 @@ class MiningBuddyService(BaseService):
self._db = None self._db = None
def _gen_salt(self): def _gen_salt(self):
return settings.MINING_SALT return self.settings['password_salt']
def _gen_mb_hash(self, password, salt=None): def _gen_mb_hash(self, password, salt=None):
if not salt: if not salt:

7
sso/services/mumble/__init__.py
View File

@@ -1,17 +1,16 @@
from mumble.models import Mumble, MumbleUser from mumble.models import Mumble, MumbleUser
from sso.services import BaseService from sso.services import BaseService
import settings
class MumbleService(BaseService): class MumbleService(BaseService):
settings = { 'require_user': True, settings = { 'require_user': True,
'require_password': True, 'require_password': True,
'provide_login': False, 'provide_login': False,
'use_corptag': True } 'use_corptag': True,
'mumble_server_id': 1 }
def _get_server(self): def _get_server(self):
return Mumble.objects.get(id=settings.MUMBLE_SERVER_ID) return Mumble.objects.get(id=self.settings['mumble_server_id'])
def add_user(self, username, password, **kwargs): def add_user(self, username, password, **kwargs):
""" Add a user, returns a UID for that user """ """ Add a user, returns a UID for that user """

5
sso/services/qms/__init__.py
View File

@@ -12,7 +12,8 @@ class QMSService(BaseService):
settings = { 'require_user': False, settings = { 'require_user': False,
'require_password': False, 'require_password': False,
'provide_login': False } 'provide_login': False,
'database_name': 'dreddit_qms' }
SQL_ADD_USER = r"INSERT INTO users (ssoid, Name, passhash, salt, Email, certificate) VALUES (%s, %s, %s, %s, %s, %s)" SQL_ADD_USER = r"INSERT INTO users (ssoid, Name, passhash, salt, Email, certificate) VALUES (%s, %s, %s, %s, %s, %s)"
SQL_DIS_USER = r"UPDATE users SET passhash = '' WHERE ssoid = %s" SQL_DIS_USER = r"UPDATE users SET passhash = '' WHERE ssoid = %s"
@@ -25,7 +26,7 @@ class QMSService(BaseService):
backend = load_backend(settings.DATABASE_ENGINE) backend = load_backend(settings.DATABASE_ENGINE)
self._db = backend.DatabaseWrapper({ self._db = backend.DatabaseWrapper({
'DATABASE_HOST': settings.DATABASE_HOST, 'DATABASE_HOST': settings.DATABASE_HOST,
'DATABASE_NAME': settings.QMS_DATABASE, 'DATABASE_NAME': self.settings['database_name'],
'DATABASE_OPTIONS': {}, 'DATABASE_OPTIONS': {},
'DATABASE_PASSWORD': settings.DATABASE_PASSWORD, 'DATABASE_PASSWORD': settings.DATABASE_PASSWORD,
'DATABASE_PORT': settings.DATABASE_PORT, 'DATABASE_PORT': settings.DATABASE_PORT,

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

@@ -12,7 +12,8 @@ class MediawikiService(BaseService):
settings = { 'require_user': False, settings = { 'require_user': False,
'require_password': False, 'require_password': False,
'provide_login': False } 'provide_login': False,
'database_name': 'dreddit_wiki' }
SQL_ADD_USER = r"INSERT INTO user (user_name, user_password, user_newpassword, user_email, user_options) VALUES (%s, %s, '', %s, '')" SQL_ADD_USER = r"INSERT INTO user (user_name, user_password, user_newpassword, user_email, user_options) VALUES (%s, %s, '', %s, '')"
SQL_DIS_USER = r"UPDATE user SET user_password = '', user_email = '', user_token = %s WHERE user_name = %s" SQL_DIS_USER = r"UPDATE user SET user_password = '', user_email = '', user_token = %s WHERE user_name = %s"
@@ -30,7 +31,7 @@ class MediawikiService(BaseService):
backend = load_backend(settings.DATABASE_ENGINE) backend = load_backend(settings.DATABASE_ENGINE)
self._db = backend.DatabaseWrapper({ self._db = backend.DatabaseWrapper({
'DATABASE_HOST': settings.DATABASE_HOST, 'DATABASE_HOST': settings.DATABASE_HOST,
'DATABASE_NAME': settings.WIKI_DATABASE, 'DATABASE_NAME': self.settings['database_name'],
'DATABASE_OPTIONS': {}, 'DATABASE_OPTIONS': {},
'DATABASE_PASSWORD': settings.DATABASE_PASSWORD, 'DATABASE_PASSWORD': settings.DATABASE_PASSWORD,
'DATABASE_PORT': settings.DATABASE_PORT, 'DATABASE_PORT': settings.DATABASE_PORT,