Change KeyBasedEncryptor's padding #1508
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## develop #1508 +/- ##
===========================================
- Coverage 42.99% 42.99% -0.01%
===========================================
Files 477 477
Lines 14175 14174 -1
===========================================
- Hits 6095 6094 -1
Misses 8080 8080
Continue to review full report at Codecov.
|
| from monkey_island.cc.server_utils.encryption import KeyBasedEncryptor | ||
|
|
||
| PLAINTEXT = "password" | ||
| PLAINTEXT_UTF8 = "slaptažodis" # "password" in Lithuanian |
There was a problem hiding this comment.
Maybe add some other characters like: љњќшжѓ or 的 必 弟 . Just to make sure.
ilija-lazoroski
approved these changes
Oct 4, 2021
mssalvatore
requested changes
Oct 4, 2021
Comment on lines
41
to
45
| def _pad(self, message: str) -> bytes: | ||
| return Padding.pad(message.encode(), self._BLOCK_SIZE) | ||
|
|
||
| def _unpad(self, message: str): | ||
| return message[0 : -ord(message[len(message) - 1])] | ||
| def _unpad(self, message: bytes) -> str: | ||
| return Padding.unpad(message, self._BLOCK_SIZE).decode() |
There was a problem hiding this comment.
Since these functions are just thin wrappers, I suggest getting rid of them and inlining the calls to Padding.
padded_plaintext = Padding.pad(...)
return base64.base64encode(cipher_iv + cipher.encrypt(padded_plaintext)).decode()
...
padded_plaintext = cipher.decrypt(...)
return Padding.unpad(padded_plaintext, self._block_size).decode()| def test_encrypt_decrypt_string_utf8_with_key(): | ||
| encrypted = kb_encryptor.encrypt(PLAINTEXT_UTF8) | ||
| decrypted = kb_encryptor.decrypt(encrypted) | ||
| assert decrypted == PLAINTEXT_UTF8 |
There was a problem hiding this comment.
Let's add a test that encrypts plaintext that is exactly a multiple of _BLOCK_SIZE in length.
|
This should get a changelog entry. We fixed a bug. |
…ple of block size in length
shreyamalviya
force-pushed
the
encryptor-with-utf8-chars
branch
from
6fcb45d
to
19dad89
Compare
VakarisZ
approved these changes
Oct 5, 2021
ilija-lazoroski
approved these changes
Oct 5, 2021
mssalvatore
added a commit
that referenced
this pull request
Oct 5, 2021
Catching this exception was a workaround for an issue that was resolved in PR #1508.
mssalvatore
added a commit
that referenced
this pull request
Oct 12, 2021
Catching this exception was a workaround for an issue that was resolved in PR #1508.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Fixes #1490
PR Checklist
Was the documentation framework updated to reflect the changes?Testing Checklist