[grid] Checking config URIs have a host

This is needed because when GraphQL is
queried and no host is present in the
URI, things blow up.

Relates to #9431

Author: diemol

java/server/src/org/openqa/selenium/docker/internal/Reference.java

@@ -160,9 +160,9 @@ public boolean equals(Object o) {
 
     Reference that = (Reference) o;
     return this.domain.equals(that.domain) &&
-      this.name.equals(that.name) &&
-      Objects.equals(tag, that.tag) &&
-      Objects.equals(digest, that.digest);
+           this.name.equals(that.name) &&
+           Objects.equals(tag, that.tag) &&
+           Objects.equals(digest, that.digest);
   }
 
   @Override

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

@@ -30,16 +30,14 @@
 
 public class DistributorOptions {
 
+  public static final int DEFAULT_HEALTHCHECK_INTERVAL = 300;
   static final String DISTRIBUTOR_SECTION = "distributor";
   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";
   static final String DEFAULT_SLOT_SELECTOR_IMPLEMENTATION =
     "org.openqa.selenium.grid.distributor.selector.DefaultSlotSelector";
   static final boolean DEFAULT_REJECT_UNSUPPORTED_CAPS = false;
-
-  public static final int DEFAULT_HEALTHCHECK_INTERVAL = 300;
-
   private final Config config;
 
   public DistributorOptions(Config config) {
@@ -49,7 +47,11 @@ public DistributorOptions(Config config) {
   public URI getDistributorUri() {
     Optional<URI> host = config.get(DISTRIBUTOR_SECTION, "host").map(str -> {
       try {
-        return new URI(str);
+        URI distributorUri = new URI(str);
+        if (distributorUri.getHost() == null || distributorUri.getPort() == -1) {
+          throw new ConfigException("Undefined host or port in Distributor server URI: " + str);
+        }
+        return distributorUri;
       } catch (URISyntaxException e) {
         throw new ConfigException("Distributor URI is not a valid URI: " + str);
       }

java/server/src/org/openqa/selenium/grid/distributor/httpd/DistributorServer.java

@@ -21,6 +21,7 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.MediaType;
+
 import org.openqa.selenium.BuildInfo;
 import org.openqa.selenium.cli.CliCommand;
 import org.openqa.selenium.grid.TemplateGridServerCommand;
@@ -119,7 +120,7 @@ protected void execute(Config config) {
 
     BuildInfo info = new BuildInfo();
     LOG.info(String.format(
-      "Started Selenium distributor %s (revision %s): %s",
+      "Started Selenium Distributor %s (revision %s): %s",
       info.getReleaseLabel(),
       info.getBuildRevision(),
       server.getUrl()));

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

@@ -45,9 +45,13 @@ public URI getSessionMapUri() {
 
     Optional<URI> host = config.get(SESSIONS_SECTION, "host").map(str -> {
       try {
-        return new URI(str);
+        URI sessionUri = new URI(str);
+        if (sessionUri.getHost() == null || sessionUri.getPort() == -1) {
+          throw new ConfigException("Undefined host or port in SessionMap server URI: " + str);
+        }
+        return sessionUri;
       } catch (URISyntaxException e) {
-        throw new ConfigException("Session map server URI is not a valid URI: " + str);
+        throw new ConfigException("Session Map server URI is not a valid URI: " + str);
       }
     });
 

java/server/src/org/openqa/selenium/grid/sessionmap/httpd/SessionMapServer.java

@@ -20,12 +20,12 @@
 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+
 import org.openqa.selenium.BuildInfo;
 import org.openqa.selenium.cli.CliCommand;
 import org.openqa.selenium.grid.TemplateGridServerCommand;
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.config.Role;
-import org.openqa.selenium.grid.server.BaseServerOptions;
 import org.openqa.selenium.grid.server.Server;
 import org.openqa.selenium.grid.sessionmap.SessionMap;
 import org.openqa.selenium.grid.sessionmap.config.SessionMapOptions;
@@ -108,7 +108,7 @@ protected void execute(Config config) {
 
     BuildInfo info = new BuildInfo();
     LOG.info(String.format(
-      "Started Selenium session map %s (revision %s): %s",
+      "Started Selenium SessionMap %s (revision %s): %s",
       info.getReleaseLabel(),
       info.getBuildRevision(),
       server.getUrl()));

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

@@ -39,7 +39,11 @@ public URI getSessionQueueUri() {
 
     Optional<URI> host = config.get(SESSION_QUEUE_SECTION, "host").map(str -> {
       try {
-        return new URI(str);
+        URI sessionQueueUri = new URI(str);
+        if (sessionQueueUri.getHost() == null || sessionQueueUri.getPort() == -1) {
+          throw new ConfigException("Undefined host or port in SessionQueue server URI: " + str);
+        }
+        return sessionQueueUri;
       } catch (URISyntaxException e) {
         throw new ConfigException("Session queue server URI is not a valid URI: " + str);
       }

java/server/src/org/openqa/selenium/grid/sessionqueue/httpd/NewSessionQueueServer.java

@@ -20,6 +20,7 @@
 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+
 import org.openqa.selenium.BuildInfo;
 import org.openqa.selenium.cli.CliCommand;
 import org.openqa.selenium.grid.TemplateGridServerCommand;
@@ -110,9 +111,9 @@ protected void execute(Config config) {
 
     BuildInfo info = new BuildInfo();
     LOG.info(String.format(
-        "Started Selenium New Session Queue %s (revision %s): %s",
-        info.getReleaseLabel(),
-        info.getBuildRevision(),
-        server.getUrl()));
+      "Started Selenium SessionQueue %s (revision %s): %s",
+      info.getReleaseLabel(),
+      info.getBuildRevision(),
+      server.getUrl()));
   }
 }