Skip to content

chore: resolve linter issues #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 7, 2025
Merged

chore: resolve linter issues #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/apify/_consts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@
BASE64_REGEXP = '[-A-Za-z0-9+/]*={0,3}'
ENCRYPTED_STRING_VALUE_PREFIX = 'ENCRYPTED_VALUE'
ENCRYPTED_JSON_VALUE_PREFIX = 'ENCRYPTED_JSON'
ENCRYPTED_INPUT_VALUE_REGEXP = re.compile(f'^({ENCRYPTED_STRING_VALUE_PREFIX}|{ENCRYPTED_JSON_VALUE_PREFIX}):(?:({BASE64_REGEXP}):)?({BASE64_REGEXP}):({BASE64_REGEXP})$')
ENCRYPTED_INPUT_VALUE_REGEXP = re.compile(
f'^({ENCRYPTED_STRING_VALUE_PREFIX}|{ENCRYPTED_JSON_VALUE_PREFIX}):(?:({BASE64_REGEXP}):)?({BASE64_REGEXP}):({BASE64_REGEXP})$'
)
2 changes: 1 addition & 1 deletion src/apify/_crypto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from apify_shared.utils import ignore_docs
from crawlee._utils.crypto import crypto_random_object_id

from apify._consts import ENCRYPTED_INPUT_VALUE_REGEXP, ENCRYPTED_STRING_VALUE_PREFIX, ENCRYPTED_JSON_VALUE_PREFIX
from apify._consts import ENCRYPTED_INPUT_VALUE_REGEXP, ENCRYPTED_JSON_VALUE_PREFIX, ENCRYPTED_STRING_VALUE_PREFIX

ENCRYPTION_KEY_LENGTH = 32
ENCRYPTION_IV_LENGTH = 16
Expand Down
32 changes: 24 additions & 8 deletions tests/unit/actor/test_actor_key_value_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from ..test_crypto import PRIVATE_KEY_PASSWORD, PRIVATE_KEY_PEM_BASE64, PUBLIC_KEY
from apify import Actor
from apify._consts import ENCRYPTED_STRING_VALUE_PREFIX, ENCRYPTED_JSON_VALUE_PREFIX
from apify._consts import ENCRYPTED_JSON_VALUE_PREFIX, ENCRYPTED_STRING_VALUE_PREFIX
from apify._crypto import public_encrypt

if TYPE_CHECKING:
Expand Down Expand Up @@ -79,9 +79,9 @@ async def test_get_input_with_encrypted_secrets(
secret_object = {'foo': 'bar', 'baz': 'qux'}
secret_array = ['foo', 'bar', 'baz']

# The legacy encryption format uses ENCRYPTED_STRING_VALUE_PREFIX prefix, value in raw string and does not include schemahash.
# The new format uses ENCRYPTED_JSON_VALUE_PREFIX prefix, value in JSON format and includes schemahash.
# We are testing both formats to ensure backward compatibility.
# The legacy encryption format uses ENCRYPTED_STRING_VALUE_PREFIX prefix, value in raw string and does
# not include schemahash. The new format uses ENCRYPTED_JSON_VALUE_PREFIX prefix, value in JSON format
# and includes schemahash. We are testing both formats to ensure backward compatibility.

encrypted_string_legacy = public_encrypt(secret_string_legacy, public_key=PUBLIC_KEY)
encrypted_string = public_encrypt(json_dumps(secret_string), public_key=PUBLIC_KEY)
Expand All @@ -90,10 +90,26 @@ async def test_get_input_with_encrypted_secrets(

input_with_secret = {
'foo': 'bar',
'secret_string_legacy': f'{ENCRYPTED_STRING_VALUE_PREFIX}:{encrypted_string_legacy["encrypted_password"]}:{encrypted_string_legacy["encrypted_value"]}',
'secret_string': f'{ENCRYPTED_JSON_VALUE_PREFIX}:schemahash:{encrypted_string["encrypted_password"]}:{encrypted_string["encrypted_value"]}',
'secret_object': f'{ENCRYPTED_JSON_VALUE_PREFIX}:schemahash:{encrypted_object["encrypted_password"]}:{encrypted_object["encrypted_value"]}',
'secret_array': f'{ENCRYPTED_JSON_VALUE_PREFIX}:schemahash:{encrypted_array["encrypted_password"]}:{encrypted_array["encrypted_value"]}',
'secret_string_legacy': (
f'{ENCRYPTED_STRING_VALUE_PREFIX}:'
f'{encrypted_string_legacy["encrypted_password"]}:'
f'{encrypted_string_legacy["encrypted_value"]}'
),
'secret_string': (
f'{ENCRYPTED_JSON_VALUE_PREFIX}:schemahash:'
f'{encrypted_string["encrypted_password"]}:'
f'{encrypted_string["encrypted_value"]}'
),
'secret_object': (
f'{ENCRYPTED_JSON_VALUE_PREFIX}:schemahash:'
f'{encrypted_object["encrypted_password"]}:'
f'{encrypted_object["encrypted_value"]}'
),
'secret_array': (
f'{ENCRYPTED_JSON_VALUE_PREFIX}:schemahash:'
f'{encrypted_array["encrypted_password"]}:'
f'{encrypted_array["encrypted_value"]}'
),
}

await memory_storage_client.key_value_stores().get_or_create(id='default')
Expand Down