Bug 559 adding encrypt/decrypt methods
Fixing pytest and unittest. Adding to devops stage test
Change-Id: Idbeaa82dec736c4a8b2d2a26bd39aeecbc49b901
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/osm_common/tests/test_dbbase.py b/osm_common/tests/test_dbbase.py
index 2da4506..64bfb3e 100644
--- a/osm_common/tests/test_dbbase.py
+++ b/osm_common/tests/test_dbbase.py
@@ -2,6 +2,7 @@
import pytest
import unittest
from osm_common.dbbase import DbBase, DbException, deep_update
+from os import urandom
def exception_message(message):
@@ -20,7 +21,9 @@
def test_db_connect(db_base):
- db_base.db_connect(None)
+ with pytest.raises(DbException) as excinfo:
+ db_base.db_connect(None)
+ assert str(excinfo.value).startswith(exception_message("Method 'db_connect' not implemented"))
def test_db_disconnect(db_base):
@@ -62,6 +65,57 @@
assert excinfo.value.http_code == http.HTTPStatus.NOT_FOUND
+class TestEncryption(unittest.TestCase):
+ def setUp(self):
+ master_password = "Setting a long master password with numbers 123 and capitals AGHBNHD and symbols %&8)!'"
+ db_base1 = DbBase(master_password=master_password)
+ db_base2 = DbBase()
+ # set self.secret_key obtained when connect
+ db_base1.secret_key = DbBase._join_passwords(urandom(32), db_base1.master_password)
+ db_base2.secret_key = DbBase._join_passwords(urandom(32), db_base2.master_password)
+ self.db_base = [db_base1, db_base2]
+
+ def test_encrypt_decrypt(self):
+ TEST = (
+ ("plain text 1 ! ", None),
+ ("plain text 2 with salt ! ", "1afd5d1a-4a7e-4d9c-8c65-251290183106"),
+ ("plain text 3 with usalt ! ", u"1afd5d1a-4a7e-4d9c-8c65-251290183106"),
+ (u"plain unicode 4 ! ", None),
+ (u"plain unicode 5 with salt ! ", "1a000d1a-4a7e-4d9c-8c65-251290183106"),
+ (u"plain unicode 6 with usalt ! ", u"1abcdd1a-4a7e-4d9c-8c65-251290183106"),
+ )
+ for db_base in self.db_base:
+ for value, salt in TEST:
+ # no encryption
+ encrypted = db_base.encrypt(value, schema_version='1.0', salt=salt)
+ self.assertEqual(encrypted, value, "value '{}' has been encrypted".format(value))
+ decrypted = db_base.decrypt(encrypted, schema_version='1.0', salt=salt)
+ self.assertEqual(decrypted, value, "value '{}' has been decrypted".format(value))
+
+ # encrypt/decrypt
+ encrypted = db_base.encrypt(value, schema_version='1.1', salt=salt)
+ self.assertNotEqual(encrypted, value, "value '{}' has not been encrypted".format(value))
+ self.assertIsInstance(encrypted, str, "Encrypted is not ascii text")
+ decrypted = db_base.decrypt(encrypted, schema_version='1.1', salt=salt)
+ self.assertEqual(decrypted, value, "value is not equal after encryption/decryption")
+
+ def test_encrypt_decrypt_salt(self):
+ value = "value to be encrypted!"
+ encrypted = []
+ for db_base in self.db_base:
+ for salt in (None, "salt 1", "1afd5d1a-4a7e-4d9c-8c65-251290183106"):
+ # encrypt/decrypt
+ encrypted.append(db_base.encrypt(value, schema_version='1.1', salt=salt))
+ self.assertNotEqual(encrypted[-1], value, "value '{}' has not been encrypted".format(value))
+ self.assertIsInstance(encrypted[-1], str, "Encrypted is not ascii text")
+ decrypted = db_base.decrypt(encrypted[-1], schema_version='1.1', salt=salt)
+ self.assertEqual(decrypted, value, "value is not equal after encryption/decryption")
+ for i in range(0, len(encrypted)):
+ for j in range(i+1, len(encrypted)):
+ self.assertNotEqual(encrypted[i], encrypted[j],
+ "encryption with different salt contains different result")
+
+
class TestDeepUpdate(unittest.TestCase):
def test_update_dict(self):
# Original, patch, expected result
@@ -161,3 +215,7 @@
deep_update(t[0], t[1])
except DbException as e:
print(e)
+
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/osm_common/tests/test_dbmemory.py b/osm_common/tests/test_dbmemory.py
index c4d2874..3e59e94 100644
--- a/osm_common/tests/test_dbmemory.py
+++ b/osm_common/tests/test_dbmemory.py
@@ -42,8 +42,8 @@
return "database exception Not found entry with filter='{}'".format(filter)
-def replace_exception_message(filter):
- return "database exception Not found entry with filter='{}'".format(filter)
+def replace_exception_message(value):
+ return "database exception Not found entry with _id='{}'".format(value)
def test_constructor():
@@ -366,17 +366,18 @@
assert excinfo.value.http_code == http.HTTPStatus.NOT_FOUND
-@pytest.mark.parametrize("table, filter, indata", [
- ("test", {}, {"_id": 1, "data": 42}),
- ("test", {}, {"_id": 3, "data": 42}),
- ("test", {"_id": 1}, {"_id": 3, "data": 42}),
- ("test", {"_id": 3}, {"_id": 3, "data": 42}),
- ("test", {"data": 1}, {"_id": 3, "data": 42}),
- ("test", {"data": 3}, {"_id": 3, "data": 42}),
- ("test", {"_id": 1, "data": 1}, {"_id": 3, "data": 42}),
- ("test", {"_id": 3, "data": 3}, {"_id": 3, "data": 42})])
-def test_replace(db_memory_with_data, table, filter, indata):
- result = db_memory_with_data.replace(table, filter, indata)
+@pytest.mark.parametrize("table, _id, indata", [
+ ("test", 1, {"_id": 1, "data": 42}),
+ ("test", 1, {"_id": 1, "data": 42, "kk": 34}),
+ ("test", 1, {"_id": 1}),
+ ("test", 2, {"_id": 2, "data": 42}),
+ ("test", 2, {"_id": 2, "data": 42, "kk": 34}),
+ ("test", 2, {"_id": 2}),
+ ("test", 3, {"_id": 3, "data": 42}),
+ ("test", 3, {"_id": 3, "data": 42, "kk": 34}),
+ ("test", 3, {"_id": 3})])
+def test_replace(db_memory_with_data, table, _id, indata):
+ result = db_memory_with_data.replace(table, _id, indata)
assert result == {"updated": 1}
assert len(db_memory_with_data.db) == 1
assert table in db_memory_with_data.db
@@ -384,61 +385,43 @@
assert indata in db_memory_with_data.db[table]
-@pytest.mark.parametrize("table, filter, indata", [
- ("test", {}, {'_id': 1, 'data': 1}),
- ("test", {}, {'_id': 2, 'data': 1}),
- ("test", {}, {'_id': 1, 'data': 2}),
- ("test", {'_id': 1}, {'_id': 1, 'data': 1}),
- ("test", {'_id': 1, 'data': 1}, {'_id': 1, 'data': 1}),
- ("test_table", {}, {'_id': 1, 'data': 1}),
- ("test_table", {}, {'_id': 2, 'data': 1}),
- ("test_table", {}, {'_id': 1, 'data': 2}),
- ("test_table", {'_id': 1}, {'_id': 1, 'data': 1}),
- ("test_table", {'_id': 1, 'data': 1}, {'_id': 1, 'data': 1})])
-def test_replace_without_data_exception(db_memory, table, filter, indata):
+@pytest.mark.parametrize("table, _id, indata", [
+ ("test", 1, {"_id": 1, "data": 42}),
+ ("test", 2, {"_id": 2}),
+ ("test", 3, {"_id": 3})])
+def test_replace_without_data_exception(db_memory, table, _id, indata):
with pytest.raises(DbException) as excinfo:
- db_memory.replace(table, filter, indata, fail_on_empty=True)
- assert str(excinfo.value) == (empty_exception_message() + replace_exception_message(filter))
+ db_memory.replace(table, _id, indata, fail_on_empty=True)
+ assert str(excinfo.value) == (replace_exception_message(_id))
assert excinfo.value.http_code == http.HTTPStatus.NOT_FOUND
-@pytest.mark.parametrize("table, filter, indata", [
- ("test", {}, {'_id': 1, 'data': 1}),
- ("test", {}, {'_id': 2, 'data': 1}),
- ("test", {}, {'_id': 1, 'data': 2}),
- ("test", {'_id': 1}, {'_id': 1, 'data': 1}),
- ("test", {'_id': 1, 'data': 1}, {'_id': 1, 'data': 1}),
- ("test_table", {}, {'_id': 1, 'data': 1}),
- ("test_table", {}, {'_id': 2, 'data': 1}),
- ("test_table", {}, {'_id': 1, 'data': 2}),
- ("test_table", {'_id': 1}, {'_id': 1, 'data': 1}),
- ("test_table", {'_id': 1, 'data': 1}, {'_id': 1, 'data': 1})])
-def test_replace_without_data_none(db_memory, table, filter, indata):
- result = db_memory.replace(table, filter, indata, fail_on_empty=False)
+@pytest.mark.parametrize("table, _id, indata", [
+ ("test", 1, {"_id": 1, "data": 42}),
+ ("test", 2, {"_id": 2}),
+ ("test", 3, {"_id": 3})])
+def test_replace_without_data_none(db_memory, table, _id, indata):
+ result = db_memory.replace(table, _id, indata, fail_on_empty=False)
assert result is None
-@pytest.mark.parametrize("table, filter, indata", [
- ("test_table", {}, {'_id': 1, 'data': 1}),
- ("test_table", {}, {'_id': 2, 'data': 1}),
- ("test_table", {}, {'_id': 1, 'data': 2}),
- ("test_table", {'_id': 1}, {'_id': 1, 'data': 1}),
- ("test_table", {'_id': 1, 'data': 1}, {'_id': 1, 'data': 1})])
-def test_replace_with_data_exception(db_memory_with_data, table, filter, indata):
+@pytest.mark.parametrize("table, _id, indata", [
+ ("test", 11, {"_id": 11, "data": 42}),
+ ("test", 12, {"_id": 12}),
+ ("test", 33, {"_id": 33})])
+def test_replace_with_data_exception(db_memory_with_data, table, _id, indata):
with pytest.raises(DbException) as excinfo:
- db_memory_with_data.replace(table, filter, indata, fail_on_empty=True)
- assert str(excinfo.value) == (empty_exception_message() + replace_exception_message(filter))
+ db_memory_with_data.replace(table, _id, indata, fail_on_empty=True)
+ assert str(excinfo.value) == (replace_exception_message(_id))
assert excinfo.value.http_code == http.HTTPStatus.NOT_FOUND
-@pytest.mark.parametrize("table, filter, indata", [
- ("test_table", {}, {'_id': 1, 'data': 1}),
- ("test_table", {}, {'_id': 2, 'data': 1}),
- ("test_table", {}, {'_id': 1, 'data': 2}),
- ("test_table", {'_id': 1}, {'_id': 1, 'data': 1}),
- ("test_table", {'_id': 1, 'data': 1}, {'_id': 1, 'data': 1})])
-def test_replace_with_data_none(db_memory_with_data, table, filter, indata):
- result = db_memory_with_data.replace(table, filter, indata, fail_on_empty=False)
+@pytest.mark.parametrize("table, _id, indata", [
+ ("test", 11, {"_id": 11, "data": 42}),
+ ("test", 12, {"_id": 12}),
+ ("test", 33, {"_id": 33})])
+def test_replace_with_data_none(db_memory_with_data, table, _id, indata):
+ result = db_memory_with_data.replace(table, _id, indata, fail_on_empty=False)
assert result is None
@@ -447,11 +430,11 @@
False])
def test_replace_generic_exception(db_memory_with_data, fail_on_empty):
table = 'test'
- filter = {}
+ _id = {}
indata = {'_id': 1, 'data': 1}
db_memory_with_data._find = MagicMock(side_effect=Exception())
with pytest.raises(DbException) as excinfo:
- db_memory_with_data.replace(table, filter, indata, fail_on_empty=fail_on_empty)
+ db_memory_with_data.replace(table, _id, indata, fail_on_empty=fail_on_empty)
assert str(excinfo.value) == empty_exception_message()
assert excinfo.value.http_code == http.HTTPStatus.NOT_FOUND