Merge branch 'trunk' into sm_firefox_linux

Author: bonigarcia

common/repositories.bzl

@@ -11,8 +11,8 @@ def pin_browsers():
 
     http_archive(
         name = "linux_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/152.0.3/linux-x86_64/en-US/firefox-152.0.3.tar.xz",
-        sha256 = "8bdb7a9138f40a1bc9191e9803d3cb5e1c3086e815821c7f42bcda7b8b98144b",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/152.0.4/linux-x86_64/en-US/firefox-152.0.4.tar.xz",
+        sha256 = "cfbe0a66269f220c69809210eda55fee72f4798427e78181b7d0da14df44882f",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -33,8 +33,8 @@ js_library(
 
     dmg_archive(
         name = "mac_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/152.0.3/mac/en-US/Firefox%20152.0.3.dmg",
-        sha256 = "5341a832935516be4f164d15021fb5a872668d6ebeddcdf35ae09ca599e717f0",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/152.0.4/mac/en-US/Firefox%20152.0.4.dmg",
+        sha256 = "b7391215608c8f0171c29200bb7add9328d186a60c10386b67acfa5f757a42b8",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/153.0b5/linux-x86_64/en-US/firefox-153.0b5.tar.xz",
-        sha256 = "06d7dbc92afc6fbf83b8f830e5fc8d2293e18634d9a7da5cdf8cdce19f6edc8b",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/153.0b7/linux-x86_64/en-US/firefox-153.0b7.tar.xz",
+        sha256 = "8da26e77fec0a18c4d110c1ae9cbef63f385174d10202bce7c56b2d724d297b2",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/153.0b5/mac/en-US/Firefox%20153.0b5.dmg",
-        sha256 = "21623ec2066a747498776c39392769260c3e7e0e474d8e5c1c9ac46a950823c7",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/153.0b7/mac/en-US/Firefox%20153.0b7.dmg",
+        sha256 = "9ce38b03da60d246a57f95ff7efd6cf86a29133ece547dee78f337f5084dccdd",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

dotnet/test/support/Events/EventFiringWebDriverTests.cs

@@ -219,19 +219,18 @@ public void ShouldUnwrapElementArgsWhenCallingScripts()
     public void ShouldBeAbleToWrapSubclassesOfSomethingImplementingTheWebDriverInterface()
     {
         // We should get this far
-        EventFiringWebDriver testDriver = new EventFiringWebDriver(new ChildDriver());
+        EventFiringWebDriver testDriver = new EventFiringWebDriver(mockDriver.Object);
     }
 
     [Test]
     public void ShouldBeAbleToAccessWrappedInstanceFromEventCalls()
     {
-        var stubDriver = new StubDriver();
-        EventFiringWebDriver testDriver = new EventFiringWebDriver(stubDriver);
-        StubDriver wrapped = ((IWrapsDriver)testDriver).WrappedDriver as StubDriver;
-        Assert.That(wrapped, Is.EqualTo(stubDriver));
+        EventFiringWebDriver testDriver = new EventFiringWebDriver(mockDriver.Object);
+        IWebDriver wrapped = ((IWrapsDriver)testDriver).WrappedDriver;
+        Assert.That(wrapped, Is.SameAs(mockDriver.Object));
         testDriver.Navigating += new EventHandler<WebDriverNavigationEventArgs>((sender, e) =>
         {
-            Assert.That(stubDriver, Is.EqualTo(e.Driver));
+            Assert.That(e.Driver, Is.SameAs(mockDriver.Object));
         });
 
         testDriver.Url = "http://example.org";
@@ -293,8 +292,4 @@ public void ShouldFireFindEventsInShadowRoot()
     public interface IExecutingDriver : IWebDriver, IJavaScriptExecutor
     {
     }
-
-    public class ChildDriver : StubDriver
-    {
-    }
 }

dotnet/test/webdriver/Infrastructure/StubDriver.cs

@@ -29,8 +29,13 @@
  * read characters in the input buffer.
  */
 class Input {
-  /** end-of-file indicator (0xFFFD) */
-  public static final char EOF = (char) -1; // NOTE: Produces Unicode replacement character (0xFFFD)
+  /**
+   * End-of-input sentinel returned by {@link #peek()} and {@link #read()}.
+   *
+   * <p>Value {@code -1} mirrors {@link java.io.Reader#read()} and — unlike a {@code char} sentinel
+   * — cannot collide with any valid UTF-16 code unit (including U+FFFF).
+   */
+  public static final int EOF = -1;
 
   /** the number of chars to buffer */
   private static final int BUFFER_SIZE = 4096;
@@ -64,18 +69,20 @@ public Input(Reader source) {
   /**
    * Extract the next character from the input without consuming it.
    *
-   * @return the next input character; {@link #EOF} if input is exhausted
+   * @return the next input character as an unsigned UTF-16 code unit (0-65535); {@link #EOF} if
+   *     input is exhausted
    */
-  public char peek() {
+  public int peek() {
     return fill() ? buffer[position + 1] : EOF;
   }
 
   /**
    * Read and consume the next character from the input.
    *
-   * @return the next input character; {@link #EOF} if input is exhausted
+   * @return the next input character as an unsigned UTF-16 code unit (0-65535); {@link #EOF} if
+   *     input is exhausted
    */
-  public char read() {
+  public int read() {
     return fill() ? buffer[++position] : EOF;
   }
 

java/src/org/openqa/selenium/json/Input.java

@@ -165,8 +165,8 @@ public JsonType peek() {
         return JsonType.END;
 
       default:
-        char c = input.read();
-        throw new JsonException("Unable to determine type from: " + c + ". " + input);
+        int c = input.read();
+        throw new JsonException("Unable to determine type from: " + (char) c + ". " + input);
     }
   }
 
@@ -194,10 +194,10 @@ public String nextName() {
 
     String name = readString();
     skipWhitespace(input);
-    char read = input.read();
+    int read = input.read();
     if (read != ':') {
       throw new JsonException(
-          "Unable to read name. Expected colon separator, but saw '" + read + "'");
+          "Unable to read name. Expected colon separator, but saw '" + (char) read + "'");
     }
     return name;
   }
@@ -241,13 +241,13 @@ public Number nextNumber() {
         case '7':
         case '8':
         case '9':
-          builder.append(input.read());
+          builder.append((char) input.read());
           break;
         case '.':
         case 'e':
         case 'E':
           mightBeDecimal = true;
-          builder.append(input.read());
+          builder.append((char) input.read());
           break;
         default:
           read = false;
@@ -552,11 +552,11 @@ private void expect(JsonType type) {
 
     int toCompareLength = toCompare.length();
     for (int i = 0; i < toCompareLength; i++) {
-      char read = input.read();
+      int read = input.read();
       if (read != toCompare.charAt(i)) {
         throw new JsonException(
             String.format(
-                "Unable to read %s. Saw %s at position %d. %s", toCompare, read, i, input));
+                "Unable to read %s. Saw %s at position %d. %s", toCompare, (char) read, i, input));
       }
     }
 
@@ -574,9 +574,8 @@ private String readString() {
     input.read(); // Skip leading quote
 
     StringBuilder builder = new StringBuilder();
-    char c;
     while (true) {
-      c = input.read();
+      int c = input.read();
       switch (c) {
         case Input.EOF:
           throw new JsonException("Unterminated string: " + builder + ". " + input);
@@ -586,7 +585,13 @@ private String readString() {
           readEscape(builder);
           break;
         default:
-          builder.append(c);
+          // RFC 8259 §7: characters U+0000..U+001F MUST be escaped.
+          if (c < 0x20) {
+            throw new JsonException(
+                String.format(
+                    "Illegal unescaped control character U+%04X in string. %s", c, input));
+          }
+          builder.append((char) c);
       }
     }
   }
@@ -601,7 +606,7 @@ private String readString() {
    */
   // FIXME: This function doesn't appear to support UTF-8 or UTF-32.
   private void readEscape(StringBuilder builder) {
-    char read = input.read();
+    int read = input.read();
 
     // List from: https://tools.ietf.org/html/rfc7159.html#section-7
     switch (read) {
@@ -629,10 +634,10 @@ private void readEscape(StringBuilder builder) {
         int result = 0;
         int multiplier = 4096; // (16 * 16 * 16) as we start from the thousands and work to units.
         for (int i = 0; i < 4; i++) {
-          char c = input.read();
+          int c = input.read();
           int digit = Character.digit(c, 16);
           if (digit == -1) {
-            throw new JsonException(c + " is not a hexadecimal digit. " + input);
+            throw new JsonException((char) c + " is not a hexadecimal digit. " + input);
           }
           result += digit * multiplier;
           multiplier /= 16;
@@ -643,11 +648,11 @@ private void readEscape(StringBuilder builder) {
       case '/':
       case '\\':
       case '"':
-        builder.append(read);
+        builder.append((char) read);
         break;
 
       default:
-        throw new JsonException("Unexpected escape code: " + read + ". " + input);
+        throw new JsonException("Unexpected escape code: " + (char) read + ". " + input);
     }
   }
 

java/src/org/openqa/selenium/json/JsonInput.java

@@ -291,6 +291,40 @@ void shouldBeAbleToReadNonWellFormedDataLongerThanReadBuffer() {
     }
   }
 
+  @Test
+  void shouldReadU_FFFF_AsALiteralCharacterAndNotEndOfInput() {
+    // U+FFFF is a valid Unicode code unit that historically collided with the in-band EOF
+    // sentinel and was mis-reported as an unterminated string. Build the strings from
+    // char values rather than embedding literal U+FFFF so the test is independent of the
+    // source file's byte encoding.
+    char nonChar = (char) 0xFFFF;
+    String literalPayload = "a" + nonChar + "b";
+
+    try (JsonInput input = newInput("\"" + literalPayload + "\"")) {
+      assertThat(input.nextString()).isEqualTo(literalPayload);
+    }
+
+    try (JsonInput input = newInput("\"\\uFFFF\"")) {
+      assertThat(input.nextString()).isEqualTo(String.valueOf(nonChar));
+    }
+  }
+
+  @Test
+  void shouldRejectUnescapedControlCharactersInStrings() {
+    // RFC 8259 §7: characters U+0000..U+001F MUST be escaped in JSON strings.
+    // A literal newline / tab / etc. inside quotes is not valid JSON.
+    try (JsonInput input = newInput("\"a\nb\"")) {
+      assertThatExceptionOfType(JsonException.class)
+          .isThrownBy(input::nextString)
+          .withMessageStartingWith("Illegal unescaped control character");
+    }
+
+    // Escaped equivalents are still fine.
+    try (JsonInput input = newInput("\"a\\nb\"")) {
+      assertThat(input.nextString()).isEqualTo("a\nb");
+    }
+  }
+
   @Test
   void nullInputsShouldCoerceAsNullValues() throws IOException {
     try (InputStream is = new ByteArrayInputStream(new byte[0]);