expose the authenticator independent of the proxy

Author: ryber

unirest-bdd-tests/src/test/java/BehaviorTests/AuthenticatorTest.java

@@ -0,0 +1,60 @@
+/**
+ * The MIT License
+ *
+ * Copyright for portions of unirest-java are held by Kong Inc (c) 2013.
+ *
+ * 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 BehaviorTests;
+
+import kong.unirest.core.HttpResponse;
+import kong.unirest.core.Unirest;
+import org.junit.jupiter.api.Test;
+
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class AuthenticatorTest extends BddTest {
+    @Test
+    void getBlockedWithoutAuth(){
+        assertThat(Unirest.get(MockServer.BASICAUTH).asEmpty())
+                .returns(401, HttpResponse::getStatus)
+                .returns("Basic realm=\"User Visible Realm\", charset=\"UTF-8\"", r -> r.getHeaders().getFirst("WWW-Authenticate"));
+    }
+
+    @Test
+    void setAuthenticator(){
+        Unirest.config().authenticator(new Authenticator() {
+            @Override
+            protected PasswordAuthentication getPasswordAuthentication() {
+                return new PasswordAuthentication("Fred", "Flintstone".toCharArray());
+            }
+        });
+
+        Unirest.get(MockServer.BASICAUTH)
+                .asObject(RequestCapture.class)
+                .getBody()
+                .assertBasicAuth("Fred", "Flintstone");
+
+    }
+}

unirest-bdd-tests/src/test/java/BehaviorTests/MockServer.java

@@ -34,6 +34,7 @@
 import io.javalin.websocket.WsConfig;
 import jakarta.servlet.ServletOutputStream;
 import org.eclipse.jetty.util.UrlEncoded;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -86,6 +87,7 @@ public class MockServer {
     public static final String ALTGET = "http://127.0.0.1:" + PORT + "/get";
     public static final String ECHO_RAW = HOST + "/raw";
     public static final String TIMEOUT = HOST + "/timeout";
+    public static final String BASICAUTH = HOST + "/basic";
     private static Javalin app;
     private static int errorCode = 400;
     private static RequestCapture lastRequest;
@@ -118,6 +120,12 @@ public static void reset() {
             timesCalled++;
             lastRequest = new RequestCapture(c);
         });
+        app.before("/basic", ctx -> {
+            if (ctx.basicAuthCredentials() == null) {
+                ctx.header("WWW-Authenticate", "Basic realm=\"User Visible Realm\", charset=\"UTF-8\"");
+                ctx.status(401);
+            }
+        });
         app.ws("/websocket", ws);
         app.sse("/sse", new TestSSEConsumer());
         app.delete("/delete", MockServer::jsonResponse);
@@ -144,6 +152,7 @@ public static void reset() {
         app.get("/error", MockServer::error);
         app.get("/hello", MockServer::helloWOrld);
         app.get("/timeout", MockServer::timeout);
+        app.get("/basic", MockServer::basic);
         Runtime.getRuntime().addShutdownHook(new Thread(app::stop));
         try {
             new CountDownLatch(1).await(2, TimeUnit.SECONDS);
@@ -152,6 +161,12 @@ public static void reset() {
         }
     }
 
+    private static void basic(@NotNull Context context) {
+        if(!(context.status().getCode() == 401)){
+            jsonResponse(context);
+        }
+    }
+
     private static void timeout(Context context) {
         try {
             Thread.sleep(1000);

unirest/src/main/java/kong/unirest/core/Config.java

@@ -30,6 +30,7 @@
 
 import javax.net.ssl.SSLContext;
 import java.io.InputStream;
+import java.net.Authenticator;
 import java.net.http.*;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -74,6 +75,7 @@ public class Config {
     private CacheManager cache;
     private HttpClient.Version version = HttpClient.Version.HTTP_2;
     private RetryStrategy retry;
+    private Authenticator authenticator;
 
     public Config() {
         setDefaults();
@@ -101,6 +103,7 @@ private void setDefaults() {
         retry = null;
         objectMapper = () -> CoreFactory.getCore().getObjectMapper();
         version = HttpClient.Version.HTTP_2;
+        authenticator = null;
 
         try {
             clientBuilder = JavaClient::new;
@@ -913,4 +916,21 @@ public Config disableHostNameVerification(boolean enabled) {
         System.setProperty(JDK_HTTPCLIENT_DISABLE_HOST_NAME_VERIFICATION, String.valueOf(enabled));
         return this;
     }
+
+    /**
+     * Sets a authenticator object for the client
+     * @param auth
+     * @return this config
+     */
+    public Config authenticator(Authenticator auth) {
+        this.authenticator = auth;
+        return this;
+    }
+
+    /**
+     * @return the authenticator registered with the config
+     */
+    public Authenticator getAuthenticator(){
+        return authenticator;
+    }
 }

unirest/src/main/java/kong/unirest/core/java/JavaClientBuilder.java

@@ -62,6 +62,10 @@ public HttpClient apply(Config config) {
         if(config.useSystemProperties()){
             builder.proxy(ProxySelector.getDefault());
         }
+        if(config.getAuthenticator() != null){
+            builder.authenticator(config.getAuthenticator());
+        }
+
         return builder.build();
     }