Remove password from db.user parsed from JDBC url (#8106)

Resolves #8105
open-telemetry · Mar 22, 2023 · 0a311a1 · 0a311a1
1 parent aa2b853
commit 0a311a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/...src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java b/...src/main/java/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParser.java
@@ -45,6 +45,10 @@ DbInfo.Builder doParse(String jdbcUrl, DbInfo.Builder builder) {
 
  String user = uri.getUserInfo();
  if (user != null) {
+ int colonIndex = user.indexOf(':');
+ if (colonIndex != -1) {
+ user = user.substring(0, colonIndex);
+ }
  builder.user(user);
  }
 

diff --git a/.../groovy/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParserTest.groovy b/.../groovy/io/opentelemetry/instrumentation/jdbc/internal/JdbcConnectionUrlParserTest.groovy
@@ -75,6 +75,7 @@ class JdbcConnectionUrlParserTest extends Specification {
  "jdbc:mysql:https://my.host?user=myuser&password=PW" | null | "mysql:https://my.host:3306" | "mysql" | null | "myuser" | "my.host" | 3306 | null | null
  "jdbc:mysql:https://my.host:22/mydb?user=myuser&password=PW" | null | "mysql:https://my.host:22" | "mysql" | null | "myuser" | "my.host" | 22 | null | "mydb"
  "jdbc:mysql:https://127.0.0.1:22/mydb?user=myuser&password=PW" | stdProps | "mysql:https://127.0.0.1:22" | "mysql" | null | "myuser" | "127.0.0.1" | 22 | null | "mydb"
+ "jdbc:mysql:https://myuser:[email protected]:22/mydb" | null | "mysql:https://my.host:22" | "mysql" | null | "myuser" | "my.host" | 22 | null | "mydb"
 
  // https://mariadb.com/kb/en/library/about-mariadb-connector-j/#connection-strings 
  "jdbc:mariadb:127.0.0.1:33/mdbdb" | null | "mariadb:https://127.0.0.1:33" | "mariadb" | null | null | "127.0.0.1" | 33 | null | "mdbdb"