Allow new-style DSNs without the secret key.

Author: bretthoerner

CHANGES

@@ -1,7 +1,7 @@
 Version 1.7.4
 -------------
 
--
+- Allow new-style DSNs without the secret key.
 
 Version 1.7.3
 -------------

sentry/src/main/java/io/sentry/connection/AbstractConnection.java

@@ -2,6 +2,7 @@
 
 import io.sentry.environment.SentryEnvironment;
 import io.sentry.event.Event;
+import io.sentry.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,8 +48,8 @@ protected AbstractConnection(String publicKey, String secretKey) {
         this.eventSendCallbacks = new HashSet<>();
         this.authHeader = "Sentry sentry_version=" + SENTRY_PROTOCOL_VERSION + ","
             + "sentry_client=" + SentryEnvironment.getSentryName() + ","
-            + "sentry_key=" + publicKey + ","
-            + "sentry_secret=" + secretKey;
+            + "sentry_key=" + publicKey
+            + (!Util.isNullOrEmpty(secretKey) ? (",sentry_secret=" + secretKey) : "");
     }
 
     /**

sentry/src/main/java/io/sentry/dsn/Dsn.java

@@ -185,7 +185,7 @@ private void makeOptionsImmutable() {
     /**
      * Validates internally the DSN, and check for mandatory elements.
      * <p>
-     * Mandatory elements are the {@link #host}, {@link #publicKey}, {@link #secretKey} and {@link #projectId}.
+     * Mandatory elements are the {@link #host}, {@link #publicKey} and {@link #projectId}.
      */
     private void validate() {
         List<String> missingElements = new LinkedList<>();
@@ -200,9 +200,6 @@ private void validate() {
             if (publicKey == null) {
                 missingElements.add("public key");
             }
-            if (secretKey == null) {
-                missingElements.add("secret key");
-            }
             if (projectId == null || projectId.isEmpty()) {
                 missingElements.add("project ID");
             }

sentry/src/test/java/io/sentry/dsn/DsnTest.java

@@ -57,6 +57,18 @@ public void testSimpleDsnFromValidURI() throws Exception {
         assertThat(dsn.getProjectId(), is("9"));
     }
 
+    @Test
+    public void testSimpleDsnNoSecretValid() throws Exception {
+        Dsn dsn = new Dsn("http://publicKey@host/9");
+
+        assertThat(dsn.getProtocol(), is("http"));
+        assertThat(dsn.getPublicKey(), is("publicKey"));
+        assertThat(dsn.getSecretKey(), isEmptyOrNullString());
+        assertThat(dsn.getHost(), is("host"));
+        assertThat(dsn.getPath(), is("/"));
+        assertThat(dsn.getProjectId(), is("9"));
+    }
+
     @Test
     public void testDsnLookupWithNothingSet() throws Exception {
         assertThat(Dsn.dsnLookup(), is(Dsn.DEFAULT_DSN));
@@ -127,11 +139,6 @@ public void testDsnLookupWithEmptyEnvironmentVariable(@Mocked("getenv") final Sy
         assertThat(Dsn.dsnLookup(), is(Dsn.DEFAULT_DSN));
     }
 
-    @Test(expectedExceptions = InvalidDsnException.class)
-    public void testMissingSecretKeyInvalid() throws Exception {
-        new Dsn("http://publicKey:@host/9");
-    }
-
     @Test(expectedExceptions = InvalidDsnException.class)
     public void testMissingHostInvalid() throws Exception {
         new Dsn("http://publicKey:secretKey@/9");