[java] Schema HTTPS in Distributor, SessionQueue, SessionMap

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

java/src/org/openqa/selenium/grid/distributor/config/DistributorOptions.java

@@ -26,11 +26,13 @@
 import org.openqa.selenium.grid.data.SlotMatcher;
 import org.openqa.selenium.grid.distributor.Distributor;
 import org.openqa.selenium.grid.distributor.selector.SlotSelector;
+import org.openqa.selenium.grid.server.BaseServerOptions;
 
 public class DistributorOptions {
 
   public static final int DEFAULT_HEALTHCHECK_INTERVAL = 120;
   public static final String DISTRIBUTOR_SECTION = "distributor";
+  private static final String SERVER_SECTION = "server";
   static final String DEFAULT_DISTRIBUTOR_IMPLEMENTATION =
       "org.openqa.selenium.grid.distributor.local.LocalDistributor";
   static final String DEFAULT_SLOT_MATCHER = "org.openqa.selenium.grid.data.DefaultSlotMatcher";
@@ -67,6 +69,8 @@ public URI getDistributorUri() {
       return host.get();
     }
 
+    BaseServerOptions serverOptions = new BaseServerOptions(config);
+    String schema = (serverOptions.isSecure() || serverOptions.isSelfSigned()) ? "https" : "http";
     Optional<Integer> port = config.getInt(DISTRIBUTOR_SECTION, "port");
     Optional<String> hostname = config.get(DISTRIBUTOR_SECTION, "hostname");
 
@@ -75,7 +79,7 @@ public URI getDistributorUri() {
     }
 
     try {
-      return new URI("http", null, hostname.get(), port.get(), null, null, null);
+      return new URI(schema, null, hostname.get(), port.get(), null, null, null);
     } catch (URISyntaxException e) {
       throw new ConfigException(
           "Distributor uri configured through host (%s) and port (%d) is not a valid URI",

java/src/org/openqa/selenium/grid/security/SecretOptions.java

@@ -27,6 +27,7 @@
 import org.openqa.selenium.UsernameAndPassword;
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.config.ConfigException;
+import org.openqa.selenium.grid.server.BaseServerOptions;
 
 public class SecretOptions {
 
@@ -41,7 +42,9 @@ public SecretOptions(Config config) {
 
   public Secret getRegistrationSecret() {
     String secret = "";
-    if ((isSecure()) && !config.get(SERVER_SECTION, "registration-secret").isPresent()) {
+    BaseServerOptions serverOptions = new BaseServerOptions(config);
+    if ((serverOptions.isSecure() || serverOptions.isSelfSigned())
+        && !config.get(SERVER_SECTION, "registration-secret").isPresent()) {
       try {
         secret =
             getEncoder()
@@ -69,15 +72,6 @@ public UsernameAndPassword getServerAuthentication() {
     return new UsernameAndPassword(username.get(), password.get());
   }
 
-  private boolean isSecure() {
-    return config.get(SERVER_SECTION, "https-private-key").isPresent()
-        && config.get(SERVER_SECTION, "https-certificate").isPresent();
-  }
-
-  private boolean isSelfSigned() {
-    return config.getBool(SERVER_SECTION, "https-self-signed").orElse(false);
-  }
-
   private File getCertificate() {
     String certificatePath = config.get(SERVER_SECTION, "https-certificate").orElse(null);
     if (certificatePath != null) {

java/src/org/openqa/selenium/grid/sessionmap/config/SessionMapOptions.java

@@ -22,15 +22,16 @@
 import java.util.Optional;
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.config.ConfigException;
+import org.openqa.selenium.grid.server.BaseServerOptions;
 import org.openqa.selenium.grid.sessionmap.SessionMap;
 
 public class SessionMapOptions {
 
   private static final String SESSIONS_SECTION = "sessions";
+  private static final String SERVER_SECTION = "server";
 
   private static final String DEFAULT_SESSION_MAP =
       "org.openqa.selenium.grid.sessionmap.remote.RemoteSessionMap";
-  private static final String DEFAULT_SESSION_MAP_SCHEME = "http";
   private final Config config;
 
   public SessionMapOptions(Config config) {
@@ -39,7 +40,11 @@ public SessionMapOptions(Config config) {
 
   public URI getSessionMapUri() {
 
-    String scheme = config.get(SESSIONS_SECTION, "scheme").orElse(DEFAULT_SESSION_MAP_SCHEME);
+    BaseServerOptions serverOptions = new BaseServerOptions(config);
+    String scheme =
+        config
+            .get(SESSIONS_SECTION, "scheme")
+            .orElse((serverOptions.isSecure() || serverOptions.isSelfSigned()) ? "https" : "http");
 
     Optional<URI> host =
         config

java/src/org/openqa/selenium/grid/sessionqueue/config/NewSessionQueueOptions.java

@@ -26,6 +26,7 @@
 import org.openqa.selenium.grid.jmx.JMXHelper;
 import org.openqa.selenium.grid.jmx.ManagedAttribute;
 import org.openqa.selenium.grid.jmx.ManagedService;
+import org.openqa.selenium.grid.server.BaseServerOptions;
 import org.openqa.selenium.grid.sessionqueue.NewSessionQueue;
 
 @ManagedService(
@@ -34,6 +35,7 @@
 public class NewSessionQueueOptions {
 
   static final String SESSION_QUEUE_SECTION = "sessionqueue";
+  private static final String SERVER_SECTION = "server";
   static final int DEFAULT_REQUEST_TIMEOUT = 300;
   static final int DEFAULT_REQUEST_TIMEOUT_PERIOD = 10;
   static final int DEFAULT_RETRY_INTERVAL = 15;
@@ -70,6 +72,8 @@ public URI getSessionQueueUri() {
       return host.get();
     }
 
+    BaseServerOptions serverOptions = new BaseServerOptions(config);
+    String schema = (serverOptions.isSecure() || serverOptions.isSelfSigned()) ? "https" : "http";
     Optional<Integer> port = config.getInt(SESSION_QUEUE_SECTION, "port");
     Optional<String> hostname = config.get(SESSION_QUEUE_SECTION, "hostname");
 
@@ -78,7 +82,7 @@ public URI getSessionQueueUri() {
     }
 
     try {
-      return new URI("http", null, hostname.get(), port.get(), "", null, null);
+      return new URI(schema, null, hostname.get(), port.get(), "", null, null);
     } catch (URISyntaxException e) {
       throw new ConfigException(
           "Session queue server uri configured through host (%s) and port (%d) is not a valid URI",