Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/main/java/nl/martijndwars/webpush/Notification.java

Author: jamie

src/main/java/nl/martijndwars/webpush/Notification.java

@@ -45,6 +45,9 @@ public class Notification {
      */
     private final int ttl;
 
+    private static final int ONE_DAY_DURATION_IN_SECONDS = 86400;
+    private static int DEFAULT_TTL = 28 * ONE_DAY_DURATION_IN_SECONDS;
+
 
     public Notification(String endpoint, ECPublicKey userPublicKey, byte[] userAuth, byte[] payload, int ttl, Urgency urgency) {
         this.endpoint = endpoint;
@@ -59,8 +62,12 @@ public Notification(String endpoint, PublicKey userPublicKey, byte[] userAuth, b
         this(endpoint, (ECPublicKey) userPublicKey, userAuth, payload, ttl, null);
     }
 
+    public Notification(String endpoint, String userPublicKey, String userAuth, byte[] payload, int ttl)  throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeySpecException {
+        this(endpoint, Utils.loadPublicKey(userPublicKey), Base64Encoder.decode(userAuth), payload, ttl);
+    }
+
     public Notification(String endpoint, PublicKey userPublicKey, byte[] userAuth, byte[] payload) {
-        this(endpoint, userPublicKey, userAuth, payload, 2419200);
+        this(endpoint, userPublicKey, userAuth, payload, DEFAULT_TTL);
     }
 
     public Notification(String endpoint, String userPublicKey, String userAuth, byte[] payload) throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeySpecException {
@@ -135,4 +142,59 @@ public String getOrigin() throws MalformedURLException {
 
         return url.getProtocol() + "://" + url.getHost();
     }
+
+    public static NotificationBuilder builder() {
+        return new Notification.NotificationBuilder();
+    }
+
+    public static class NotificationBuilder {
+        private String endpoint = null;
+        private ECPublicKey userPublicKey = null;
+        private byte[] userAuth = null;
+        private byte[] payload = null;
+        private int ttl = DEFAULT_TTL;
+
+        private NotificationBuilder() {
+        }
+
+        public Notification build() {
+            return new Notification(endpoint, userPublicKey, userAuth, payload, ttl);
+        }
+
+        public NotificationBuilder endpoint(String endpoint) {
+            this.endpoint = endpoint;
+            return this;
+        }
+
+        public NotificationBuilder userPublicKey(PublicKey publicKey) {
+            this.userPublicKey = (ECPublicKey) publicKey;
+            return this;
+        }
+
+        public NotificationBuilder userPublicKey(String publicKey) throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeySpecException {
+            this.userPublicKey = (ECPublicKey) Utils.loadPublicKey(publicKey);
+            return this;
+        }
+
+        public NotificationBuilder userAuth(String userAuth) {
+            this.userAuth = Base64Encoder.decode(userAuth);
+            return this;
+        }
+
+        public NotificationBuilder userAuth(byte[] userAuth) {
+            this.userAuth = userAuth;
+            return this;
+        }
+
+        public NotificationBuilder payload(byte[] payload) {
+            this.payload = payload;
+            return this;
+        }
+
+        public NotificationBuilder ttl(int ttl) {
+            this.ttl = ttl;
+            return this;
+        }
+    }
+
 }

src/main/java/nl/martijndwars/webpush/PushService.java

@@ -34,7 +34,8 @@ public class PushService {
     private String gcmApiKey;
 
     /**
-     * Subject used in the JWT payload (for VAPID)
+     * Subject used in the JWT payload (for VAPID). When left as null, then no subject will be used
+     * (RFC-8292 2.1 says that it is optional)
      */
     private String subject;
 
@@ -55,15 +56,23 @@ public PushService(String gcmApiKey) {
         this.gcmApiKey = gcmApiKey;
     }
 
-    public PushService(KeyPair keyPair, String subject) {
+    public PushService(KeyPair keyPair) {
         this.publicKey = keyPair.getPublic();
         this.privateKey = keyPair.getPrivate();
+    }
+
+    public PushService(KeyPair keyPair, String subject) {
+        this(keyPair);
         this.subject = subject;
     }
 
-    public PushService(String publicKey, String privateKey, String subject) throws GeneralSecurityException {
+    public PushService(String publicKey, String privateKey) throws GeneralSecurityException {
         this.publicKey = Utils.loadPublicKey(publicKey);
         this.privateKey = Utils.loadPrivateKey(privateKey);
+    }
+
+    public PushService(String publicKey, String privateKey, String subject) throws GeneralSecurityException {
+        this(publicKey, privateKey);
         this.subject = subject;
     }
 
@@ -226,7 +235,9 @@ public HttpPost preparePost(Notification notification, Encoding encoding) throws
             JwtClaims claims = new JwtClaims();
             claims.setAudience(notification.getOrigin());
             claims.setExpirationTimeMinutesInTheFuture(12 * 60);
-            claims.setSubject(subject);
+            if (subject != null) {
+                claims.setSubject(subject);
+            }
 
             JsonWebSignature jws = new JsonWebSignature();
             jws.setHeader("typ", "JWT");

src/test/java/nl/martijndwars/webpush/NotificationTest.java

@@ -0,0 +1,43 @@
+package nl.martijndwars.webpush;
+
+import java.security.GeneralSecurityException;
+import java.security.Security;
+import java.time.Duration;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class NotificationTest {
+
+    private static final String endpoint = "https://the-url.co.uk";
+    private static final String publicKey = "BGu3hOwCLOBfdMReXf7-SD2x5tKs_vPapOneyngBOnu6PgNYdgLPKFAodfBnG60MqkXC0McPFehN2Kyuh6TKm14=";
+    private static int oneDayDurationInSeconds = 86400;
+
+    @BeforeAll
+    public static void addSecurityProvider() {
+        Security.addProvider(new BouncyCastleProvider());
+    }
+
+    @Test
+    public void testNotificationBuilder() throws GeneralSecurityException {
+        Notification notification = Notification.builder()
+                .endpoint(endpoint)
+                .userPublicKey(publicKey)
+                .payload(new byte[16])
+                .ttl((int) Duration.ofDays(15).getSeconds())
+                .build();
+        assertEquals(endpoint, notification.getEndpoint());
+        assertEquals(15 * oneDayDurationInSeconds, notification.getTTL());
+    }
+
+    @Test
+    public void testDefaultTtl() throws GeneralSecurityException {
+        Notification notification = Notification.builder()
+                .userPublicKey(publicKey)
+                .payload(new byte[16])
+                .build();
+        assertEquals(28 * oneDayDurationInSeconds, notification.getTTL());
+    }
+}