Normalize DSN URI. (getsentry#1032)

maciejwalkowiak · web-flow · commit 00a3b85d8df1 · 2020-11-05T17:56:46.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # vNext
 
 * Increase max cached events to 30 (#1029)
+* Normalize DSN URI (#1030)
 
 # 3.1.2
 
diff --git a/sentry/src/main/java/io/sentry/Dsn.java b/sentry/src/main/java/io/sentry/Dsn.java
@@ -47,7 +47,7 @@ URI getSentryUri() {
 
   Dsn(@Nullable String dsn) throws InvalidDsnException {
     try {
-      URI uri = new URI(dsn);
+      URI uri = new URI(dsn).normalize();
       String userInfo = uri.getUserInfo();
       if (userInfo == null || userInfo.isEmpty()) {
         throw new IllegalArgumentException("Invalid DSN: No public key provided.");
diff --git a/sentry/src/test/java/io/sentry/DsnTest.kt b/sentry/src/test/java/io/sentry/DsnTest.kt
@@ -73,4 +73,10 @@ class DsnTest {
         val ex = assertFailsWith<InvalidDsnException> { Dsn("https://:secret@host/path/id") }
         assertEquals("java.lang.IllegalArgumentException: Invalid DSN: No public key provided.", ex.message)
     }
+
+    @Test
+    fun `dsn is normalized`() {
+        val dsn = Dsn("http://key@host//id")
+        assertEquals("http://host/api/id", dsn.sentryUri.toURL().toString())
+    }
 }

-Original file line number
+Diff line change
@@ @@ -1,6 +1,7 @@ @@
 # vNext
 * Increase max cached events to 30 (#1029)
 +* Normalize DSN URI (#1030)
 # 3.1.2
Original file line number	Diff line number	Diff line change
`@@ -73,4 +73,10 @@ class DsnTest {`
`73`	`73`	`val ex = assertFailsWith<InvalidDsnException> { Dsn("https://:secret@host/path/id") }`
`74`	`74`	`assertEquals("java.lang.IllegalArgumentException: Invalid DSN: No public key provided.", ex.message)`
`75`	`75`	`}`
	`76`	`+`
	`77`	`+ @Test`
	`78`	+ fun `dsn is normalized`() {
	`79`	`+ val dsn = Dsn("http://key@host//id")`
	`80`	`+ assertEquals("http://host/api/id", dsn.sentryUri.toURL().toString())`
	`81`	`+ }`
`76`	`82`	`}`