[grid] Do not match empty capabilities

diemol · diemol · commit 676c4cc8bbb0 · 2022-03-12T01:41:24.000+01:00
Fixes #10410
diff --git a/java/src/org/openqa/selenium/grid/data/DefaultSlotMatcher.java b/java/src/org/openqa/selenium/grid/data/DefaultSlotMatcher.java
@@ -56,6 +56,10 @@ public class DefaultSlotMatcher implements SlotMatcher, Serializable {
   @Override
   public boolean matches(Capabilities stereotype, Capabilities capabilities) {
 
+    if (capabilities.asMap().isEmpty()) {
+      return false;
+    }
+
     if (!initialMatch(stereotype, capabilities)) {
       return false;
     }
@@ -87,7 +91,7 @@ private Boolean initialMatch(Capabilities stereotype, Capabilities capabilities)
     return stereotype.getCapabilityNames().stream()
       // Matching of extension capabilities is implementation independent. Skip them
       .filter(name -> !name.contains(":"))
-      // Platform matching is special, we do later
+      // Platform matching is special, we do it later
       .filter(name -> !"platform".equalsIgnoreCase(name) && !"platformName".equalsIgnoreCase(name))
       .map(name -> {
         if (capabilities.getCapability(name) instanceof String) {
diff --git a/java/src/org/openqa/selenium/grid/data/SessionRequest.java b/java/src/org/openqa/selenium/grid/data/SessionRequest.java
@@ -59,18 +59,20 @@ public class SessionRequest {
 
   public SessionRequest(RequestId requestId, HttpRequest request, Instant enqueued) {
     this.requestId = Require.nonNull("Request ID", requestId);
-    this.enqueued = Require.nonNull("Enqueud time", enqueued);
+    this.enqueued = Require.nonNull("Enqueued time", enqueued);
     Require.nonNull("Request", request);
 
     try (NewSessionPayload payload = NewSessionPayload.create(Contents.reader(request))) {
-      desiredCapabilities = payload.stream().collect(Collectors.toSet());
+      desiredCapabilities = payload.stream()
+        .filter(capabilities -> !capabilities.asMap().isEmpty())
+        .collect(Collectors.toSet());
       downstreamDialects = payload.getDownstreamDialects();
       metadata = payload.getMetadata();
     }
 
     Map<String, String> headers = new HashMap<>();
-    Optional<String> traceparentValue = Optional.ofNullable(request.getHeader("traceparent"));
-    traceparentValue.ifPresent(value -> headers.put("traceparent", value));
+    Optional<String> traceParentValue = Optional.ofNullable(request.getHeader("traceparent"));
+    traceParentValue.ifPresent(value -> headers.put("traceparent", value));
     this.traceHeaders = Collections.unmodifiableMap(headers);
   }
 
diff --git a/java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java b/java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java
@@ -368,4 +368,17 @@ public void vendorExtensionPrefixedCapabilitiesAreIgnoredForMatching() {
     );
     assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
   }
+
+  @Test
+  public void emptyCapabilitiesDoNotMatch() {
+    Capabilities stereotype = new ImmutableCapabilities(
+      CapabilityType.BROWSER_NAME, "firefox",
+      CapabilityType.BROWSER_VERSION, "98",
+      CapabilityType.PLATFORM_NAME, Platform.MAC
+    );
+
+    Capabilities capabilities = new ImmutableCapabilities();
+    assertThat(slotMatcher.matches(stereotype, capabilities)).isFalse();
+  }
+
 }
