Allow keyfile to be passed as bytes #364
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
In order to prevent application to create temporary files, provide keyfile as bytes. Fixes: libkeepass#363
|
@Evidlo May i ask you for a review? |
A6GibKm
reviewed
Nov 1, 2023
pykeepass/kdbx_parsing/common.py
Outdated
| assert hash == hash_computed, "Keyfile has invalid hash" | ||
| # otherwise, try to read plain keyfile | ||
| except (etree.XMLSyntaxError, UnicodeDecodeError): | ||
| if isinstance(keyfile, bytes): |
There was a problem hiding this comment.
See the save method, where it checks whether the file has hasattr(filename, "write") maybe the same could be done with the read attribute. BytesIO has this btw.
There was a problem hiding this comment.
In this case i'd need to change it from bytes to BytesIO. Not sure we want to enforce this in apps using pykeepass? No strong opinion here, up to the reviewers i guess.
|
Hello sorry to ping you @Evidlo. Is anything missing on your end? |
Evidlo
force-pushed
the
keyfile-bytes
branch
from
879d869
to
bc3e5cb
Compare
|
Sorry for the late response. I did a refactor which is a bit simpler than before, but it assumes that |
Evidlo
force-pushed
the
keyfile-bytes
branch
from
bc3e5cb
to
c53ecd0
Compare
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.
In order to prevent application to create temporary files, provide keyfile as bytes.
Fixes: #363