dictature 0.13.2__tar.gz → 0.14.0__tar.gz

{dictature-0.13.2/src/dictature.egg-info → dictature-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dictature
-Version: 0.13.2
+Version: 0.14.0
 Summary: dictature -- A generic wrapper around dict-like interface with mulitple backends
 Author-email: Adam Hlavacek <git@adamhlavacek.com>
 Project-URL: Homepage, https://github.com/esoadamo/dictature

{dictature-0.13.2 → dictature-0.14.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dictature"
-version = "0.13.2"
+version = "0.14.0"
 description = "dictature -- A generic wrapper around dict-like interface with mulitple backends"
 authors = [
     { name = "Adam Hlavacek", email = "git@adamhlavacek.com" }

{dictature-0.13.2 → dictature-0.14.0}/src/dictature/backend/mysql.py

@@ -38,7 +38,7 @@ class DictatureBackendMySQL(DictatureBackendMock):
     def keys(self) -> Iterable[str]:
         # noinspection SqlResolve
         tables = self._execute(f"SELECT table_name FROM information_schema.tables WHERE table_schema = %s AND table_name LIKE '{self.__prefix}%'", (self.__connection_params['database'],))
-        return {table[0][3:] for table in tables}
+        return {table[0][len(self.__prefix):] for table in tables}
 
     def table(self, name: str) -> 'DictatureTableMock':
         return DictatureTableMySQL(self, name, self.__prefix)

{dictature-0.13.2 → dictature-0.14.0}/src/dictature/backend/sqlite.py

@@ -24,7 +24,7 @@ class DictatureBackendSQLite(DictatureBackendMock):
 
     def keys(self) -> Iterable[str]:
         tables = self._execute(f"SELECT tbl_name FROM sqlite_master WHERE type='table' AND tbl_name LIKE '{self.__prefix}%'")
-        return {table[0][3:] for table in tables}
+        return {table[0][len(self.__prefix):] for table in tables}
 
     def table(self, name: str) -> 'DictatureTableMock':
         return DictatureTableSQLite(self, name, self.__prefix)

{dictature-0.13.2 → dictature-0.14.0}/src/dictature/transformer/aes.py

@@ -1,3 +1,5 @@
+from typing import Callable, Optional
+
 try:
     from Crypto.Cipher import AES
     from Crypto.Util.Padding import pad, unpad
@@ -9,27 +11,40 @@ from .mock import MockTransformer
 
 
 class AESTransformer(MockTransformer):
-    def __init__(self, passphrase: str, static_names_mode: bool, salt: str = 'dictature') -> None:
+    def __init__(
+            self,
+            passphrase: str,
+            static_names_mode: bool,
+            salt: str = 'dictature',
+            bytes_encoder: Optional[Callable[[bytes], str]] = None,
+            bytes_decoder: Optional[Callable[[str], bytes]] = None
+    ) -> None:
         """
         Create a new AES transformer
         :param passphrase: secret passphrase to encrypt/decrypt the data
         :param static_names_mode: if True, the transformer will use ECB mode instead of GCM (True decreases security, increases speed)
         :param salt: salt to use for the key derivation
+        :param bytes_encoder: function to encode bytes to string, can be e.g. b64encode (default: hex)
+        :param bytes_decoder: function to decode string to bytes, can be e.g. b64decode (default: hex)
         """
         self.__key = scrypt(passphrase, salt, 16, N=2 ** 14, r=8, p=1)
         self.__mode = AES.MODE_GCM if not static_names_mode else AES.MODE_ECB
         self.__static = static_names_mode
+        self.__bytes_encoder = bytes_encoder if bytes_encoder else (lambda b: b.hex())
+        self.__bytes_decoder = bytes_decoder if bytes_decoder else (lambda s: bytes.fromhex(s))
 
     def forward(self, text: str) -> str:
         cipher = self.__cipher()
         if self.__mode == AES.MODE_GCM:
             ciphertext, tag = cipher.encrypt_and_digest(pad(text.encode('utf8'), AES.block_size))
-            return (cipher.nonce + tag + ciphertext).hex()
+            data = (cipher.nonce + tag + ciphertext)
         else:
-            return cipher.encrypt(pad(text.encode('utf8'), AES.block_size)).hex()
+            data = cipher.encrypt(pad(text.encode('utf8'), AES.block_size))
+
+        return self.__bytes_encoder(data)
 
     def backward(self, text: str) -> str:
-        data = bytes.fromhex(text)
+        data = self.__bytes_decoder(text)
         if self.__mode == AES.MODE_GCM:
             nonce, tag, ciphertext = data[:16], data[16:32], data[32:]
             return unpad(self.__cipher(nonce=nonce).decrypt_and_verify(ciphertext, tag), AES.block_size).decode('utf8')

{dictature-0.13.2 → dictature-0.14.0/src/dictature.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dictature
-Version: 0.13.2
+Version: 0.14.0
 Summary: dictature -- A generic wrapper around dict-like interface with mulitple backends
 Author-email: Adam Hlavacek <git@adamhlavacek.com>
 Project-URL: Homepage, https://github.com/esoadamo/dictature

{dictature-0.13.2 → dictature-0.14.0}/tests/test_operations.py

@@ -2,6 +2,7 @@ import unittest
 from itertools import product
 from typing import NamedTuple, Optional
 from tempfile import mkdtemp, mktemp
+from base64 import b64decode, b64encode
 
 from parameterized import parameterized
 
@@ -25,6 +26,7 @@ TRANSFORMERS = [
     PassthroughTransformer(),
     AESTransformer('password', False),
     AESTransformer('password', True),
+    AESTransformer('password', True, bytes_encoder=(lambda x: b64encode(x).decode('ascii')), bytes_decoder=(lambda x: b64decode(x.encode('ascii')))),
     HmacTransformer(),
     HmacTransformer('password'),
     GzipTransformer(),