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

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

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)