Skip to content

Hide secret info from log info (#6555) #6623

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
alzimmermsft merged 3 commits into from
Dec 5, 2019
Merged

Hide secret info from log info (#6555) #6623

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
3859d83
Hide secret info from log info (#6555)
sima-zhu Nov 27, 2019
b963c95
Update pom versions and Azure Core README
alzimmermsft Dec 4, 2019
a6d83bf
Reverted dependency versions
alzimmermsft Dec 5, 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
2 changes: 1 addition & 1 deletion eng/jacoco-test-coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion eng/spotbugs-aggregate-report/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

com.azure:azure-sdk-parent;1.6.0;1.6.0
com.azure:azure-client-sdk-parent;1.7.0;1.7.0
com.azure:azure-core;1.1.0;1.1.0
com.azure:azure-core;1.1.0;1.1.1
com.azure:azure-core-amqp;1.0.0-beta.8;1.0.0-beta.8
com.azure:azure-core-http-netty;1.1.0;1.1.0
com.azure:azure-core-http-okhttp;1.1.0-beta.1;1.1.0-beta.1
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core-amqp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-http-netty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>

<dependency>
Expand Down Expand Up @@ -109,7 +109,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-http-okhttp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>

<dependency>
Expand All @@ -72,7 +72,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core-management/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Typically, you will not need to install or specifically depend on Azure Core, in
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.0.0</version>
<version>1.1.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<packaging>jar</packaging>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.1.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->

<name>Microsoft Azure Java Core Library</name>
<description>This package contains core types for Azure Java clients.</description>
Expand Down
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