Updated authentication to support Supplier<Credentials> redis#1774

src/main/java/io/lettuce/core/AbstractRedisClient.java

@@ -390,10 +390,12 @@ protected <K, V, T extends RedisChannelHandler<K, V>> ConnectionFuture<T> initia
         CompletableFuture<SocketAddress> socketAddressFuture = new CompletableFuture<>();
         CompletableFuture<Channel> channelReadyFuture = new CompletableFuture<>();
 
+        String uriString = connectionBuilder.getRedisURI().toString();
+
         EventRecorder.getInstance().record(
-                new ConnectionCreatedEvent(connectionBuilder.getRedisURI().toString(), connectionBuilder.endpoint().getId()));
+                new ConnectionCreatedEvent(uriString, connectionBuilder.endpoint().getId()));
         EventRecorder.RecordableEvent event = EventRecorder.getInstance()
-                .start(new ConnectEvent(connectionBuilder.getRedisURI().toString(), connectionBuilder.endpoint().getId()));
+                .start(new ConnectEvent(uriString, connectionBuilder.endpoint().getId()));
 
         channelReadyFuture.whenComplete((channel, throwable) -> {
             event.record();

src/main/java/io/lettuce/core/ConnectionState.java

@@ -16,6 +16,7 @@
 package io.lettuce.core;
 
 import java.util.List;
+import java.util.function.Supplier;
 
 import io.lettuce.core.protocol.ProtocolVersion;
 
@@ -24,15 +25,14 @@
  * and connection state restoration. This class is part of the internal API.
  *
  * @author Mark Paluch
+ * @author Jon Iantosca
  * @since 6.0
  */
 public class ConnectionState {
 
     private volatile HandshakeResponse handshakeResponse;
 
-    private volatile String username;
-
-    private volatile char[] password;
+    private volatile Supplier<Credentials> credentialsSupplier;
 
     private volatile int db;
 
@@ -48,8 +48,7 @@ public class ConnectionState {
     public void apply(RedisURI redisURI) {
 
         setClientName(redisURI.getClientName());
-        setUsername(redisURI.getUsername());
-        setPassword(redisURI.getPassword());
+        setCredentialsSupplier(redisURI.getCredentialsSupplier());
     }
 
     /**
@@ -113,36 +112,18 @@ protected void setUserNamePassword(List<char[]> args) {
         }
 
         if (args.size() > 1) {
-            setUsername(new String(args.get(0)));
-            setPassword(args.get(1));
+            this.credentialsSupplier = new DefaultCredentialsSupplier(new String(args.get(0)), args.get(1));
         } else {
-            setUsername(null);
-            setPassword(args.get(0));
+            this.credentialsSupplier = new DefaultCredentialsSupplier(args.get(0));
         }
     }
 
-    protected void setUsername(String username) {
-        this.username = username;
-    }
-
-    String getUsername() {
-        return username;
-    }
-
-    protected void setPassword(char[] password) {
-        this.password = password;
-    }
-
-    char[] getPassword() {
-        return password;
-    }
-
-    boolean hasPassword() {
-        return this.password != null && this.password.length > 0;
+    Credentials getCredentials() {
+        return this.credentialsSupplier.get();
     }
 
-    boolean hasUsername() {
-        return this.username != null && !this.username.isEmpty();
+    protected void setCredentialsSupplier(Supplier<Credentials> credentialsSupplier) {
+        this.credentialsSupplier = credentialsSupplier;
     }
 
     protected void setDb(int db) {

src/main/java/io/lettuce/core/Credentials.java

@@ -0,0 +1,60 @@
+package io.lettuce.core;
+
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * Value object representing credentials used to authenticate with Redis.
+ *
+ * @author Jon Iantosca
+ * @since 6.2
+ */
+public class Credentials {
+
+    private String username;
+
+    private char[] password;
+
+    public Credentials(char[] password) {
+        this(null, password);
+    }
+
+    public Credentials(String username, char[] password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public boolean hasUsername() {
+        return username != null && !username.isEmpty();
+    }
+
+    public char[] getPassword() {
+        return password;
+    }
+
+    public boolean hasPassword() {
+        return password != null && password.length > 0;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof Credentials)) {
+            return false;
+        }
+        Credentials credentials = (Credentials) o;
+
+        return Objects.equals(username, credentials.username) && Arrays.equals(password, credentials.password);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(username) + Arrays.hashCode(password);
+    }
+}

src/main/java/io/lettuce/core/DefaultCredentialsSupplier.java

@@ -0,0 +1,57 @@
+package io.lettuce.core;
+
+import java.util.function.Supplier;
+
+/**
+ * Internal {@link Supplier<Credentials>} with support to delegate to a client supplied {@link Supplier<Credentials>}.
+ *
+ * @author Jon Iantosca
+ * @since 6.2
+ */
+class DefaultCredentialsSupplier implements Supplier<Credentials> {
+
+    private String username;
+
+    private char[] password;
+
+    private Supplier<Credentials> delegate;
+
+    DefaultCredentialsSupplier() {
+    }
+
+    DefaultCredentialsSupplier(char[] password) {
+        this(null, password);
+    }
+
+    DefaultCredentialsSupplier(String username, char[] password) {
+        this.username = username;
+        this.password = password;
+    }
+
+
+    @Override
+    public Credentials get() {
+        return hasDelegate() ? delegate.get() : new Credentials(this.username, this.password);
+    }
+
+    void setUsername(String username) {
+        this.username = username;
+    }
+
+    void setPassword(char[] password) {
+        this.password = password;
+    }
+
+    Supplier<Credentials> getCredentialsSupplier() {
+        return hasDelegate() ? delegate : this;
+    }
+
+    void setDelegate(Supplier<Credentials> delegate) {
+        this.delegate = delegate;
+    }
+
+    boolean hasDelegate() {
+        return delegate != null;
+    }
+
+}

src/main/java/io/lettuce/core/RedisClient.java

@@ -270,7 +270,7 @@ private <K, V> ConnectionFuture<StatefulRedisConnection<K, V>> connectStandalone
         assertNotNull(codec);
         checkValidRedisURI(redisURI);
 
-        logger.debug("Trying to get a Redis connection for: " + redisURI);
+        logger.debug("Trying to get a Redis connection for: {}", redisURI);
 
         DefaultEndpoint endpoint = new DefaultEndpoint(getOptions(), getResources());
         RedisChannelWriter writer = endpoint;

src/main/java/io/lettuce/core/RedisHandshake.java

@@ -156,10 +156,12 @@ private CompletableFuture<Void> initializeResp3(Channel channel) {
      */
     private CompletableFuture<?> initiateHandshakeResp2(Channel channel) {
 
-        if (connectionState.hasUsername()) {
-            return dispatch(channel, this.commandBuilder.auth(connectionState.getUsername(), connectionState.getPassword()));
-        } else if (connectionState.hasPassword()) {
-            return dispatch(channel, this.commandBuilder.auth(connectionState.getPassword()));
+    	Credentials credentials = connectionState.getCredentials();
+
+        if (credentials.hasUsername()) {
+            return dispatch(channel, this.commandBuilder.auth(credentials.getUsername(), credentials.getPassword()));
+        } else if (credentials.hasPassword()) {
+            return dispatch(channel, this.commandBuilder.auth(credentials.getPassword()));
         } else if (this.pingOnConnect) {
             return dispatch(channel, this.commandBuilder.ping());
         }
@@ -175,11 +177,13 @@ private CompletableFuture<?> initiateHandshakeResp2(Channel channel) {
      */
     private AsyncCommand<String, String, Map<String, Object>> initiateHandshakeResp3(Channel channel) {
 
-        if (connectionState.hasPassword()) {
+        Credentials credentials = connectionState.getCredentials();
+
+        if (credentials.hasPassword()) {
 
             return dispatch(channel, this.commandBuilder.hello(3,
-                    LettuceStrings.isNotEmpty(connectionState.getUsername()) ? connectionState.getUsername() : "default",
-                    connectionState.getPassword(), connectionState.getClientName()));
+                    LettuceStrings.isNotEmpty(credentials.getUsername()) ? credentials.getUsername() : "default",
+                    credentials.getPassword(), connectionState.getClientName()));
         }
 
         return dispatch(channel, this.commandBuilder.hello(3, null, null, connectionState.getClientName()));