Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions client_encryption/json_path_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ def cleanup_node(tree, path, target):
node = __get_node(tree, parent, False)
else:
node = tree
if type(node) is list and not node[0][to_delete]:
del node[0][to_delete]
elif not node[to_delete]:
if type(node) is list:
node = node[0]
if not node[to_delete]:
del node[to_delete]

else:
Expand Down
12 changes: 12 additions & 0 deletions tests/test_field_level_encryption.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,18 @@ def setUp(self):
self._config._paths["$"]._to_encrypt = {"data": "encryptedData"}
self._config._paths["$"]._to_decrypt = {"encryptedData": "data"}

def test_decrypt_array_preserves_encrypted_node_metadata(self):
payload = [{"data": {"message": "hello"}}]
encrypted = to_test.encrypt_payload(payload, self._config)
encrypted[0]["encryptedData"]["metadata"] = "keep"

decrypted = to_test.decrypt_payload(encrypted, self._config)

self.assertEqual(
[{"data": {"message": "hello"}, "encryptedData": {"metadata": "keep"}}],
decrypted,
)

def test_encrypt_bytes(self):
iv_value = base64.b64decode("VNm/scgd1jhWF0z4+Qh6MA==")
key_kalue = base64.b64decode("mZzmzoURXI3Vk0vdsPkcFw==")
Expand Down