Skip to content

Normalize DSN URI. #1032

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
bruno-garcia merged 3 commits into from
Nov 5, 2020
+8 −1
Merged

Normalize DSN URI. #1032

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
a229e07
Normalize DSN.
maciejwalkowiak Nov 5, 2020
f83d199
Merge remote-tracking branch 'origin/main' into gh-1030
maciejwalkowiak Nov 5, 2020
12b8e5b
Update changelog.
maciejwalkowiak Nov 5, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# vNext

* Increase max cached events to 30 (#1029)
* Normalize DSN URI (#1030)

# 3.1.2

Expand Down
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/Dsn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand Down
6 changes: 6 additions & 0 deletions sentry/src/test/java/io/sentry/DsnTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
}