refactor: clean up

Author: danpoletaev

src/apify/_crypto.py

@@ -3,6 +3,7 @@
 import base64
 import hashlib
 import hmac
+import string
 from typing import Any
 
 from cryptography.exceptions import InvalidTag as InvalidTagException
@@ -157,7 +158,7 @@ def decrypt_input_secrets(private_key: rsa.RSAPrivateKey, input_data: Any) -> An
     return input_data
 
 
-CHARSET = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+CHARSET = string.digits + string.ascii_letters
 
 
 def encode_base62(num: int) -> str:
@@ -172,11 +173,12 @@ def encode_base62(num: int) -> str:
     return res
 
 
-# createHmacSignature
 @ignore_docs
 def create_hmac_signature(secret_key: str, message: str) -> str:
     """Generates an HMAC signature and encodes it using Base62. Base62 encoding reduces the signature length.
 
+    HMAC signature is truncated to 30 characters to make it shorter.
+
     Args:
         secret_key (str): Secret key used for signing signatures
         message (str): Message to be signed

src/apify/apify_storage_client/_key_value_store_client.py

@@ -94,7 +94,7 @@ async def get_public_url(self, key: str) -> str:
         public_api_url = self._api_public_base_url
         public_url = f'{public_api_url}/v2/key-value-stores/{self._client.resource_id}/records/{key}'
 
-        url_signing_secret_key = getattr(self.storage_object, 'url_signing_secret_key', None)  # type: ignore[attr-defined]
+        url_signing_secret_key = getattr(self.storage_object, 'url_signing_secret_key', None)
         if url_signing_secret_key:
             public_url += f'?signature={create_hmac_signature(url_signing_secret_key, key)}'
 

tests/unit/test_crypto.py

@@ -8,6 +8,7 @@
     _load_public_key,
     create_hmac_signature,
     crypto_random_object_id,
+    encode_base62,
     load_private_key,
     private_decrypt,
     public_encrypt,
@@ -114,7 +115,12 @@ def test_crypto_random_object_id_length_and_charset() -> None:
         assert char in 'abcdefghijklmnopqrstuvwxyzABCEDFGHIJKLMNOPQRSTUVWXYZ0123456789'
 
 
-# Check if the method is compatible with js version of the same method in:
+@pytest.mark.parametrize(('test_input', 'expected'), [(0, '0'), (10, 'a'), (999999999, '15FTGf')])
+def test_encode_base62(test_input: int, expected: str) -> None:
+    assert encode_base62(test_input) == expected
+
+
+# This test ensures compatibility with the JavaScript version of the same method.
 # https://github.com/apify/apify-shared-js/blob/master/packages/utilities/src/hmac.ts
 def test_create_valid_hmac_signature() -> None:
     # This test uses the same secret key and message as in JS tests.
@@ -127,5 +133,5 @@ def test_create_same_hmac() -> None:
     # This test uses the same secret key and message as in JS tests.
     secret_key = 'hmac-same-secret-key'
     message = 'hmac-same-message-to-be-authenticated'
-    for _ in range(5):
-        assert create_hmac_signature(secret_key, message) == 'FYMcmTIm3idXqleF1Sw5'
+    assert create_hmac_signature(secret_key, message) == 'FYMcmTIm3idXqleF1Sw5'
+    assert create_hmac_signature(secret_key, message) == 'FYMcmTIm3idXqleF1Sw5'