JCL-356: Prohibit weak authorization mechanisms

Author: acoburn

api/src/main/java/com/inrupt/client/auth/ReactiveAuthorization.java

@@ -34,6 +34,7 @@
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.TreeSet;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
@@ -64,9 +65,12 @@ public ReactiveAuthorization() {
         final ServiceLoader<AuthenticationProvider> loader = ServiceLoader.load(AuthenticationProvider.class,
                 ReactiveAuthorization.class.getClassLoader());
 
+        final Set<String> prohibited = getProhibitedSchemes();
         for (final AuthenticationProvider provider : loader) {
             for (final String scheme : provider.getSchemes()) {
-                registry.put(scheme, provider);
+                if (!prohibited.contains(scheme)) {
+                    registry.put(scheme, provider);
+                }
             }
         }
     }
@@ -117,5 +121,12 @@ static boolean sessionSupportsScheme(final Session session, final String scheme)
         }
         return session.supportedSchemes().contains(scheme);
     }
+
+    static Set<String> getProhibitedSchemes() {
+        final Set<String> prohibited = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+        prohibited.add("Basic");
+        prohibited.add("Digest");
+        return prohibited;
+    }
 }
 

api/src/test/java/com/inrupt/client/auth/BasicAuthProvider.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2023 Inrupt Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.inrupt.client.auth;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import com.inrupt.client.Request;
+import com.inrupt.client.spi.AuthenticationProvider;
+
+import java.net.URI;
+import java.time.Instant;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+public class BasicAuthProvider implements AuthenticationProvider {
+
+    private static final String BASIC = "Basic";
+
+    @Override
+    public String getScheme() {
+        return BASIC;
+    }
+
+    @Override
+    public Set<String> getSchemes() {
+        return Collections.singleton(BASIC);
+    }
+
+    @Override
+    public Authenticator getAuthenticator(final Challenge challenge) {
+        return new BasicAuthenticator();
+    }
+
+    public class BasicAuthenticator implements Authenticator {
+        @Override
+        public String getName() {
+            return "BasicAuth";
+        }
+
+        @Override
+        public int getPriority() {
+            return 100;
+        }
+
+        @Override
+        public CompletionStage<Credential> authenticate(final Session session, final Request request,
+                final Set<String> algorithms) {
+            final URI issuer = URI.create("https://issuer.test");
+            final URI agent = URI.create("https://id.test/username");
+            final Instant expiration = Instant.now().plusSeconds(300);
+            final String token = Base64.getUrlEncoder().withoutPadding()
+                .encodeToString("username:password".getBytes(UTF_8));
+            return CompletableFuture.completedFuture(new Credential("Basic", issuer, token, expiration, agent, null));
+        }
+    }
+}

api/src/test/java/com/inrupt/client/auth/ReactiveAuthorizationTest.java

@@ -0,0 +1,101 @@
+/*
+ * Copyright 2023 Inrupt Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.inrupt.client.auth;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import com.inrupt.client.Request;
+
+import java.net.URI;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+
+import org.junit.jupiter.api.Test;
+
+class ReactiveAuthorizationTest {
+
+    @Test
+    void testProhibitedAuth() {
+        final ReactiveAuthorization auth = new ReactiveAuthorization();
+        final Session session = new BasicAuthSession();
+        final Request req = Request.newBuilder(URI.create("https://storage.example")).build();
+        final Optional<Credential> credential = auth.negotiate(session, req,
+                Collections.singleton(Challenge.of("Basic"))).toCompletableFuture().join();
+        assertFalse(credential.isPresent());
+    }
+
+    static class BasicAuthSession implements Session {
+
+        @Override
+        public String getId() {
+            return UUID.randomUUID().toString();
+        }
+
+        @Override
+        public Optional<URI> getPrincipal() {
+            return Optional.empty();
+        }
+
+        @Override
+        public Set<String> supportedSchemes() {
+            return Collections.singleton("Basic");
+        }
+
+        @Override
+        public Optional<Credential> getCredential(final URI name, final URI uri) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<Credential> fromCache(final Request request) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<String> generateProof(final String jkt, final Request request) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<String> selectThumbprint(final Collection<String> algorithms) {
+            return Optional.empty();
+        }
+
+        @Override
+        public CompletionStage<Optional<Credential>> authenticate(final Authenticator authenticator,
+                final Request request, final Set<String> algorithms) {
+            return authenticator.authenticate(this, request, algorithms).thenApply(Optional::ofNullable);
+        }
+
+        /* deprecated */
+        @Override
+        public CompletionStage<Optional<Credential>> authenticate(final Request request,
+                final Set<String> algorithms) {
+            return CompletableFuture.completedFuture(Optional.empty());
+        }
+    }
+
+}

api/src/test/resources/META-INF/services/com.inrupt.client.spi.AuthenticationProvider

@@ -0,0 +1 @@
+com.inrupt.client.auth.BasicAuthProvider