Honour registration secret in LocalDistributor (SeleniumHQ#8793)

* Pass registration secret for node registering in local distributor

* Add tests for adding node with incorrect secret

* Add tests for adding node with correct secret

Co-authored-by: Diego Molina <diemol@users.noreply.github.com>

Author: raju249

java/server/src/org/openqa/selenium/grid/commands/Hub.java

@@ -135,7 +135,7 @@ protected void execute(Config config) {
       bus,
       clientFactory,
       sessions,
-      null);
+      serverOptions.getRegistrationSecret());
     handler.addHandler(distributor);
 
     Router router = new Router(tracer, clientFactory, sessions, distributor);

java/server/test/org/openqa/selenium/grid/distributor/AddingNodesTest.java

@@ -125,6 +125,54 @@ public void shouldBeAbleToRegisterALocalNode() throws URISyntaxException {
     assertEquals(1, getStereotypes(status).get(CAPS).intValue());
   }
 
+  @Test
+  public void shouldNotRegisterALocalNodeWithWrongRegistrationSecret() throws URISyntaxException {
+    URI sessionUri = new URI("http://example:1234");
+    HttpClient.Factory clientFactory = new RoutableHttpClientFactory(
+        externalUrl,
+        handler,
+        HttpClient.Factory.createDefault());
+
+    Secret registrationSecret = new Secret("my_secret");
+
+    Node node = LocalNode.builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), null)
+        .add(CAPS, new TestSessionFactory((id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
+        .build();
+    handler.addHandler(node);
+
+    LocalSessionMap sessions = new LocalSessionMap(tracer, bus);
+    Distributor secretDistributor = new LocalDistributor(tracer, bus, clientFactory, sessions, registrationSecret);
+
+    bus.fire(new NodeStatusEvent(node.getStatus()));
+
+    assertEquals(0, secretDistributor.getAvailableNodes().size());
+  }
+
+  @Test
+  public void shouldRegisterALocalNodeWithCorrectRegistrationSecret() throws URISyntaxException {
+    URI sessionUri = new URI("http://example:1234");
+    HttpClient.Factory clientFactory = new RoutableHttpClientFactory(
+        externalUrl,
+        handler,
+        HttpClient.Factory.createDefault());
+
+    Secret registrationSecret = new Secret("my_secret");
+
+    Node node = LocalNode.builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
+        .add(CAPS, new TestSessionFactory((id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
+        .build();
+    handler.addHandler(node);
+
+    LocalSessionMap sessions = new LocalSessionMap(tracer, bus);
+    Distributor secretDistributor = new LocalDistributor(tracer, bus, clientFactory, sessions, registrationSecret);
+
+    bus.fire(new NodeStatusEvent(node.getStatus()));
+
+    wait.until(obj -> secretDistributor.getStatus().hasCapacity());
+
+    assertEquals(1, secretDistributor.getAvailableNodes().size());
+  }
+
   @Test
   public void shouldBeAbleToRegisterACustomNode() throws URISyntaxException {
     URI sessionUri = new URI("http://example:1234");

java/server/test/org/openqa/selenium/grid/distributor/local/LocalDistributorTest.java

@@ -27,10 +27,12 @@
 import org.openqa.selenium.grid.data.CreateSessionResponse;
 import org.openqa.selenium.grid.data.DistributorStatus;
 import org.openqa.selenium.grid.data.NodeStatus;
+import org.openqa.selenium.grid.data.NodeStatusEvent;
 import org.openqa.selenium.grid.data.Session;
 import org.openqa.selenium.grid.distributor.Distributor;
 import org.openqa.selenium.grid.node.Node;
 import org.openqa.selenium.grid.node.local.LocalNode;
+import org.openqa.selenium.grid.security.Secret;
 import org.openqa.selenium.grid.sessionmap.local.LocalSessionMap;
 import org.openqa.selenium.grid.testing.TestSessionFactory;
 import org.openqa.selenium.remote.HttpSessionId;
@@ -100,6 +102,18 @@ public void testAddNodeToDistributor() {
     assertThat(distributorNode.getUri()).isEqualTo(uri);
   }
 
+  @Test
+  public void testShouldNotAddNodeWithWrongSecret() {
+    Secret secret = new Secret("my_secret");
+    Distributor secretDistributor = new LocalDistributor(tracer, bus, clientFactory, new LocalSessionMap(tracer, bus), secret);
+    bus.fire(new NodeStatusEvent(localNode.getStatus()));
+    DistributorStatus status = secretDistributor.getStatus();
+
+    //Check the size
+    final Set<NodeStatus> nodes = status.getNodes();
+    assertThat(nodes.size()).isEqualTo(0);
+  }
+
   @Test
   public void testRemoveNodeFromDistributor() {
     Distributor distributor = new LocalDistributor(tracer, bus, clientFactory, new LocalSessionMap(tracer, bus), null);