WebHdfs: tweak tests and BasicAuthConfigurator instantiation

Author: trakos

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/BasicAuthConfigurator.java

@@ -33,6 +33,16 @@ public class BasicAuthConfigurator implements ConnectionConfigurator {
   private final ConnectionConfigurator parent;
   private final String credentials;
 
+  static public ConnectionConfigurator getConfigurator(
+      ConnectionConfigurator configurator, String basicAuthCred
+  ) {
+    if (basicAuthCred != null && !basicAuthCred.isEmpty()) {
+      return new BasicAuthConfigurator(configurator, basicAuthCred);
+    } else {
+      return configurator;
+    }
+  }
+
   /**
    * @param credentials a string of the form "username:password"
    */

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/URLConnectionFactory.java

@@ -136,7 +136,7 @@ public HttpURLConnection configure(HttpURLConnection connection)
       }
     }
 
-    return new BasicAuthConfigurator(conn, basicAuthCredentials);
+    return BasicAuthConfigurator.getConfigurator(conn, basicAuthCredentials);
   }
 
   /**
@@ -166,7 +166,7 @@ public static URLConnectionFactory newOAuth2URLConnectionFactory(
     } catch (Exception e) {
       throw new IOException("Unable to load OAuth2 connection factory.", e);
     }
-    conn = new BasicAuthConfigurator(conn, basicAuthCredentials);
+    conn = BasicAuthConfigurator.getConfigurator(conn, basicAuthCredentials);
     return new URLConnectionFactory(conn);
   }
 

hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/web/TestBasicAuthConfigurator.java

@@ -23,6 +23,8 @@
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 public class TestBasicAuthConfigurator {
   @Test
@@ -43,25 +45,39 @@ public void testEmptyCredentials() throws IOException {
 
   @Test
   public void testCredentialsSet() throws IOException {
-    ConnectionConfigurator conf = new BasicAuthConfigurator(null, "user:pass");
+    String credentials = "user:pass";
+    ConnectionConfigurator conf = new BasicAuthConfigurator(null, credentials);
     HttpURLConnection conn = Mockito.mock(HttpURLConnection.class);
     conf.configure(conn);
     Mockito.verify(conn, Mockito.times(1)).setRequestProperty(
         "AUTHORIZATION",
-        "Basic dXNlcjpwYXNz"
+        "Basic " + Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.UTF_8))
     );
   }
 
   @Test
   public void testParentConfigurator() throws IOException {
     ConnectionConfigurator parent = Mockito.mock(ConnectionConfigurator.class);
-    ConnectionConfigurator conf = new BasicAuthConfigurator(parent, "user:pass");
+    String credentials = "user:pass";
+    ConnectionConfigurator conf = new BasicAuthConfigurator(parent, credentials);
     HttpURLConnection conn = Mockito.mock(HttpURLConnection.class);
     conf.configure(conn);
     Mockito.verify(conn, Mockito.times(1)).setRequestProperty(
         "AUTHORIZATION",
-        "Basic dXNlcjpwYXNz"
+        "Basic " + Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.UTF_8))
     );
     Mockito.verify(parent, Mockito.times(1)).configure(conn);
   }
+
+  @Test
+  public void testCredentialsSetWithUtfAndSpecialCharacters() throws IOException {
+    String credentials = "\uD80C\uDD04@ą:pass";
+    ConnectionConfigurator conf = new BasicAuthConfigurator(null, credentials);
+    HttpURLConnection conn = Mockito.mock(HttpURLConnection.class);
+    conf.configure(conn);
+    Mockito.verify(conn, Mockito.times(1)).setRequestProperty(
+        "AUTHORIZATION",
+        "Basic " + Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.UTF_8))
+    );
+  }
 }