Add support for bearer tokens (#1)

madeline-pratt · web-flow · commit 9270f86d39e3 · 2023-11-07T20:15:55.000-05:00
* Add support for bearer tokens

* Change authBearerKey to String
diff --git a/src/main/java/org/fanout/pubcontrol/PubControl.java b/src/main/java/org/fanout/pubcontrol/PubControl.java
@@ -62,6 +62,8 @@ public void applyConfig(List<Map<String, Object>> config) {
                 Map<String, Object> claims = new HashMap<String, Object>();
                 claims.put("iss", (String)iss);
                 client.setAuthJwt(claims, (byte[])key);
+            } else if (key != null) {
+                client.setAuthBearer(key);
             }
             this.clients.add(client);
         }
diff --git a/src/main/java/org/fanout/pubcontrol/PubControlClient.java b/src/main/java/org/fanout/pubcontrol/PubControlClient.java
@@ -37,9 +37,10 @@ public class PubControlClient implements Runnable {
     private Thread pubWorker;
     private Deque<Object[]> reqQueue = new LinkedList<Object[]>();
     private String authBasicUser;
-    private String authBasicPass;;
+    private String authBasicPass;
     private Map<String, Object> authJwtClaim;
     private byte[] authJwtKey;
+    private String authBearerKey;
 
     /**
      * Initialize this class with a URL representing the publishing endpoint.
@@ -68,6 +69,15 @@ public void setAuthJwt(Map<String, Object> claims, byte[] key) {
         this.lock.unlock();
     }
 
+    /**
+     * Pass a key to use bearer authentication with the configured endpoint.
+     */
+    public void setAuthBearer(String key) {
+        this.lock.lock();
+        this.authBearerKey = key;
+        this.lock.unlock();
+    }
+
     /**
      * Publish the item synchronously to the specified channels.
      */
@@ -176,6 +186,8 @@ else if (this.authJwtClaim != null) {
             String token = Jwts.builder().setClaims(claims).
                     signWith(SignatureAlgorithm.HS256, decodedKey).compact();
             return "Bearer " + token;
+        } else if (this.authBearerKey != null) {
+            return "Bearer " + this.authBearerKey;
         }
 
         return null;

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ public void applyConfig(List<Map<String, Object>> config) {`
`62`	`62`	`Map<String, Object> claims = new HashMap<String, Object>();`
`63`	`63`	`claims.put("iss", (String)iss);`
`64`	`64`	`client.setAuthJwt(claims, (byte[])key);`
	`65`	`+ } else if (key != null) {`
	`66`	`+ client.setAuthBearer(key);`
`65`	`67`	`}`
`66`	`68`	`this.clients.add(client);`
`67`	`69`	`}`