Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
soledad
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
leap
soledad
Commits
50a863e5
Verified
Commit
50a863e5
authored
7 years ago
by
Victor
Browse files
Options
Downloads
Patches
Plain Diff
[bug] handle incomplete preamble as a retriable error
parent
8a89f00a
No related branches found
No related tags found
1 merge request
!178
#8824 incomplete blobs transfer
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/leap/soledad/client/_db/blobs/__init__.py
+5
-1
5 additions, 1 deletion
src/leap/soledad/client/_db/blobs/__init__.py
tests/blobs/test_decrypter_buffer.py
+13
-0
13 additions, 0 deletions
tests/blobs/test_decrypter_buffer.py
with
18 additions
and
1 deletion
src/leap/soledad/client/_db/blobs/__init__.py
+
5
−
1
View file @
50a863e5
...
...
@@ -104,8 +104,12 @@ class DecrypterBuffer(object):
if
self
.
decrypter
:
real_size
=
self
.
decrypter
.
decrypted_content_size
return
self
.
decrypter
.
endStream
(),
real_size
else
:
elif
hasattr
(
self
,
'
raw_data
'
):
# Externally encrypted blob, see Incoming API specification
return
self
.
raw_data
,
self
.
raw_data
.
tell
()
else
:
msg
=
"
Incomplete Blob: %s
"
%
self
.
doc_info
.
doc_id
raise
RetriableTransferError
(
msg
)
class
StreamDecrypterBuffer
(
object
):
...
...
This diff is collapsed.
Click to expand it.
tests/blobs/test_decrypter_buffer.py
+
13
−
0
View file @
50a863e5
...
...
@@ -27,6 +27,7 @@ from twisted.internet import defer
from
leap.soledad.client._db.blobs
import
DecrypterBuffer
from
leap.soledad.client._db.blobs
import
BlobManager
from
leap.soledad.client._db.blobs
import
FIXED_REV
from
leap.soledad.client._db.blobs.errors
import
RetriableTransferError
from
leap.soledad.client
import
_crypto
...
...
@@ -70,3 +71,15 @@ class DecrypterBufferCase(unittest.TestCase):
fd
=
BytesIO
(
'
up and up
'
)
manager
.
_client
.
put
=
_check_result
yield
manager
.
_encrypt_and_upload
(
self
.
doc_info
.
doc_id
,
fd
)
@defer.inlineCallbacks
def
test_incomplete_decryption
(
self
):
# SCENARIO: Transport failed and close was called with incomplete data
# CASE 1: Incomplete preamble
encrypted
=
(
yield
self
.
blob
.
encrypt
()).
getvalue
()
encrypted
=
encrypted
[:
20
]
# only 20 bytes of preamble arrived
tag
=
encrypted
[
-
16
:]
buf
=
DecrypterBuffer
(
self
.
doc_info
.
doc_id
,
self
.
secret
,
tag
)
buf
.
write
(
encrypted
)
self
.
assertRaises
(
RetriableTransferError
,
buf
.
close
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment