Skip to content
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

Jump to bottom

Fix detach&attach not to create new COSEMessage instance #447

Merged
merged 9 commits into from Oct 17, 2023
Merged

Fix detach&attach not to create new COSEMessage instance #447

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1bcbe96
fix: not to create new COSEMessage instance on detach/attach
kentakayama Oct 16, 2023
eb86bdc
fix: docstring of detach_payload
kentakayama Oct 16, 2023
134c547
update: dumps updated properties not the original msg
kentakayama Oct 17, 2023
98d0f58
update: ensure that the dumps method generates detached content COSE …
kentakayama Oct 17, 2023
8923605
Update cwt/cose_message.py
kentakayama Oct 17, 2023
2892ef1
Update cwt/cose_message.py
kentakayama Oct 17, 2023
409e9a4
Update cwt/cose_message.py
kentakayama Oct 17, 2023
d29b4d0
revert: let _msg to hold the latest value and _payload to hold the or…
kentakayama Oct 17, 2023
659da4b
Merge branch 'add-detached-content-converter' of github.com:kentakaya…
kentakayama Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions cwt/cose_message.py
View file
Open in desktop
Expand Up @@ -309,16 +309,19 @@ def detach_payload(self: Self) -> Tuple[COSEMessage, bytes]:
Detach a payload from the COSE message

Returns:
Tuple[COSEMessage, bytes]: A byte string of the encoded COSE or a
cbor2.CBORTag object, and a byte string of the detached payload.
Tuple[COSEMessage, bytes]: The COSE message (self),
and a byte string of the detached payload.
Raises:
ValueError: The payload does not exist.
"""

if not isinstance(self._payload, bytes):
kentakayama marked this conversation as resolved.
Show resolved Hide resolved
raise ValueError("The payload does not exist.")

return COSEMessage(self._type, [self._msg[0], self._msg[1], None, *self._msg[3:]]), self._payload
payload = self._payload
self._payload = None

return self, payload
kentakayama marked this conversation as resolved.
Show resolved Hide resolved

def attach_payload(self: Self, payload: bytes) -> COSEMessage:
"""
Expand All @@ -334,5 +337,6 @@ def attach_payload(self: Self, payload: bytes) -> COSEMessage:

if self._payload is not None:
kentakayama marked this conversation as resolved.
Show resolved Hide resolved
raise ValueError("The payload already exist.")
self._payload = payload

return COSEMessage(self._type, [self._msg[0], self._msg[1], payload, *self._msg[3:]])
return self