spoter-ME · rodant · Mar 25, 2020 · Mar 25, 2020 · Apr 2, 2020 · Apr 3, 2020
diff --git a/auth/basic/build.gradle b/auth/basic/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     testRuntimeOnly "jakarta.activation:jakarta.activation-api:$activationApiVersion"
 
     testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
-    testImplementation "io.smallrye:smallrye-config:$smallryeConfigVersion"
+    testImplementation "io.smallrye.config:smallrye-config:$smallryeConfigVersion"
     testImplementation "org.glassfish.jersey.core:jersey-server:$jerseyVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"
 }

diff --git a/auth/basic/src/main/java/module-info.java b/auth/basic/src/main/java/module-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,7 +16,7 @@
 module org.trellisldp.auth.basic {
     exports org.trellisldp.auth.basic;
 
-    requires jakarta.inject.api;
+    requires jakarta.inject;
     requires java.ws.rs;
     requires java.xml.bind;
     requires java.annotation;

diff --git a/auth/basic/src/main/java/org/trellisldp/auth/basic/BasicAuthFilter.java b/auth/basic/src/main/java/org/trellisldp/auth/basic/BasicAuthFilter.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/basic/src/main/java/org/trellisldp/auth/basic/BasicAuthUtils.java b/auth/basic/src/main/java/org/trellisldp/auth/basic/BasicAuthUtils.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/basic/src/main/java/org/trellisldp/auth/basic/BasicPrincipal.java b/auth/basic/src/main/java/org/trellisldp/auth/basic/BasicPrincipal.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/basic/src/main/java/org/trellisldp/auth/basic/Credentials.java b/auth/basic/src/main/java/org/trellisldp/auth/basic/Credentials.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/basic/src/main/java/org/trellisldp/auth/basic/package-info.java b/auth/basic/src/main/java/org/trellisldp/auth/basic/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/basic/src/test/java/org/trellisldp/auth/basic/BasicAuthFilterTest.java b/auth/basic/src/test/java/org/trellisldp/auth/basic/BasicAuthFilterTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/basic/src/test/java/org/trellisldp/auth/basic/BasicAuthUtilsTest.java b/auth/basic/src/test/java/org/trellisldp/auth/basic/BasicAuthUtilsTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/basic/src/test/java/org/trellisldp/auth/basic/BasicPrincipalTest.java b/auth/basic/src/test/java/org/trellisldp/auth/basic/BasicPrincipalTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/jwt/build.gradle b/auth/jwt/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     implementation "org.slf4j:slf4j-api:$slf4jVersion"
     implementation "org.eclipse.microprofile.config:microprofile-config-api:$microprofileConfigVersion"
 
-    testImplementation "io.smallrye:smallrye-config:$smallryeConfigVersion"
+    testImplementation "io.smallrye.config:smallrye-config:$smallryeConfigVersion"
     testImplementation "io.smallrye:smallrye-jwt:$smallryeJwtVersion"
     testImplementation "jakarta.json.bind:jakarta.json.bind-api:$jsonbApiVersion"
     testImplementation "org.eclipse:yasson:$yassonVersion"

diff --git a/auth/jwt/src/main/java/module-info.java b/auth/jwt/src/main/java/module-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,7 +16,7 @@
 module org.trellisldp.auth.jwt {
     exports org.trellisldp.auth.jwt;
 
-    requires jakarta.inject.api;
+    requires jakarta.inject;
     requires java.ws.rs;
     requires java.annotation;
     requires microprofile.config.api;

diff --git a/auth/jwt/src/main/java/org/trellisldp/auth/jwt/JwtAuthFilter.java b/auth/jwt/src/main/java/org/trellisldp/auth/jwt/JwtAuthFilter.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/jwt/src/main/java/org/trellisldp/auth/jwt/WebIdPrincipal.java b/auth/jwt/src/main/java/org/trellisldp/auth/jwt/WebIdPrincipal.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/jwt/src/main/java/org/trellisldp/auth/jwt/WebIdSecurityContext.java b/auth/jwt/src/main/java/org/trellisldp/auth/jwt/WebIdSecurityContext.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/jwt/src/main/java/org/trellisldp/auth/jwt/package-info.java b/auth/jwt/src/main/java/org/trellisldp/auth/jwt/package-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/jwt/src/test/java/org/trellisldp/auth/jwt/JwtAuthFilterTest.java b/auth/jwt/src/test/java/org/trellisldp/auth/jwt/JwtAuthFilterTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/jwt/src/test/java/org/trellisldp/auth/jwt/WebIdPrincipalTest.java b/auth/jwt/src/test/java/org/trellisldp/auth/jwt/WebIdPrincipalTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/jwt/src/test/java/org/trellisldp/auth/jwt/WebIdSecurityContextTest.java b/auth/jwt/src/test/java/org/trellisldp/auth/jwt/WebIdSecurityContextTest.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/oauth/build.gradle b/auth/oauth/build.gradle
@@ -15,6 +15,7 @@ dependencies {
     api "jakarta.inject:jakarta.inject-api:$injectApiVersion"
     api "jakarta.annotation:jakarta.annotation-api:$annotationApiVersion"
     api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxrsApiVersion"
+    api "com.google.guava:guava:$guavaVersion"
 
     implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
     implementation "commons-io:commons-io:$commonsIoVersion"
@@ -28,10 +29,12 @@ dependencies {
     testRuntimeOnly "jakarta.activation:jakarta.activation-api:$activationApiVersion"
 
     testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
-    testImplementation "io.smallrye:smallrye-config:$smallryeConfigVersion"
+    testImplementation "io.smallrye.config:smallrye-config:$smallryeConfigVersion"
     testImplementation "org.bouncycastle:bcprov-jdk15on:$bouncycastleVersion"
     testImplementation "org.glassfish.jersey.core:jersey-server:$jerseyVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"
+
+    implementation project(':trellis-cache')
 }
 
 pitest {

diff --git a/auth/oauth/src/main/java/module-info.java b/auth/oauth/src/main/java/module-info.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -14,12 +16,13 @@
 module org.trellisldp.auth.oauth {
     exports org.trellisldp.auth.oauth;
 
-    requires jakarta.inject.api;
+    requires jakarta.inject;
     requires java.ws.rs;
     requires java.annotation;
     requires jjwt.api;
     requires jjwt.jackson;
     requires jjwt.impl;
     requires microprofile.config.api;
     requires org.slf4j;
+    requires org.trellisldp.cache;
 }
diff --git a/auth/oauth/src/main/java/org/trellisldp/auth/oauth/Authenticator.java b/auth/oauth/src/main/java/org/trellisldp/auth/oauth/Authenticator.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/oauth/src/main/java/org/trellisldp/auth/oauth/FederatedJwtAuthenticator.java b/auth/oauth/src/main/java/org/trellisldp/auth/oauth/FederatedJwtAuthenticator.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/oauth/src/main/java/org/trellisldp/auth/oauth/JwksAuthenticator.java b/auth/oauth/src/main/java/org/trellisldp/auth/oauth/JwksAuthenticator.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -13,34 +15,18 @@
  */
 package org.trellisldp.auth.oauth;
 
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
-import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.toMap;
 import static org.slf4j.LoggerFactory.getLogger;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwsHeader;
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SigningKeyResolverAdapter;
-import io.jsonwebtoken.io.Deserializer;
-import io.jsonwebtoken.jackson.io.JacksonDeserializer;
 import io.jsonwebtoken.security.SecurityException;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.net.URL;
 import java.security.Key;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
-import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 
 /**
@@ -57,7 +43,7 @@ public class JwksAuthenticator implements Authenticator {
      * @param url the location of the public jwks keys
      */
     public JwksAuthenticator(final String url) {
-        this.keys = buildKeys(url);
+        this.keys = OAuthUtils.fetchKeys(url);
     }
 
     @Override
@@ -76,27 +62,4 @@ public Key resolveSigningKey(final JwsHeader header, final Claims claims) {
             }
         }).build().parseClaimsJws(token).getBody();
     }
-
-    private static Map<String, Key> buildKeys(final String location) {
-        // TODO eventually, this will become part of the JJWT library
-        final Deserializer<Map<String, List<Map<String, String>>>> deserializer = new JacksonDeserializer<>();
-        try (final InputStream input = new URL(location).openConnection().getInputStream()) {
-            return deserializer.deserialize(IOUtils.toByteArray(input)).getOrDefault("keys", emptyList()).stream()
-                .map(JwksAuthenticator::buildKeyEntry).filter(Objects::nonNull).collect(collectingAndThen(
-                            toMap(Map.Entry::getKey, Map.Entry::getValue), Collections::unmodifiableMap));
-        } catch (final IOException ex) {
-            LOGGER.error("Error fetching/parsing jwk document", ex);
-        }
-        return emptyMap();
-    }
-
-    private static Map.Entry<String, Key> buildKeyEntry(final Map<String, String> jwk) {
-        final BigInteger modulus = new BigInteger(1, Base64.getUrlDecoder().decode(jwk.get("n")));
-        final BigInteger exponent = new BigInteger(1, Base64.getUrlDecoder().decode(jwk.get("e")));
-        final Key key = OAuthUtils.buildRSAPublicKey("RSA", modulus, exponent);
-        if (key != null && jwk.containsKey("kid")) {
-            return new SimpleEntry<>(jwk.get("kid"), key);
-        }
-        return null;
-    }
 }
diff --git a/auth/oauth/src/main/java/org/trellisldp/auth/oauth/JwtAuthenticator.java b/auth/oauth/src/main/java/org/trellisldp/auth/oauth/JwtAuthenticator.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/oauth/src/main/java/org/trellisldp/auth/oauth/NullAuthenticator.java b/auth/oauth/src/main/java/org/trellisldp/auth/oauth/NullAuthenticator.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/oauth/src/main/java/org/trellisldp/auth/oauth/OAuthFilter.java b/auth/oauth/src/main/java/org/trellisldp/auth/oauth/OAuthFilter.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at

diff --git a/auth/oauth/src/main/java/org/trellisldp/auth/oauth/OAuthPrincipal.java b/auth/oauth/src/main/java/org/trellisldp/auth/oauth/OAuthPrincipal.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (c) 2020 Aaron Coburn and individual contributors
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at