[grid] Ignored options when they are prefixed, safari specif as well (#15574)

Fixes #15481
Fixes #14485

Author: diemol

java/src/org/openqa/selenium/grid/data/DefaultSlotMatcher.java

@@ -49,7 +49,7 @@ public class DefaultSlotMatcher implements SlotMatcher, Serializable {
    matched in the Node or in the browser driver.
   */
   private static final List<String> EXTENSION_CAPABILITIES_PREFIXES =
-      Arrays.asList("goog:", "moz:", "ms:", "se:");
+      Arrays.asList("goog:", "moz:", "ms:", "safari:", "se:");
 
   @Override
   public boolean matches(Capabilities stereotype, Capabilities capabilities) {
@@ -154,9 +154,12 @@ private Boolean extensionCapabilitiesMatch(Capabilities stereotype, Capabilities
      We match extension capabilities when they are not prefixed with any of the
      EXTENSION_CAPABILITIES_PREFIXES items. Also, we match them only when the capabilities
      of the new session request contains that specific extension capability.
+     We are also filtering "options" extension capabilities, as they should be handled
+     by the remote endpoint.
     */
     return stereotype.getCapabilityNames().stream()
         .filter(name -> name.contains(":"))
+        .filter(name -> !name.toLowerCase().contains("options"))
         .filter(name -> capabilities.asMap().containsKey(name))
         .filter(name -> EXTENSION_CAPABILITIES_PREFIXES.stream().noneMatch(name::contains))
         .map(

java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java

@@ -565,6 +565,32 @@ void vendorExtensionPrefixedCapabilitiesAreIgnoredForMatching() {
     assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
   }
 
+  @Test
+  void extensionPrefixedOptionCapabilityIsIgnoredForMatching() {
+    Capabilities stereotype =
+        new ImmutableCapabilities(
+            CapabilityType.BROWSER_NAME,
+            "chrome",
+            CapabilityType.BROWSER_VERSION,
+            "84",
+            CapabilityType.PLATFORM_NAME,
+            Platform.WINDOWS,
+            "node:options",
+            "appium");
+
+    Capabilities capabilities =
+        new ImmutableCapabilities(
+            CapabilityType.BROWSER_NAME,
+            "chrome",
+            CapabilityType.BROWSER_VERSION,
+            "84",
+            CapabilityType.PLATFORM_NAME,
+            Platform.WINDOWS,
+            "node:options",
+            "selenium");
+    assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
+  }
+
   @Test
   void emptyCapabilitiesDoNotMatch() {
     Capabilities stereotype =