Skip to content

Redact OAuth2 refresh token from authentication-failure exception message (CWE-532) #4524

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
Dreamweaver156191 wants to merge 2 commits into
base: master
Choose a base branch
from
+23 −1
Open

Redact OAuth2 refresh token from authentication-failure exception message (CWE-532) #4524

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eaed1fc
Redact OAuth2 refresh token from authentication-failure exception mes…
Dreamweaver156191 Jul 19, 2026
deef252
Update jib-core/src/main/java/com/google/cloud/tools/jib/registry/Reg…
Dreamweaver156191 Jul 19, 2026
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
24 changes: 23 additions & 1 deletion jib-core/src/main/java/com/google/cloud/tools/jib/registry/RegistryAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,28 @@ String getAuthRequestParameters(
: serviceScope;
}

/**
* Same content as {@link #getAuthRequestParameters}, but with the OAuth2 refresh token
* redacted. Use this (never {@link #getAuthRequestParameters}) when building human-readable
* text such as exception messages or log output, since those routinely end up in build/CI
* logs -- the real, unredacted parameters must only ever be used for the actual HTTP request
* body sent to the registry's token endpoint.
*
* @param credential the credential used to authenticate
* @param repositoryScopes the repository scopes to authenticate for
* @return the auth request parameters, with any refresh token redacted
*/
@VisibleForTesting
String getRedactedAuthRequestParameters(
@Nullable Credential credential, Map<String, String> repositoryScopes) {
String parameters = getAuthRequestParameters(credential, repositoryScopes);
if (isOAuth2Auth(credential)) {
String password = Verify.verifyNotNull(credential).getPassword();
return parameters.replace("&refresh_token=" + password, "&refresh_token=<redacted>");
}
return parameters;
}
Comment thread
Dreamweaver156191 marked this conversation as resolved.

@VisibleForTesting
boolean isOAuth2Auth(@Nullable Credential credential) {
return credential != null && credential.isOAuth2RefreshToken();
Expand Down Expand Up @@ -292,7 +314,7 @@ private Authorization authenticate(
"Did not get token in authentication response from "
+ getAuthenticationUrl(credential, repositoryScopes)
+ "; parameters: "
+ getAuthRequestParameters(credential, repositoryScopes));
+ getRedactedAuthRequestParameters(credential, repositoryScopes));
}
return Authorization.fromBearerToken(responseJson.getToken());
}
Expand Down