dictature 0.13.3__py3-none-any.whl → 0.14.0__py3-none-any.whl

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.3.dist-info → dictature-0.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dictature
-Version: 0.13.3
+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.3.dist-info → dictature-0.14.0.dist-info}/RECORD

@@ -9,14 +9,14 @@ dictature/backend/s3.py,sha256=9Vcf4-RagyjpV9F4m9ZQ1vjb4lbZfEcOZQBuD_SPwZg,6580
 dictature/backend/sqlite.py,sha256=4_fBCo1_rmCRXronYbows1gjsuQgzqaOvcFqrz24Efw,5451
 dictature/backend/webdav.py,sha256=Y-3_WTcMyKVUnsVjiUZAxuy10FK0Yr-7Mgn13clg3po,5039
 dictature/transformer/__init__.py,sha256=JIFJpXU6iB9hIUM8L7HL2o9Nqjm_YbMEuQBQC8ZJ6b4,124
-dictature/transformer/aes.py,sha256=ZhC1dT9QpnziErkDLriWLgXDEFNGQW0KG4aqSN2AZpA,1926
+dictature/transformer/aes.py,sha256=KGJh6OtQpYVIcn7-DaoGg_cP980s9Ssgt6DlcF-YD2w,2582
 dictature/transformer/gzip.py,sha256=pngvJQeALa-lv98VBeJ1Pl6_gaAfGcPXD9UR7PexrYA,1921
 dictature/transformer/hmac.py,sha256=vURsB0HlzRPn_Vkl7lGmZV9OKempQuds8AanmadDxIo,834
 dictature/transformer/mock.py,sha256=7zu65ZqUV_AVRaPSzNd73cVMXixXt31SeuX9OKZxaJQ,948
 dictature/transformer/passthrough.py,sha256=Pt3N6G_Qh6HJ_q75ETL5nfAwYHLB-SjkVwUwbbbMik8,344
 dictature/transformer/pipeline.py,sha256=OaQaJeJ5NpICetJe08r8ontqstsXGuW8jDbKw1zxYs4,842
-dictature-0.13.3.dist-info/LICENSE,sha256=n1U9DKr8sM5EY2QHcvxSGiKTDWUT8MyXsOC79w94MT0,1072
-dictature-0.13.3.dist-info/METADATA,sha256=sJFxBPiHhuZYYqLtXN_gxvn09q9VzXeD_h5z--qEtbk,3394
-dictature-0.13.3.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-dictature-0.13.3.dist-info/top_level.txt,sha256=-RO39WWCF44lqiXhSUcACVqbk6SkgReZTz7ZmHKH3-U,10
-dictature-0.13.3.dist-info/RECORD,,
+dictature-0.14.0.dist-info/LICENSE,sha256=n1U9DKr8sM5EY2QHcvxSGiKTDWUT8MyXsOC79w94MT0,1072
+dictature-0.14.0.dist-info/METADATA,sha256=IZXRjbTEfVjIPggFVALBcHJNHK-gc0YiFPCabtbjII0,3394
+dictature-0.14.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+dictature-0.14.0.dist-info/top_level.txt,sha256=-RO39WWCF44lqiXhSUcACVqbk6SkgReZTz7ZmHKH3-U,10
+dictature-0.14.0.dist-info/RECORD,,