dictature 0.9.2__py3-none-any.whl → 0.9.3__py3-none-any.whl

dictature/backend/directory.py

@@ -71,7 +71,8 @@ class DictatureTableDirectory(DictatureTableMock):
     def _filename_encode(name: str, suffix: str = '.txt') -> str:
         if name == sub(r'[^\w_. -]', '_', name):
             return f"d_{name}{suffix}"
-        return f'e_{name.encode('utf-8').hex()}{suffix}'
+        name = name.encode('utf-8').hex()
+        return f'e_{name}{suffix}'
 
     @staticmethod
     def _filename_decode(name: str, suffix: str = '.txt') -> str:

dictature/dictature.py

@@ -15,11 +15,13 @@ class Dictature:
             backend: DictatureBackendMock,
             name_transformer: MockTransformer = PassthroughTransformer(),
             value_transformer: MockTransformer = PassthroughTransformer(),
+            table_name_transformer: Optional[MockTransformer] = None,
     ) -> None:
         self.__backend = backend
         self.__table_cache: Dict[str, "DictatureTable"] = {}
         self.__name_transformer = name_transformer
         self.__value_transformer = value_transformer
+        self.__table_name_transformer = table_name_transformer or name_transformer
 
     def keys(self) -> Set[str]:
         return set(map(self.__name_transformer.backward, self.__backend.keys()))
@@ -109,13 +111,12 @@ class DictatureTable:
         saved_value = self.__table.get(self.__item_key(item))
         mode = ValueMode(saved_value.mode)
         value = self.__value_transformer.backward(saved_value.value)
-        match mode:
-            case ValueMode.string:
-                return value
-            case ValueMode.json:
-                return json.loads(value)
-            case ValueMode.pickle:
-                return pickle.loads(decompress(b64decode(value.encode('ascii'))))
+        if mode == ValueMode.string:
+            return value
+        elif mode == ValueMode.json:
+            return json.loads(value)
+        elif mode == ValueMode.pickle:
+            return pickle.loads(decompress(b64decode(value.encode('ascii'))))
         raise ValueError(f"Unknown mode '{mode}'")
 
     def __setitem__(self, key: str, value: Any) -> None:
@@ -135,7 +136,7 @@ class DictatureTable:
         self.__table.set(key, Value(value=value, mode=value_mode.value))
 
     def __delitem__(self, key: str) -> None:
-        self.__table.delete(self.__name_transformer.forward(key))
+        self.__table.delete(self.__item_key(key))
 
     def __contains__(self, item: str):
         return item in self.keys()

dictature/transformer/__init__.py

@@ -1,2 +1,3 @@
 from .mock import MockTransformer
 from .passthrough import PassthroughTransformer
+from .pipeline import PipelineTransformer

dictature/transformer/aes.py

@@ -15,7 +15,7 @@ class AESTransformer(MockTransformer):
         self.__static = static_names_mode
 
     def forward(self, text: str) -> str:
-        cipher = self.__cipher
+        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()
@@ -24,19 +24,15 @@ class AESTransformer(MockTransformer):
 
     def backward(self, text: str) -> str:
         data = bytes.fromhex(text)
-        cipher = self.__cipher
         if self.__mode == AES.MODE_GCM:
             nonce, tag, ciphertext = data[:16], data[16:32], data[32:]
-            # noinspection PyTypeChecker
-            cipher = AES.new(self.__key, self.__mode, nonce=nonce)
-            return unpad(cipher.decrypt_and_verify(ciphertext, tag), AES.block_size).decode('utf8')
+            return unpad(self.__cipher(nonce=nonce).decrypt_and_verify(ciphertext, tag), AES.block_size).decode('utf8')
         else:
-            return unpad(cipher.decrypt(data), AES.block_size).decode('utf8')
+            return unpad(self.__cipher().decrypt(data), AES.block_size).decode('utf8')
 
-    @property
-    def __cipher(self) -> AES:
+    def __cipher(self, **kwargs) -> AES:
         # noinspection PyTypeChecker
-        return AES.new(self.__key, self.__mode)
+        return AES.new(self.__key, self.__mode, **kwargs)
 
     @property
     def static(self) -> bool:

dictature/transformer/hmac.py

@@ -0,0 +1,24 @@
+import hmac
+from hashlib import sha256
+from .mock import MockTransformer
+
+
+class HmacTransformer(MockTransformer):
+    def __init__(self, secret: str = 'dictature') -> None:
+        self.__secret = secret
+
+    def forward(self, text: str) -> str:
+        return f"{self.__hmac(text)}-{text}"
+
+    def backward(self, text: str) -> str:
+        mac, text = text.split('-', 1)
+        if mac != self.__hmac(text):
+            raise ValueError('Invalid HMAC')
+        return text
+
+    def __hmac(self, text: str) -> str:
+        return hmac.new(self.__secret.encode('utf8'), text.encode('utf8'), sha256).hexdigest()
+
+    @property
+    def static(self) -> bool:
+        return True

dictature/transformer/pipeline.py

