10000 Allow mid frame extraction WIP by Alan01252 · Pull Request #1 · Alan01252/aws-encryption-sdk-python · GitHub
[go: up one dir, main page]
Skip to content

Allow mid frame extraction WIP #1

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow mid frame extraction WIP #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
340196d
Allow mid frame extraction WIP
Alan01252 Feb 6, 2019
1c3cfb7
Temp set footer verification to None
Alan01252 Feb 12, 2019
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
22 changes: 19 additions & 3 deletions src/aws_encryption_sdk/streaming_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,13 @@ def __init__(self, **kwargs): # pylint: disable=unused-argument,super-init-not-
"""Prepares necessary initial values."""
self.last_sequence_number = 0
self.__unframed_bytes_read = 0
self.read_to_sequence_number = -1

def set_initial_sequence_number(self, initial_sequence_number):
self.last_sequence_number = initial_sequence_number

def set_read_to_sequence_number(self, read_to_sequence_number):
self.read_to_sequence_number = read_to_sequence_number

def _prep_message(self):
"""Performs initial message setup."""
Expand Down Expand Up @@ -868,7 +875,7 @@ def _read_bytes_from_framed_body(self, b):
_LOGGER.debug("collecting %d bytes", b)
while len(plaintext) < b and not final_frame:
_LOGGER.debug("Reading frame")
frame_data, final_frame = deserialize_frame(
frame_data, footer_frame = deserialize_frame(
stream=self.source_stream, header=self._header, verifier=self.verifier
)
_LOGGER.debug("Read complete for frame %d", frame_data.sequence_number)
Expand All @@ -892,9 +899,18 @@ def _read_bytes_from_framed_body(self, b):
)
plaintext_length = len(plaintext)
_LOGGER.debug("bytes collected: %d", plaintext_length)
if final_frame:

if self.last_sequence_number == self.read_to_sequence_number or footer_frame:
_LOGGER.debug("Found all requested frames")
self.footer = True
final_frame = True

if final_frame or footer_frame:
final_frame = True

if footer_frame:
_LOGGER.debug("Reading footer")
self.footer = deserialize_footer(stream=self.source_stream, verifier=self.verifier)
self.footer = deserialize_footer(stream=self.source_stream, verifier=None)

return plaintext

Expand Down
0