heimoshuiyu/anki-sync-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge SyncApp's SqliteUserManager and the newly introduced UserManager and group all user managers in user_managers.py.

Browse Source
This commit is contained in:
Christoph Mack
2016-05-27 21:33:22 +02:00
committed by flan
parent 573aeece81
commit c7d7ff3e85
5 changed files with 158 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/sync_app_functional_test_base.py
View File

@@ -6,7 +6,7 @@ import unittest
from webtest import TestApp
from ankisyncd.users import UserManager
from ankisyncd.users import SqliteUserManager
from helpers.collection_utils import CollectionUtils
from helpers.db_utils import DBUtils
from helpers.file_utils import FileUtils
@@ -45,8 +45,8 @@ class SyncAppFunctionalTestBase(unittest.TestCase):
self.server_paths = self.serverutils.create_server_paths()
# Add a test user to the temp auth db the server will use.
self.user_manager = UserManager(self.server_paths['auth_db'],
self.server_paths['data_root'])
self.user_manager = SqliteUserManager(self.server_paths['auth_db'],
self.server_paths['data_root'])
self.user_manager.add_user('testuser', 'testpassword')
# Get absolute path to development ini file.

78
tests/test_sync_app.py
View File

@@ -57,84 +57,6 @@ class SyncCollectionHandlerTest(CollectionTestBase):
self.assertEqual(meta['cont'], True)
class SimpleUserManagerTest(unittest.TestCase):
_good_test_un = 'username'
_good_test_pw = 'password'
_bad_test_un = 'notAUsername'
_bad_test_pw = 'notAPassword'
def setUp(self):
self._user_manager = SimpleUserManager()
def tearDown(self):
self._user_manager = None
def test_authenticate(self):
self.assertTrue(self._user_manager.authenticate(self._good_test_un,
self._good_test_pw))
self.assertTrue(self._user_manager.authenticate(self._bad_test_un,
self._bad_test_pw))
self.assertTrue(self._user_manager.authenticate(self._good_test_un,
self._bad_test_pw))
self.assertTrue(self._user_manager.authenticate(self._bad_test_un,
self._good_test_pw))
def test_username2dirname(self):
dirname = self._user_manager.username2dirname(self._good_test_un)
self.assertEqual(dirname, self._good_test_un)
class SqliteUserManagerTest(SimpleUserManagerTest):
file_descriptor, _test_auth_db_path = tempfile.mkstemp(suffix=".db")
os.close(file_descriptor)
os.unlink(_test_auth_db_path)
def _create_test_auth_db(self, db_path, username, password):
if os.path.exists(db_path):
os.remove(db_path)
salt = binascii.b2a_hex(os.urandom(8))
crypto_hash = hashlib.sha256(username+password+salt).hexdigest()+salt
conn = sqlite3.connect(db_path)
cursor = conn.cursor()
cursor.execute("""CREATE TABLE IF NOT EXISTS auth
(user VARCHAR PRIMARY KEY, hash VARCHAR)""")
cursor.execute("INSERT INTO auth VALUES (?, ?)", (username, crypto_hash))
conn.commit()
conn.close()
def setUp(self):
self._create_test_auth_db(self._test_auth_db_path,
self._good_test_un,
self._good_test_pw)
self._user_manager = SqliteUserManager(self._test_auth_db_path)
def tearDown(self):
if os.path.exists(self._test_auth_db_path):
os.remove(self._test_auth_db_path)
def test_authenticate(self):
self.assertTrue(self._user_manager.authenticate(self._good_test_un,
self._good_test_pw))
self.assertFalse(self._user_manager.authenticate(self._bad_test_un,
self._bad_test_pw))
self.assertFalse(self._user_manager.authenticate(self._good_test_un,
self._bad_test_pw))
self.assertFalse(self._user_manager.authenticate(self._bad_test_un,
self._good_test_pw))
class SimpleSessionManagerTest(unittest.TestCase):
test_hkey = '1234567890'
test_session = SyncUserSession('testName', 'testPath', None, None)

61
tests/test_users.py
View File

@@ -5,17 +5,39 @@ import os
import unittest
from ankisyncd.users import UserManager
from ankisyncd.users import SimpleUserManager, SqliteUserManager
from helpers.file_utils import FileUtils
class SimpleUserManagerTest(unittest.TestCase):
_good_test_un = 'username'
_good_test_pw = 'password'
def setUp(self):
self.user_manager = SimpleUserManager()
_bad_test_un = 'notAUsername'
_bad_test_pw = 'notAPassword'
def tearDown(self):
self._user_manager = None
def test_authenticate(self):
good_test_un = 'username'
good_test_pw = 'password'
bad_test_un = 'notAUsername'
bad_test_pw = 'notAPassword'
self.assertTrue(self.user_manager.authenticate(good_test_un,
good_test_pw))
self.assertTrue(self.user_manager.authenticate(bad_test_un,
bad_test_pw))
self.assertTrue(self.user_manager.authenticate(good_test_un,
bad_test_pw))
self.assertTrue(self.user_manager.authenticate(bad_test_un,
good_test_pw))
def test_username2dirname(self):
username = 'my_username'
dirname = self.user_manager.username2dirname(username)
self.assertEqual(dirname, username)
class SqliteUserManagerTest(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.fileutils = FileUtils()
@@ -28,8 +50,8 @@ class SimpleUserManagerTest(unittest.TestCase):
def setUp(self):
self.auth_db_path = self.fileutils.create_file_path(suffix='auth.db')
self.collection_path = self.fileutils.create_dir_path()
self.user_manager = UserManager(self.auth_db_path,
self.collection_path)
self.user_manager = SqliteUserManager(self.auth_db_path,
self.collection_path)
def tearDown(self):
self.user_manager = None
@@ -124,6 +146,27 @@ class SimpleUserManagerTest(unittest.TestCase):
self.user_manager._create_user_dir(username)
self.assertTrue(os.path.isdir(expected_dir_path))
def test_authenticate_user(self):
username = "my_username"
password = "my_password"
self.user_manager.create_auth_db()
self.user_manager.add_user(username, password)
self.assertTrue(self.user_manager.authenticate_user(username,
password))
def test_set_password_for_user(self):
username = "my_username"
password = "my_password"
new_password = "my_new_password"
self.user_manager.create_auth_db()
self.user_manager.add_user(username, password)
self.user_manager.set_password_for_user(username, new_password)
self.assertFalse(self.user_manager.authenticate_user(username,
password))
self.assertTrue(self.user_manager.authenticate_user(username,
new_password))
if __name__ == '__main__':
unittest.main()