Skip to content

Writing of protected cache in bytes for Windows 10 DPAPI #52

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

Merged
abhidnya13 merged 4 commits into from
Apr 25, 2020
Merged

Writing of protected cache in bytes for Windows 10 DPAPI #52

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfb28f0
Changing test skip condition
abhidnya13 Apr 24, 2020
266c058
Opening file in byte mode
abhidnya13 Apr 24, 2020
faf6136
Disabling test related to dpapi
abhidnya13 Apr 24, 2020
2f5e9bc
Adding type hints
abhidnya13 Apr 25, 2020
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
9 changes: 5 additions & 4 deletions msal_extensions/persistence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,13 @@ def __init__(self, location, entropy=''):
super(FilePersistenceWithDataProtection, self).__init__(location)

def save(self, content):
super(FilePersistenceWithDataProtection, self).save(
self._dp_agent.protect(content))
with open(self._location, 'wb+') as handle:
handle.write(self._dp_agent.protect(content))

def load(self):
return self._dp_agent.unprotect(
super(FilePersistenceWithDataProtection, self).load())
with open(self._location, 'rb') as handle:
return self._dp_agent.unprotect(
handle.read())

@rayluo rayluo Apr 25, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
with open(self._location, 'rb') as handle:
return self._dp_agent.unprotect(
handle.read())
# type: () -> str
with open(self._location, 'rb') as handle:
return self._dp_agent.unprotect(handle.read())

Given that we are getting into the nasty difference of string and bytes anyway, let's also include a type hint here. Same suggestion for save() too. In the near future (but not in this PR), we will pick up another task for documentation, and describe this in details there.

Also, since this is not automated, please manually test this test case and that sample, on both Python 2.7 and one version of Python 3, we need to see all pass in such 2x2 matrix. Please ack.

@abhidnya13 abhidnya13 Apr 25, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Manually tested the test case and the sample on Python 2.7 and 3.7 and it works fine



class KeychainPersistence(BasePersistence):
Expand Down