Skip to content

hanging object references in helper functions avoided #264

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 4 commits into from
May 5, 2020
Merged

hanging object references in helper functions avoided #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c65612c
hanging object references in helper functions avoided
abdulsmapara Apr 28, 2020
dd95129
Merge branch 'master' into master
mattsb42-aws Apr 28, 2020
cb9a3d9
Done autoformatting using tox
abdulsmapara May 1, 2020
59ccd2b
Header assertion modified
abdulsmapara May 1, 2020
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
12 changes: 10 additions & 2 deletions src/aws_encryption_sdk/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0
"""High level AWS Encryption SDK client functions."""
import copy

# Below are imported for ease of use by implementors
from aws_encryption_sdk.caches.local import LocalCryptoMaterialsCache # noqa
from aws_encryption_sdk.caches.null import NullCryptoMaterialsCache # noqa
Expand Down Expand Up @@ -84,7 +86,10 @@ def encrypt(**kwargs):
with StreamEncryptor(**kwargs) as encryptor:
ciphertext = encryptor.read()

return CryptoResult(result=ciphertext, header=encryptor.header, keyring_trace=encryptor.keyring_trace)
header_copy = copy.deepcopy(encryptor.header)
keyring_trace_copy = copy.deepcopy(encryptor.keyring_trace)

return CryptoResult(result=ciphertext, header=header_copy, keyring_trace=keyring_trace_copy)


def decrypt(**kwargs):
Expand Down Expand Up @@ -143,7 +148,10 @@ def decrypt(**kwargs):
with StreamDecryptor(**kwargs) as decryptor:
plaintext = decryptor.read()

return CryptoResult(result=plaintext, header=decryptor.header, keyring_trace=decryptor.keyring_trace)
header_copy = copy.deepcopy(decryptor.header)
keyring_trace_copy = copy.deepcopy(decryptor.keyring_trace)

return CryptoResult(result=plaintext, header=header_copy, keyring_trace=keyring_trace_copy)


def stream(**kwargs):
Expand Down
6 changes: 4 additions & 2 deletions test/unit/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,15 @@ def test_encrypt(self):
test_ciphertext, test_header = aws_encryption_sdk.encrypt(a=sentinel.a, b=sentinel.b, c=sentinel.b)
self.mock_stream_encryptor.called_once_with(a=sentinel.a, b=sentinel.b, c=sentinel.b)
assert test_ciphertext is _CIPHERTEXT
assert test_header is _HEADER
assert test_header == _HEADER
assert test_header is not _HEADER

def test_decrypt(self):
test_plaintext, test_header = aws_encryption_sdk.decrypt(a=sentinel.a, b=sentinel.b, c=sentinel.b)
self.mock_stream_encryptor.called_once_with(a=sentinel.a, b=sentinel.b, c=sentinel.b)
assert test_plaintext is _PLAINTEXT
assert test_header is _HEADER
assert test_header == _HEADER
assert test_header is not _HEADER

def test_stream_encryptor_e(self):
test = aws_encryption_sdk.stream(mode="e", a=sentinel.a, b=sentinel.b, c=sentinel.b)
Expand Down