Skip to content

fix: Do not retrieve the default SA principal when getting an access token #1839

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
lqiu96 merged 2 commits into from
Nov 6, 2025
Merged

fix: Do not retrieve the default SA principal when getting an access token #1839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28e579c
fix: Do not retrieve the default SA account when getting an access token
lqiu96 Nov 6, 2025
a191014
chore: Fix the logging tests
lqiu96 Nov 6, 2025
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
5 changes: 0 additions & 5 deletions oauth2_http/java/com/google/auth/oauth2/ComputeEngineCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,11 +344,6 @@ private String getUniverseDomainFromMetadata() throws IOException {
/** Refresh the access token by getting it from the GCE metadata server */
@Override
public AccessToken refreshAccessToken() throws IOException {
// Retrieve the default service account email prior to retrieving the access token
if (principal == null) {
principal = getDefaultServiceAccount();
}

HttpResponse response =
getMetadataResponse(createTokenUrlWithScopes(), RequestType.ACCESS_TOKEN_REQUEST, true);
int statusCode = response.getStatusCode();
Expand Down
38 changes: 4 additions & 34 deletions oauth2_http/javatests/com/google/auth/oauth2/LoggingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,39 +441,9 @@ public void getRequestMetadata_hasAccessToken() throws IOException {

TestUtils.assertContainsBearerToken(metadata, ACCESS_TOKEN);

assertEquals(6, testAppender.events.size());

ILoggingEvent defaultServiceAccountRequest = testAppender.events.get(0);
assertEquals(
"Sending request for universe domain/default service account",
defaultServiceAccountRequest.getMessage());
assertEquals(3, defaultServiceAccountRequest.getKeyValuePairs().size());
for (KeyValuePair kvp : defaultServiceAccountRequest.getKeyValuePairs()) {
assertTrue(
kvp.key.equals("request.headers")
|| kvp.key.equals("request.method")
|| kvp.key.equals("request.url"));
if (kvp.key.equals("request.headers")) {
assertTrue(isValidJson((String) kvp.value));
}
}
ILoggingEvent defaultServiceAccountResponse = testAppender.events.get(1);
assertEquals(
"Received response for universe domain/default service account",
defaultServiceAccountResponse.getMessage());
assertEquals(3, defaultServiceAccountResponse.getKeyValuePairs().size());
for (KeyValuePair kvp : defaultServiceAccountResponse.getKeyValuePairs()) {
assertTrue(
kvp.key.equals("response.headers")
|| kvp.key.equals("response.status")
|| kvp.key.equals("response.status.message"));
}
ILoggingEvent defaultServiceAccountPayload = testAppender.events.get(2);
assertEquals(
"Received default service account payload", defaultServiceAccountPayload.getMessage());
assertEquals(1, defaultServiceAccountPayload.getKeyValuePairs().size());
assertEquals(3, testAppender.events.size());

ILoggingEvent accessTokenRequest = testAppender.events.get(3);
ILoggingEvent accessTokenRequest = testAppender.events.get(0);
assertEquals("Sending request to refresh access token", accessTokenRequest.getMessage());
assertEquals(3, accessTokenRequest.getKeyValuePairs().size());
for (KeyValuePair kvp : accessTokenRequest.getKeyValuePairs()) {
Expand All @@ -485,7 +455,7 @@ public void getRequestMetadata_hasAccessToken() throws IOException {
assertTrue(isValidJson((String) kvp.value));
}
}
ILoggingEvent accessTokenResponse = testAppender.events.get(4);
ILoggingEvent accessTokenResponse = testAppender.events.get(1);
assertEquals("Received response for refresh access token", accessTokenResponse.getMessage());
assertEquals(3, accessTokenResponse.getKeyValuePairs().size());
for (KeyValuePair kvp : accessTokenResponse.getKeyValuePairs()) {
Expand All @@ -494,7 +464,7 @@ public void getRequestMetadata_hasAccessToken() throws IOException {
|| kvp.key.equals("response.status")
|| kvp.key.equals("response.status.message"));
}
ILoggingEvent accessTokenPayload = testAppender.events.get(5);
ILoggingEvent accessTokenPayload = testAppender.events.get(2);
assertEquals("Response payload for access token", accessTokenPayload.getMessage());
assertEquals(3, accessTokenPayload.getKeyValuePairs().size());

Expand Down