diff options
| author | Victor Shyba <victor1984@riseup.net> | 2018-01-03 23:31:00 -0300 |
|---|---|---|
| committer | Victor Shyba <victor1984@riseup.net> | 2018-01-03 23:31:00 -0300 |
| commit | 123f9ead4228c749f2d8d00fb755f46e568e5238 (patch) | |
| tree | cc0512aa05e4f59ed420234e8df5e560a09cd0b2 | |
| parent | 2fbf74283d94b946c0d4cdd837aa1a80e2546ebb (diff) | |
[style] fix typos and add comments from review
| -rw-r--r-- | src/leap/soledad/client/_db/blobs/__init__.py | 4 | ||||
| -rw-r--r-- | tests/blobs/test_decrypter_buffer.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/soledad/client/_db/blobs/__init__.py b/src/leap/soledad/client/_db/blobs/__init__.py index cacfe638..517cfad4 100644 --- a/src/leap/soledad/client/_db/blobs/__init__.py +++ b/src/leap/soledad/client/_db/blobs/__init__.py @@ -105,9 +105,11 @@ class DecrypterBuffer(object): real_size = self.decrypter.decrypted_content_size return self.decrypter.endStream(), real_size elif hasattr(self, 'raw_data'): - # Externally encrypted blob, see Incoming API specification + # blob was not symmetrically encrypted, see _make_decryptor() above return self.raw_data, self.raw_data.tell() else: + # the only case that can lead here is if the preamble was not + # completelly consumed by the pipe. msg = "Incomplete Blob: %s" % self.doc_info.doc_id raise RetriableTransferError(msg) diff --git a/tests/blobs/test_decrypter_buffer.py b/tests/blobs/test_decrypter_buffer.py index db8ca5fa..6b4a744f 100644 --- a/tests/blobs/test_decrypter_buffer.py +++ b/tests/blobs/test_decrypter_buffer.py @@ -88,7 +88,7 @@ class DecrypterBufferCase(unittest.TestCase): @defer.inlineCallbacks def test_incomplete_blob_decryption(self): # SCENARIO: Transport failed and close was called with incomplete data - # CASE 1: Incomplete blob of known encryption type + # CASE 2: Incomplete blob of known encryption type # OUTCOME: InvalidBlob. It's safer to assume the tag is invalid encrypted = (yield self.blob.encrypt()).getvalue() encrypted = encrypted[:-20] # 20 bytes missing |