Skip to content

Prevent http.url containing credentials in HttpClientTracer #2707

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
trask merged 7 commits into from
May 7, 2021
Merged

Prevent http.url containing credentials in HttpClientTracer #2707

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c3bf9c5
http.url must not contain credentials
Hangzhi Apr 3, 2021
11d539a
remove user info from url
Hangzhi Apr 6, 2021
56736f8
Update HttpClientTracerTest.groovy
Hangzhi Apr 6, 2021
6cea355
fix httpClient and httpServer
Hangzhi Apr 17, 2021
739ad02
Update HttpServerTracer.java
Hangzhi Apr 17, 2021
e0c082e
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…
May 7, 2021
724c27c
Only scrub userinfo if present
May 7, 2021
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
8 changes: 7 additions & 1 deletion ...ation-api/src/main/java/io/opentelemetry/instrumentation/api/tracer/HttpClientTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,14 @@ private void setUrl(AttributeSetter setter, REQUEST request) {
URI url = url(request);
if (url != null) {
netPeerAttributes.setNetPeer(setter, url.getHost(), null, url.getPort());
setter.setAttribute(SemanticAttributes.HTTP_URL, url.toString());
if (url.getUserInfo() != null) {
setter.setAttribute(
SemanticAttributes.HTTP_URL, url.toString().replace(url.getUserInfo() + '@', ""));
Comment thread
trask marked this conversation as resolved.
Outdated
} else {
setter.setAttribute(SemanticAttributes.HTTP_URL, url.toString());
}
}

} catch (Exception e) {
log.debug("Error tagging url", e);
}
Expand Down
1 change: 1 addition & 0 deletions ...i/src/test/groovy/io/opentelemetry/instrumentation/api/tracer/HttpClientTracerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class HttpClientTracerTest extends BaseTracerTest {
false | "https://host:0" | "https://host:0" | "" | null | "host" | null
false | "https://host/path" | "https://host/path" | "" | null | "host" | null
false | "http://host:99/path?query#fragment" | "http://host:99/path?query#fragment" | "" | null | "host" | 99
false | "https://usr:pswd@host/path" | "https://host/path" | "" | null | "host" | null

req = [url: url == null ? null : new URI(url)]
}
Expand Down