Merge branch 'master' of github.com:UnterrainerInformatik/java-rest-client

Author: guFalcon

pom.xml

@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<parent>
 		<groupId>info.unterrainer.commons</groupId>
@@ -36,5 +38,10 @@
 			<artifactId>okio</artifactId>
 			<version>3.6.0</version>
 		</dependency>
+		<dependency>
+			<groupId>io.github.rburgst</groupId>
+			<artifactId>okhttp-digest</artifactId>
+			<version>3.0</version>
+		</dependency>
 	</dependencies>
 </project>

src/main/java/info/unterrainer/commons/restclient/RestClient.java

@@ -1,15 +1,24 @@
 package info.unterrainer.commons.restclient;
 
 import java.io.IOException;
+import java.util.Map;
 import java.util.Random;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
+import com.burgstaller.okhttp.AuthenticationCacheInterceptor;
+import com.burgstaller.okhttp.CachingAuthenticatorDecorator;
+import com.burgstaller.okhttp.DispatchingAuthenticator;
+import com.burgstaller.okhttp.basic.BasicAuthenticator;
+import com.burgstaller.okhttp.digest.CachingAuthenticator;
+import com.burgstaller.okhttp.digest.Credentials;
+import com.burgstaller.okhttp.digest.DigestAuthenticator;
+
 import info.unterrainer.commons.restclient.exceptions.RestClientException;
 import info.unterrainer.commons.serialization.jsonmapper.JsonMapper;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Call;
-import okhttp3.Credentials;
 import okhttp3.Headers;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -25,6 +34,7 @@ public class RestClient {
 	private final Random random = new Random();
 
 	protected OkHttpClient client;
+	protected final Map<String, CachingAuthenticator> authCache = new ConcurrentHashMap<>();
 	protected final JsonMapper jsonMapper;
 
 	public RestClient(final JsonMapper jsonMapper) {
@@ -50,11 +60,20 @@ public RestClient(final JsonMapper jsonMapper, final String userName, final Stri
 				.writeTimeout(writeTimeoutInMillis, TimeUnit.MILLISECONDS)
 				.addInterceptor(new GzipInterceptor())
 				.followRedirects(true);
-		if (userName != null || password != null)
-			c.authenticator((route, response) -> {
-				String credential = Credentials.basic(userName, password);
-				return response.request().newBuilder().header("Authorization", credential).build();
-			});
+		if (userName != null || password != null) {
+			Credentials credentials = new Credentials(userName, password);
+			final BasicAuthenticator basicAuthenticator = new BasicAuthenticator(credentials);
+			final DigestAuthenticator digestAuthenticator = new DigestAuthenticator(credentials);
+
+			// Note that all authentication schemes should be registered as lower-case!
+			DispatchingAuthenticator authenticator = new DispatchingAuthenticator.Builder()
+					.with("digest", digestAuthenticator)
+					.with("basic", basicAuthenticator)
+					.build();
+
+			c.authenticator(new CachingAuthenticatorDecorator(authenticator, authCache))
+					.addInterceptor(new AuthenticationCacheInterceptor(authCache));
+		}
 		client = c.build();
 	}