Skip to content

Keep ROPC password hashes out of the persisted http_cache #977

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
rumaisaaaaa263 wants to merge 1 commit into
base: dev
Choose a base branch
from
+16 −0
Open

Keep ROPC password hashes out of the persisted http_cache #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions msal/throttled_http_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ def __init__(self, *args, default_throttle_time=None, **kwargs):
isinstance(kwargs.get("data"), dict)
and kwargs["data"].get("grant_type") == DEVICE_AUTH_GRANT
)
and not( # Exclude ROPC, otherwise its key would be a password hash
isinstance(kwargs.get("data"), dict)
and kwargs["data"].get("grant_type") == "password"
)
and RetryAfterParser.FIELD_NAME_LOWER not in set( # Otherwise leave it to the Retry-After decorator
h.lower() for h in _get_headers(result))
else 0,
Expand Down
12 changes: 12 additions & 0 deletions tests/test_throttled_http_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,18 @@ def test_device_flow_retry_should_not_be_cached(self):
logger.debug(http_cache)
self.assertNotEqual(resp1.text, resp2.text, "Should return a new response")

def test_ropc_error_should_not_be_cached(self):
http_cache = {}
http_client = DummyHttpClient(status_code=400)
http_client = ThrottledHttpClient(http_client, http_cache=http_cache)
data = {"grant_type": "password", "username": "user", "password": "secret"}
resp1 = http_client.post("https://example.com", data=data)
resp2 = http_client.post("https://example.com", data=data)
logger.debug(http_cache)
self.assertNotEqual(resp1.text, resp2.text, "Should return a new response")
self.assertEqual({}, http_cache,
"A key derived from the password should not be stored in http_cache")

def test_throttled_http_client_should_provide_close(self):
http_client = DummyHttpClient(status_code=200)
http_client = ThrottledHttpClient(http_client)
Expand Down