Description: New logging/exception messages may expose sensitive runtime data by embedding full BiDi
message payloads and close reasons (e.g., throwing new BiDiException("Unable to process
BiDi response: " + data, e) and logging reason/data), which could include session
identifiers, URLs, or other secrets if logs or exception messages are collected centrally.

Connection.java [279-311]

            throw new BiDiException("Unable to process BiDi response: " + data, e);
          }
        });
  }

  @Override
  public void onClose(int code, String reason) {
    LOG.log(
        Level.FINE,
        () ->
            String.format(
                "BiDi connection websocket closed (code: %s, reason: \"%s\")", code, reason));
    underlyingSocketClosed.set(true);
  }
}

private void handle(CharSequence data) {
  // It's kind of gross to decode the data twice, but this lets us get started on something
  // that feels nice to users.
  // TODO: decode once, and once only



 ... (clipped 12 lines)

Description: The new UnreachableBrowserException message includes cause.uri() ("Error communicating
with the remote browser at ..."), which may leak internal network topology/hostnames or
credentials embedded in URIs into logs/error reports depending on how these exceptions are
surfaced.
RemoteWebDriver.java [632-637]

} else if (e instanceof ConnectionException) {
  ConnectionException cause = (ConnectionException) e;
  toThrow =
      new UnreachableBrowserException(
          "Error communicating with the remote browser at " + cause.uri(), cause);
} else {

Description: Debug logging now records the entire websocket message object (msg) when the handler is
null, which could include sensitive content in its toString() and be exposed in logs if
FINE logging is enabled.
WebSocketMessageHandler.java [45-47]

if (handler == null && msg instanceof CloseMessage && ((CloseMessage) msg).code() == -1) {
  LOG.log(Level.FINE, "Failed to handle websocket message \"{0}\" - handler is null", msg);
  return;

• Create ticket/issue

Follow the guide to enable codebase context checks.

Objective: To create a detailed and reliable record of critical system actions for security analysis
and compliance.

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Objective: Ensure all identifiers clearly express their purpose and intent, making code
self-documenting

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Objective: Ensure all data inputs are validated, sanitized, and handled securely to prevent
vulnerabilities

Status: Passed

Learn more about managing compliance generic rules or creating your own custom rules

Objective: Ensure comprehensive error handling that provides meaningful context and graceful
degradation

Status:
Null teardown risk: The new teardown unconditionally calls localDriver.quit() which can throw
NullPointerException if localDriver was never created due to an earlier setup/test
failure.

@AfterEach
void tearDownDeployment() {
  localDriver.quit();

  LOG.log(FINE, () -> String.format("Stopping grid server %s ...", remoteUrl));
  Safely.safelyCall(() -> deployment.tearDown());
  LOG.log(INFO, () -> String.format("Stopped grid server %s", remoteUrl));
}

Learn more about managing compliance generic rules or creating your own custom rules

Objective: To ensure logs are useful for debugging and auditing without exposing sensitive
information like PII, PHI, or cardholder data.

Status:
Logs raw payload: New log statements may output raw BiDi message contents (data) and websocket close
reasons, which can include user/session data and are not redacted or structured.

  public void onClose(int code, String reason) {
    LOG.log(
        Level.FINE,
        () ->
            String.format(
                "BiDi connection websocket closed (code: %s, reason: \"%s\")", code, reason));
    underlyingSocketClosed.set(true);
  }
}

private void handle(CharSequence data) {
  // It's kind of gross to decode the data twice, but this lets us get started on something
  // that feels nice to users.
  // TODO: decode once, and once only

  String asString = String.valueOf(data);
  LOG.log(getDebugLogLevel(), "<- {0}", asString);

  Map<String, Object> raw = JSON.toType(asString, MAP_TYPE);
  if (raw.get("id") instanceof Number
      && (raw.get("result") != null || raw.get("error") != null)) {


 ... (clipped 6 lines)

Learn more about managing compliance generic rules or creating your own custom rules

Objective: To prevent the leakage of sensitive system information through error messages while
providing sufficient detail for internal debugging.

Status:
Error exposes payload: The thrown BiDiException includes the full BiDi response data, which may contain sensitive
content and could be surfaced to end users depending on exception propagation/handling
outside this diff.

public void onText(CharSequence data) {
  EXECUTOR.execute(
      () -> {
        try {
          handle(data);
        } catch (Exception e) {
          throw new BiDiException("Unable to process BiDi response: " + data, e);
        }
      });

Learn more about managing compliance generic rules or creating your own custom rules

Add a null check for the handler to prevent a potential NullPointerException for
any message type, not just a specific CloseMessage.

java/src/org/openqa/selenium/netty/server/WebSocketMessageHandler.java [44-59]

 Consumer<Message> handler = ctx.channel().attr(key).get();
-if (handler == null && msg instanceof CloseMessage && ((CloseMessage) msg).code() == -1) {
-  LOG.log(Level.FINE, "Failed to handle websocket message \"{0}\" - handler is null", msg);
+if (handler == null) {
+  if (msg instanceof CloseMessage && ((CloseMessage) msg).code() == -1) {
+    LOG.log(Level.FINE, "Failed to handle websocket message \"{0}\" - handler is null", msg);
+  } else {
+    LOG.log(
+        Level.WARNING,
+        "No handler for message, but message was received: {0}",
+        msg);
+  }
   return;
 }
 
 ctx.executor()
     .execute(
         () -> {
           try {
             handler.accept(msg);
             ctx.flush();
           } catch (Throwable t) {
             ctx.fireExceptionCaught(t);
           }
         });

• Apply / Chat

Guard localDriver/deployment against null and use try/finally so grid teardown
always happens even if quit() throws (or if setup failed and objects are unset).

java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java [85-92]

 @AfterEach
 void tearDownDeployment() {
-  localDriver.quit();
-
-  LOG.log(FINE, () -> String.format("Stopping grid server %s ...", remoteUrl));
-  Safely.safelyCall(() -> deployment.tearDown());
-  LOG.log(INFO, () -> String.format("Stopped grid server %s", remoteUrl));
+  try {
+    if (localDriver != null) {
+      localDriver.quit();
+    }
+  } finally {
+    LOG.log(FINE, () -> String.format("Stopping grid server %s ...", remoteUrl));
+    Safely.safelyCall(() -> {
+      if (deployment != null) {
+        deployment.tearDown();
+      }
+    });
+    LOG.log(INFO, () -> String.format("Stopped grid server %s", remoteUrl));
+  }
 }

• Apply / Chat