Skip to content

Commit ad972f7

Browse files
committed
replaced regex with query to get user info
1 parent 0de32b2 commit ad972f7

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializer.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,16 @@ private static String getSanitizedUrl(HttpRequest request) {
147147
if (url == null) {
148148
return null;
149149
}
150-
// redact credentials passes query params
151150
GenericUrl clone = url.clone();
151+
// redact credentials sent as part of the address
152+
if (clone.getUserInfo() != null) {
153+
clone.setUserInfo("REDACTED:REDACTED");
154+
}
155+
// redact credentials passed as query params
152156
for (String key : clone.keySet()) {
153157
if (REDACTED_QUERY_PARAMETERS.contains(key)) {
154158
clone.put(key, "REDACTED");
155159
}
156160
}
157-
String urlString = clone.build();
158-
// redact credentials sent as part of the address
159-
return urlString.replaceAll("^(https?://)[^@/]+@", "$1REDACTED:REDACTED@");
160-
}
161+
return clone.build(); }
161162
}

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/telemetry/HttpTracingRequestInitializerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ public void testUrlCredentialsAreRedacted() throws IOException {
243243
String urlFull = span.getAttributes().get(HttpTracingRequestInitializer.URL_FULL);
244244

245245
assertFalse(urlFull.contains("user:pass"));
246+
assertTrue(urlFull.contains("REDACTED:REDACTED@"));
246247
}
247248

248249
@Test

0 commit comments

Comments
 (0)