Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Snyk] Fix for 3 vulnerabilities #36

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

[Snyk] Fix for 3 vulnerabilities #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c6e98e
[java][grid]: video file name set independently in dynamic grid via s…
VietND96 Jun 18, 2024
0e18700
fix: py/requirements_lock.txt to reduce vulnerabilities
snyk-bot Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
4 changes: 2 additions & 2 deletions py/requirements_lock.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ charset-normalizer==3.3.2 \
--hash=sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519 \
--hash=sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561
# via requests
cryptography==42.0.7 \
cryptography==42.0.8 \
--hash=sha256:02c0eee2d7133bdbbc5e24441258d5d2244beb31da5ed19fbb80315f4bbbff55 \
--hash=sha256:0d563795db98b4cd57742a78a288cdbdc9daedac29f2239793071fe114f13785 \
--hash=sha256:16268d46086bb8ad5bf0a2b5544d8a9ed87a0e33f5e77dd3c3301e63d941a83b \
Expand Down Expand Up @@ -556,7 +556,7 @@ typing-extensions==4.9.0 \
# via
# -r py/requirements.txt
# rich
urllib3[socks]==2.0.7 \
urllib3==2.2.2 \
--hash=sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84 \
--hash=sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e
# via
Expand Down
Loading