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

fix: Make external_account resistant to string type 'expires_in' responses from non-compliant services #1379

Merged
merged 3 commits into from
Sep 6, 2023
Merged

fix: Make external_account resistant to string type 'expires_in' responses from non-compliant services #1379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd84958
fix: Make OAUTH external_account resistant to string type 'expires_in…
duzun Sep 5, 2023
6089866
chore: Refresh system test creds.
clundin25 Sep 6, 2023
4580a65
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Sep 6, 2023
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: 8 additions & 1 deletion google/auth/external_account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,14 @@ def refresh(self, request):
additional_headers=additional_headers,
)
self.token = response_data.get("access_token")
lifetime = datetime.timedelta(seconds=response_data.get("expires_in"))
expires_in = response_data.get("expires_in")
# Some services do not respect the OAUTH2.0 RFC and send expires_in as a
# JSON String.
if isinstance(expires_in, str):
expires_in = int(expires_in)

lifetime = datetime.timedelta(seconds=expires_in)

self.expiry = now + lifetime

@_helpers.copy_docstring(credentials.CredentialsWithQuotaProject)
Expand Down
Binary file modified system_tests/secrets.tar.enc
View file
Open in desktop
Binary file not shown.
7 changes: 4 additions & 3 deletions tests/test_external_account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,19 +625,20 @@ def test_is_workforce_pool_with_users_and_impersonation(self, audience):
# Even though impersonation is used, is_workforce_pool should still return True.
assert credentials.is_workforce_pool is True

@pytest.mark.parametrize("mock_expires_in", [2800, "2800"])
@mock.patch(
"google.auth.metrics.python_and_auth_lib_version",
return_value=LANG_LIBRARY_METRICS_HEADER_VALUE,
)
@mock.patch("google.auth._helpers.utcnow", return_value=datetime.datetime.min)
def test_refresh_without_client_auth_success(
self, unused_utcnow, mock_auth_lib_value
self, unused_utcnow, mock_auth_lib_value, mock_expires_in
):
response = self.SUCCESS_RESPONSE.copy()
# Test custom expiration to confirm expiry is set correctly.
response["expires_in"] = 2800
response["expires_in"] = mock_expires_in
expected_expiry = datetime.datetime.min + datetime.timedelta(
seconds=response["expires_in"]
seconds=int(mock_expires_in)
)
headers = {
"Content-Type": "application/x-www-form-urlencoded",
Expand Down