@@ -0,0 +1,22 @@
+from typing import List
+
+from .mock import MockTransformer
+
+
+class PipelineTransformer(MockTransformer):
+    def __init__(self, transformers: List[MockTransformer]) -> None:
+        self.__transformers = transformers
+
+    def forward(self, text: str) -> str:
+        for transformer in self.__transformers:
+            text = transformer.forward(text)
+        return text
+
+    def backward(self, text: str) -> str:
+        for transformer in reversed(self.__transformers):
+            text = transformer.backward(text)
+        return text
+
+    @property
+    def static(self) -> bool:
+        return all(t.static for t in self.__transformers)

{dictature-0.9.2.dist-info → dictature-0.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dictature
-Version: 0.9.2
+Version: 0.9.3
 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.9.3.dist-info/RECORD

@@ -0,0 +1,17 @@
+dictature/__init__.py,sha256=UCPJKHeyirRZ0pCYoyeat-rwXa8pDezOJ3UWCipDdyc,33
+dictature/dictature.py,sha256=eFjUc5Q1DUXLNqk-UeHzFqWgCZppTsoK3TXCJ1UuCS8,5666
+dictature/backend/__init__.py,sha256=d5s6QCJOUzFglVNg8Cqqx_8b61S-AOTGjEUIF6FS69U,149
+dictature/backend/directory.py,sha256=KVbKS1CibXmY1NsZRWuTE0uC4DXRLOXqYEHxyHJidCc,3266
+dictature/backend/mock.py,sha256=Qd7KSh-qM763Jc7biDf5xYFWdgDax30dUHh2gXWwTZE,1266
+dictature/backend/sqlite.py,sha256=aExNxDtx1kiPrZn-jfCzbpV4alEXyGc6f12tuCJK1tk,5130
+dictature/transformer/__init__.py,sha256=JIFJpXU6iB9hIUM8L7HL2o9Nqjm_YbMEuQBQC8ZJ6b4,124
+dictature/transformer/aes.py,sha256=6H3jNkUpgWBX88BduMzbi9MDSRxMHnWmZZEIJ70BLi0,1601
+dictature/transformer/hmac.py,sha256=pYw6ybUIMoNdU2JFI9ffePr-33ails-CN9J6rFt7RVE,677
+dictature/transformer/mock.py,sha256=osETvYZjlgos0trJy0YvXcmtNy0L6x2h2099t1aHMFc,421
+dictature/transformer/passthrough.py,sha256=63hZCPQMUJa-G6ZKdv_xt2fMiMZpmPoL84PY5eb2ueE,269
+dictature/transformer/pipeline.py,sha256=-2r9FxLXEnk3qpCfXC0qp0KqNC2qkpChCJYEbZAQRYM,642
+dictature-0.9.3.dist-info/LICENSE,sha256=n1U9DKr8sM5EY2QHcvxSGiKTDWUT8MyXsOC79w94MT0,1072
+dictature-0.9.3.dist-info/METADATA,sha256=BPA99McqtwhQxjALGLwrWvaZiqRx3XHnjYZ5tEfxYIk,2478
+dictature-0.9.3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+dictature-0.9.3.dist-info/top_level.txt,sha256=-RO39WWCF44lqiXhSUcACVqbk6SkgReZTz7ZmHKH3-U,10
+dictature-0.9.3.dist-info/RECORD,,

dictature-0.9.2.dist-info/RECORD

@@ -1,15 +0,0 @@
-dictature/__init__.py,sha256=UCPJKHeyirRZ0pCYoyeat-rwXa8pDezOJ3UWCipDdyc,33
-dictature/dictature.py,sha256=nfoCcsI6pcXVZ6IoJLRFH7g42OJrUSVZFMf9jqCX0BQ,5551
-dictature/backend/__init__.py,sha256=d5s6QCJOUzFglVNg8Cqqx_8b61S-AOTGjEUIF6FS69U,149
-dictature/backend/directory.py,sha256=u_AIJnwjytTqwdjSz7DPp5aU3qX4kJyNp8dkzupSn_0,3246
-dictature/backend/mock.py,sha256=Qd7KSh-qM763Jc7biDf5xYFWdgDax30dUHh2gXWwTZE,1266
-dictature/backend/sqlite.py,sha256=aExNxDtx1kiPrZn-jfCzbpV4alEXyGc6f12tuCJK1tk,5130
-dictature/transformer/__init__.py,sha256=H3-ySHD-yZz9Zin2H9P619IdQiXh1e-yma669K4V_go,82
-dictature/transformer/aes.py,sha256=I1Nhr3pKIZ5K4fb4D1m1q4plrRU7Yllqid-ysv78KNk,1703
-dictature/transformer/mock.py,sha256=osETvYZjlgos0trJy0YvXcmtNy0L6x2h2099t1aHMFc,421
-dictature/transformer/passthrough.py,sha256=63hZCPQMUJa-G6ZKdv_xt2fMiMZpmPoL84PY5eb2ueE,269
-dictature-0.9.2.dist-info/LICENSE,sha256=n1U9DKr8sM5EY2QHcvxSGiKTDWUT8MyXsOC79w94MT0,1072
-dictature-0.9.2.dist-info/METADATA,sha256=ScBeTxvFHcr1EyGz5w2kFg6t-aXPBTDt0pkbfz-mhhY,2478
-dictature-0.9.2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-dictature-0.9.2.dist-info/top_level.txt,sha256=-RO39WWCF44lqiXhSUcACVqbk6SkgReZTz7ZmHKH3-U,10
-dictature-0.9.2.dist-info/RECORD,,