Skip to content

Hide secret info from log info #6555

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
sima-zhu merged 3 commits into from
Nov 27, 2019
Merged

Hide secret info from log info #6555

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12b8789
Added some useful text into exception.
sima-zhu Nov 25, 2019
5bbec29
Make some changes to log and hide the secret info from log.
sima-zhu Nov 26, 2019
984ab45
Fix linting
sima-zhu Nov 26, 2019
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
17 changes: 7 additions & 10 deletions sdk/core/azure-core/src/main/java/com/azure/core/http/policy/HttpLoggingPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import com.fasterxml.jackson.databind.SerializationFeature;
import reactor.core.publisher.Mono;

import java.net.MalformedURLException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Locale;
Expand Down Expand Up @@ -83,13 +82,9 @@ public Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineN
private Mono<Void> logRequest(final ClientLogger logger, final HttpRequest request) {
final HttpLogDetailLevel httpLogLevel = httpLogOptions.getLogLevel();
if (httpLogLevel.shouldLogUrl()) {
try {
UrlBuilder requestUrl = UrlBuilder.parse(request.getUrl());
requestUrl.setQuery(getAllowedQueryString(request.getUrl().getQuery()));
logger.info("--> {} {}", request.getHttpMethod(), requestUrl.toUrl());
} catch (MalformedURLException ex) {
return Mono.error(logger.logExceptionAsWarning(new IllegalStateException("Invalid request URL.")));
}
UrlBuilder requestUrl = UrlBuilder.parse(request.getUrl());
requestUrl.setQuery(getAllowedQueryString(request.getUrl().getQuery()));
logger.info("--> {} {}", request.getHttpMethod(), requestUrl.toString());
}

if (httpLogLevel.shouldLogHeaders()) {
Expand Down Expand Up @@ -196,9 +191,11 @@ private Function<HttpResponse, Mono<HttpResponse>> logResponseDelegate(final Cli
bodySize = contentLengthString + "-byte";
}
HttpLogDetailLevel httpLogLevel = httpLogOptions.getLogLevel();
// HttpResponseStatus responseStatus = HttpResponseStatus.valueOf(response.statusCode());
if (httpLogLevel.shouldLogUrl()) {
logger.info("<-- {} {} ({} ms, {} body)", response.getStatusCode(), url, tookMs, bodySize);
UrlBuilder requestUrl = UrlBuilder.parse(url);
requestUrl.setQuery(getAllowedQueryString(url.getQuery()));
logger.info("<-- {} {} ({} ms, {} body)", response.getStatusCode(), requestUrl.toString(), tookMs,
bodySize);
}

if (httpLogLevel.shouldLogHeaders()) {
Expand Down