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

Jump to bottom

fix: disable logging from http requests and responses. #975

Closed
wants to merge 1 commit into from
Closed

fix: disable logging from http requests and responses. #975

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions oauth2_http/java/com/google/auth/oauth2/AwsCredentials.java
View file
Open in desktop
Expand Up @@ -200,13 +200,16 @@ private String retrieveResource(
HttpRequestFactory requestFactory = transportFactory.create().createRequestFactory();
HttpRequest request =
requestFactory.buildRequest(requestMethod, new GenericUrl(url), content);
request.setLoggingEnabled(false);

HttpHeaders requestHeaders = request.getHeaders();
for (Map.Entry<String, Object> header : headers.entrySet()) {
requestHeaders.set(header.getKey(), header.getValue());
}

HttpResponse response = request.execute();
response.setLoggingEnabled(false);

return response.parseAsString();
} catch (IOException e) {
throw new IOException(String.format("Failed to retrieve AWS %s.", resourceName), e);
Expand Down
5 changes: 5 additions & 0 deletions oauth2_http/java/com/google/auth/oauth2/ComputeEngineCredentials.java
View file
Open in desktop
Expand Up @@ -269,9 +269,12 @@ private HttpResponse getMetadataResponse(String url) throws IOException {
request.setParser(parser);
request.getHeaders().set(METADATA_FLAVOR, GOOGLE);
request.setThrowExceptionOnExecuteError(false);
request.setLoggingEnabled(false);

HttpResponse response;
try {
response = request.execute();
response.setLoggingEnabled(false);
} catch (UnknownHostException exception) {
throw new IOException(
"ComputeEngineCredentials cannot find the metadata server. This is"
Expand All @@ -296,8 +299,10 @@ static boolean runningOnComputeEngine(
transportFactory.create().createRequestFactory().buildGetRequest(tokenUrl);
request.setConnectTimeout(COMPUTE_PING_CONNECTION_TIMEOUT_MS);
request.getHeaders().set(METADATA_FLAVOR, GOOGLE);
request.setLoggingEnabled(false);

HttpResponse response = request.execute();
response.setLoggingEnabled(false);
try {
// Internet providers can return a generic response to all requests, so it is necessary
// to check that metadata header is present also.
Expand Down
4 changes: 4 additions & 0 deletions oauth2_http/java/com/google/auth/oauth2/IamUtils.java
View file
Open in desktop
Expand Up @@ -113,8 +113,10 @@ private static String getSignature(
JsonObjectParser parser = new JsonObjectParser(OAuth2Utils.JSON_FACTORY);
request.setParser(parser);
request.setThrowExceptionOnExecuteError(false);
request.setLoggingEnabled(false);

HttpResponse response = request.execute();
response.setLoggingEnabled(false);
int statusCode = response.getStatusCode();
if (statusCode >= 400 && statusCode < HttpStatusCodes.STATUS_CODE_SERVER_ERROR) {
GenericData responseError = response.parseAs(GenericData.class);
Expand Down Expand Up @@ -182,8 +184,10 @@ static IdToken getIdToken(
JsonObjectParser parser = new JsonObjectParser(OAuth2Utils.JSON_FACTORY);
request.setParser(parser);
request.setThrowExceptionOnExecuteError(false);
request.setLoggingEnabled(false);

HttpResponse response = request.execute();
response.setLoggingEnabled(false);
int statusCode = response.getStatusCode();
if (statusCode >= 400 && statusCode < HttpStatusCodes.STATUS_CODE_SERVER_ERROR) {
GenericData responseError = response.parseAs(GenericData.class);
Expand Down
2 changes: 2 additions & 0 deletions oauth2_http/java/com/google/auth/oauth2/IdentityPoolCredentials.java
View file
Open in desktop
Expand Up @@ -227,6 +227,7 @@ private String getSubjectTokenFromMetadataServer() throws IOException {
.createRequestFactory()
.buildGetRequest(new GenericUrl(identityPoolCredentialSource.credentialLocation));
request.setParser(new JsonObjectParser(OAuth2Utils.JSON_FACTORY));
request.setLoggingEnabled(false);

if (identityPoolCredentialSource.hasHeaders()) {
HttpHeaders headers = new HttpHeaders();
Expand All @@ -236,6 +237,7 @@ private String getSubjectTokenFromMetadataServer() throws IOException {

try {
HttpResponse response = request.execute();
response.setLoggingEnabled(false);
return parseToken(response.getContent());
} catch (IOException e) {
throw new IOException(
Expand Down
2 changes: 2 additions & 0 deletions oauth2_http/java/com/google/auth/oauth2/ImpersonatedCredentials.java
View file
Open in desktop
Expand Up @@ -518,10 +518,12 @@ public AccessToken refreshAccessToken() throws IOException {
HttpRequest request = requestFactory.buildPostRequest(url, requestContent);
adapter.initialize(request);
request.setParser(parser);
request.setLoggingEnabled(false);

HttpResponse response = null;
try {
response = request.execute();
response.setLoggingEnabled(false);
} catch (IOException e) {
throw new IOException("Error requesting access token", e);
}
Expand Down
4 changes: 4 additions & 0 deletions oauth2_http/java/com/google/auth/oauth2/ServiceAccountCredentials.java
View file
Open in desktop
Expand Up @@ -539,6 +539,7 @@ public AccessToken refreshAccessToken() throws IOException {
request.setNumberOfRetries(0);
}
request.setParser(new JsonObjectParser(jsonFactory));
request.setLoggingEnabled(false);

ExponentialBackOff backoff =
new ExponentialBackOff.Builder()
Expand All @@ -563,6 +564,7 @@ public boolean isRequired(HttpResponse response) {

try {
response = request.execute();
response.setLoggingEnabled(false);
} catch (HttpResponseException re) {
String message = String.format(errorTemplate, re.getMessage(), getIssuer());
throw GoogleAuthException.createWithTokenEndpointResponseException(re, message);
Expand Down Expand Up @@ -606,9 +608,11 @@ public IdToken idTokenWithAudience(String targetAudience, List<Option> options)
HttpRequestFactory requestFactory = transportFactory.create().createRequestFactory();
HttpRequest request = requestFactory.buildPostRequest(new GenericUrl(tokenServerUri), content);
request.setParser(new JsonObjectParser(jsonFactory));
request.setLoggingEnabled(false);
HttpResponse response;
try {
response = request.execute();
response.setLoggingEnabled(false);
} catch (IOException e) {
throw new IOException(
String.format(
Expand Down
3 changes: 3 additions & 0 deletions oauth2_http/java/com/google/auth/oauth2/StsRequestHandler.java
View file
Open in desktop
Expand Up @@ -98,12 +98,15 @@ public StsTokenExchangeResponse exchangeToken() throws IOException {
HttpRequest httpRequest =
httpRequestFactory.buildPostRequest(new GenericUrl(tokenExchangeEndpoint), content);
httpRequest.setParser(new JsonObjectParser(OAuth2Utils.JSON_FACTORY));
httpRequest.setLoggingEnabled(false);
if (headers != null) {
httpRequest.setHeaders(headers);
}

try {
HttpResponse response = httpRequest.execute();
response.setLoggingEnabled(false);

GenericData responseData = response.parseAs(GenericData.class);
return buildResponse(responseData);
} catch (HttpResponseException e) {
Expand Down
3 changes: 3 additions & 0 deletions oauth2_http/java/com/google/auth/oauth2/TokenVerifier.java
View file
Open in desktop
Expand Up @@ -318,8 +318,11 @@ public Map<String, PublicKey> load(String certificateUrl) throws Exception {
httpTransport
.createRequestFactory()
.buildGetRequest(new GenericUrl(certificateUrl))
.setLoggingEnabled(false)
.setParser(OAuth2Utils.JSON_FACTORY.createJsonObjectParser());
HttpResponse response = request.execute();
response.setLoggingEnabled(false);

jwks = response.parseAs(JsonWebKeySet.class);

ImmutableMap.Builder<String, PublicKey> keyCacheBuilder = new ImmutableMap.Builder<>();
Expand Down
4 changes: 4 additions & 0 deletions oauth2_http/java/com/google/auth/oauth2/UserAuthorizer.java
View file
Open in desktop
Expand Up @@ -243,8 +243,10 @@ public UserCredentials getCredentialsFromCode(String code, URI baseUri) throws I
HttpRequest tokenRequest =
requestFactory.buildPostRequest(new GenericUrl(tokenServerUri), tokenContent);
tokenRequest.setParser(new JsonObjectParser(OAuth2Utils.JSON_FACTORY));
tokenRequest.setLoggingEnabled(false);

HttpResponse tokenResponse = tokenRequest.execute();
tokenResponse.setLoggingEnabled(false);

GenericJson parsedTokens = tokenResponse.parseAs(GenericJson.class);
String accessTokenValue =
Expand Down Expand Up @@ -319,6 +321,8 @@ public void revokeAuthorization(String userId) throws IOException {
revokeUrl.put("token", revokeToken);
HttpRequestFactory requestFactory = transportFactory.create().createRequestFactory();
HttpRequest tokenRequest = requestFactory.buildGetRequest(revokeUrl);
tokenRequest.setLoggingEnabled(false);

tokenRequest.execute();

if (deleteTokenException != null) {
Expand Down
2 changes: 2 additions & 0 deletions oauth2_http/java/com/google/auth/oauth2/UserCredentials.java
View file
Open in desktop
Expand Up @@ -271,10 +271,12 @@ private GenericData doRefreshAccessToken() throws IOException {
HttpRequestFactory requestFactory = transportFactory.create().createRequestFactory();
HttpRequest request = requestFactory.buildPostRequest(new GenericUrl(tokenServerUri), content);
request.setParser(new JsonObjectParser(JSON_FACTORY));
request.setLoggingEnabled(false);
HttpResponse response;

try {
response = request.execute();
response.setLoggingEnabled(false);
} catch (HttpResponseException re) {
throw GoogleAuthException.createWithTokenEndpointResponseException(re);
}
Expand Down