From 0c6e98eb32e6d3f6eb1b6915533c14a8132c857f Mon Sep 17 00:00:00 2001
From: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
Date: Tue, 18 Jun 2024 10:22:58 +0000
Subject: [PATCH 1/2] [java][grid]: video file name set independently in
 dynamic grid via se:videoName

---
 .../grid/node/docker/DockerSessionFactory.java        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java b/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java
index d7aa7eec721fe..9a681c1fdd434 100644
--- a/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java
+++ b/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java
@@ -373,13 +373,16 @@ private Map<String, String> getVideoContainerEnvVars(
     // Capabilities set to env vars with higher precedence
     setCapsToEnvVars(sessionRequestCapabilities, envVars);
     envVars.put("DISPLAY_CONTAINER_NAME", containerIp);
-    Optional<String> testName = ofNullable(getTestName(sessionRequestCapabilities));
-    testName.ifPresent(name -> envVars.put("SE_VIDEO_FILE_NAME", String.format("%s.mp4", name)));
+    Optional<String> videoName =
+        ofNullable(getVideoFileName(sessionRequestCapabilities, "se:videoName"))
+            .or(() -> ofNullable(getVideoFileName(sessionRequestCapabilities, "se:name")));
+    videoName.ifPresent(name -> envVars.put("SE_VIDEO_FILE_NAME", String.format("%s.mp4", name)));
     return envVars;
   }
 
-  private String getTestName(Capabilities sessionRequestCapabilities) {
-    Optional<Object> testName = ofNullable(sessionRequestCapabilities.getCapability("se:name"));
+  private String getVideoFileName(Capabilities sessionRequestCapabilities, String capabilityName) {
+    Optional<Object> testName =
+        ofNullable(sessionRequestCapabilities.getCapability(capabilityName));
     if (testName.isPresent()) {
       String name = testName.get().toString();
       if (!name.isEmpty()) {

From f018837d4ae8ffbc065c1cd2522ecd21cdd54d25 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Tue, 18 Jun 2024 20:18:59 +0000
Subject: [PATCH 2/2] fix: py/docs/requirements.txt to reduce vulnerabilities

The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-URLLIB3-7267250
---
 py/docs/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/docs/requirements.txt b/py/docs/requirements.txt
index dc0847ca1129a..60ab6673cef8e 100644
--- a/py/docs/requirements.txt
+++ b/py/docs/requirements.txt
@@ -1,2 +1,3 @@
 Jinja2==3.1.4
 Sphinx==1.8.2
+urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability