merging from upstream

Author: jamesmortensen

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -55,6 +55,6 @@ body:
     attributes:
       label: Docker Selenium version (tag)
       description: What version of Docker Selenium are you using?
-      placeholder: 4.8.0-20230210? Please use the full tag, avoid "latest"
+      placeholder: 4.8.1-20230221? Please use the full tag, avoid "latest"
     validations:
       required: true

.github/label-commenter-config.yml

@@ -0,0 +1,118 @@
+# Configuration for Label Commenter - https://github.com/peaceiris/actions-label-commenter
+labels:
+  - name: needs-triaging
+    labeled:
+      issue:
+        body: |
+          @{{ issue.user.login }}, thank you for creating this issue. We will troubleshoot it as soon as we can.
+
+          ---
+          <details>
+            <summary>Info for maintainers</summary>
+            <div>
+              <br>
+              <p>
+                Triage this issue by using labels.
+              </p>
+              <p>
+                If information is missing, add a helpful comment and then <code>I-issue-template</code> label.
+              </p>
+              <p>
+                If the issue is a question, add the <code>I-question</code> label.
+              </p>
+              <p>
+                If the issue is valid but there is no time to troubleshoot it, consider adding the <code>help wanted</code> label.
+              </p>
+              <p>
+                If the issue requires changes or fixes from an external project (e.g., ChromeDriver, GeckoDriver, MSEdgeDriver, W3C),
+               add the applicable <code>G-*</code> label, and it will provide the correct link and auto-close the
+               issue.
+              </p>
+              <p>
+                After troubleshooting the issue, please add the <code>R-awaiting answer</code> label.
+              </p>
+              <p>
+                Thank you!
+              </p>
+            </div>
+          </details>
+  - name: G-w3c
+    labeled:
+      issue:
+        body: |
+          Hi, @{{ issue.user.login }}.
+          This issue has been determined to require a change to the
+          [WebDriver W3C Specification](https://w3c.github.io/webdriver/) for Selenium to be able to support it.
+
+          Please [create an issue](https://github.com/w3c/webdriver/issues/new) with the WebDriver project.
+
+          Feel free to comment the issues that you raise back in this issue. Thank you.
+        action: close
+  - name: G-chromedriver
+    labeled:
+      issue:
+        body: |
+          Hi, @{{ issue.user.login }}.
+          This issue has been determined to require fixes in [ChromeDriver](https://chromedriver.chromium.org/home).
+
+          You can see if the feature is passing in the [Web Platform Tests](https://wpt.fyi/results/webdriver/tests).
+
+          If it is something new, please [create an issue](https://bugs.chromium.org/p/chromedriver/issues/list) with the ChromeDriver team.
+          Feel free to comment the issues that you raise back in this issue. Thank you.
+
+        action: close
+  - name: G-geckodriver
+    labeled:
+      issue:
+        body: |
+          Hi, @{{ issue.user.login }}.
+          This issue has been determined to require fixes in [GeckoDriver](https://firefox-source-docs.mozilla.org/testing/geckodriver/).
+
+          You can see if the feature is passing in the [Web Platform Tests](https://wpt.fyi/results/webdriver/tests).
+
+          If it is something new, please [create an Issue](https://github.com/mozilla/geckodriver/issues/new) with the GeckoDriver team.
+
+          Feel free to comment the issues that you raise back in this issue. Thank you.
+        action: close
+  - name: G-msedgedriver
+    labeled:
+      issue:
+        body: |
+          Hi, @{{ issue.user.login }}.
+          This issue has been determined to require fixes in [MSEdgeDriver](https://developer.microsoft.com/en-us/microsoft-edge/tools/webdriver/)
+          or in the IE Mode in Edge.
+
+          You can see if the feature is passing in the [Web Platform Tests](https://wpt.fyi/results/webdriver/tests).
+
+          If it is something new, please [create an Issue](https://github.com/MicrosoftEdge/EdgeWebDriver/issues/new) with the MSEdgeDriver team.
+
+          Feel free to comment the issues that you raise back in this issue. Thank you.
+        action: close
+  - name: I-issue-template
+    labeled:
+      issue:
+        body: |
+          Hi, @{{ issue.user.login }}.
+          Please follow the issue template, we need more information to reproduce the issue.
+
+          Either a complete code snippet and URL/HTML (if more than one file is needed, provide a GitHub repo and instructions to run the code), the specific versions used, or a more detailed description to help us understand the issue.
+
+          Note: If you cannot share your code and URL/HTML, any complete code snippet and URL/HTML that reproduces the issue is good enough.
+
+          Reply to this issue when all information is provided, thank you.
+  - name: I-question
+    labeled:
+      issue:
+        body: |
+          💬 Please ask questions at:
+          * 📫 The [Selenium user group](https://groups.google.com/forum/#!forum/selenium-users)
+          * 📮 [StackOverflow](https://stackoverflow.com/questions/tagged/selenium)
+          * 🗣 Our [IRC/Slack/Matrix channels](https://www.selenium.dev/support/) where the community can help you as well
+        action: close
+  - name: help wanted
+    labeled:
+      issue:
+        body: |
+          This issue is looking for contributors.
+
+          Please comment below or reach out to us through our [IRC/Slack/Matrix channels](https://www.selenium.dev/support/) if you are interested.

.github/workflows/label-commenter.yml

@@ -0,0 +1,18 @@
+# Configuration for Label Commenter - https://github.com/peaceiris/actions-label-commenter
+name: Label Commenter
+
+on:
+  issues:
+    types: [ labeled ]
+
+permissions:
+  contents: read
+  issues: write
+
+jobs:
+  comment:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Label Commenter
+        uses: peaceiris/actions-label-commenter@v1

Base/Dockerfile

@@ -28,6 +28,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
 #========================
 RUN apt-get -qqy update \
   && apt-get -qqy --no-install-recommends install \
+    acl \
     bzip2 \
     ca-certificates \
     openjdk-11-jre-headless \
@@ -90,12 +91,13 @@ COPY supervisord.conf /etc
 RUN  mkdir -p /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
   && touch /opt/selenium/config.toml \
   && chmod -R 777 /opt/selenium /opt/selenium/assets /var/run/supervisor /var/log/supervisor /etc/passwd \
-  && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.8.0/selenium-server-4.8.0.jar \
+  && wget --no-verbose https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.8.0/selenium-server-4.8.1.jar \
     -O /opt/selenium/selenium-server.jar \
-  && wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.8.0/selenium-http-jdk-client-4.8.0.jar \
+  && wget --no-verbose https://repo1.maven.org/maven2/org/seleniumhq/selenium/selenium-http-jdk-client/4.8.1/selenium-http-jdk-client-4.8.1.jar \
     -O /opt/selenium/selenium-http-jdk-client.jar \
   && chgrp -R 0 /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
-  && chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor
+  && chmod -R g=u /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor \
+  && setfacl -Rm u:seluser:rwx /opt /opt/selenium ${HOME} /opt/selenium/assets /var/run/supervisor /var/log/supervisor
 
 #=====
 # Download observability related jaegar jars and make them available in a separate directory
@@ -107,14 +109,14 @@ RUN if [ `arch` = "aarch64" ]; then \
     curl -fL https://github.com/coursier/launchers/raw/master/cs-`arch`-pc-linux.gz | gzip -d > /tmp/cs \
   && chmod +x /tmp/cs \
   && mkdir -p /external_jars \
-  && chmod -R 777 /external_jars ; \
+  && chmod -R 775 /external_jars ; \
     fi
 
 RUN if [ -f "/tmp/cs" ]; then \
     /tmp/cs fetch --classpath --cache /external_jars io.opentelemetry:opentelemetry-exporter-jaeger:1.22.0 io.grpc:grpc-netty:1.52.1 > /external_jars/.classpath.txt ; \
     fi
 
-RUN if [ -f "/tmp/cs" ]; then chmod 777 /external_jars/.classpath.txt ; fi
+RUN if [ -f "/tmp/cs" ]; then chmod 664 /external_jars/.classpath.txt ; fi
 
 #===================================================
 # Run the following commands as non-privileged user

NodeBase/Dockerfile

@@ -146,12 +146,9 @@ USER root
 #==========
 # Relaxing permissions for OpenShift and other non-sudo environments
 #==========
-RUN chmod -R 777 ${HOME} \
-  && chgrp -R 0 ${HOME} \
-  && chmod -R g=u ${HOME}
-
-# Added to avoid sudo-related multi-arch build errors
-USER 1200
+RUN sudo chmod -R 775 ${HOME} \
+  && sudo chgrp -R 0 ${HOME} \
+  && sudo chmod -R g=u ${HOME}
 
 #==============================
 # Scripts to run fluxbox, x11vnc and noVNC

NodeChrome/Dockerfile

@@ -52,14 +52,14 @@ RUN if [ -z "$CHROME_DRIVER_VERSION" ]; \
   && echo "Using chromedriver version: "$CHROME_DRIVER_VERSION \
   && wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
   && rm -rf /opt/selenium/chromedriver \
-  && unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
+  && sudo unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
   && rm /tmp/chromedriver_linux64.zip \
-  && mv /opt/selenium/chromedriver /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
-  && chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
+  && sudo mv /opt/selenium/chromedriver /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
+  && sudo chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
   && sudo ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver
 
 
 #============================================
 # Dumping Browser name and version for config
 #============================================
-RUN echo "chrome" > /opt/selenium/browser_name
+RUN echo "chrome" > /opt/selenium/browser_name

NodeChrome/wrap_chrome_binary

@@ -4,22 +4,22 @@ WRAPPER_PATH=$(readlink -f /usr/bin/google-chrome)
 BASE_PATH="$WRAPPER_PATH-base"
 mv "$WRAPPER_PATH" "$BASE_PATH"
 
-# Debian/Ubuntu seems to not respect --lang, it instead needs to be a LANGUAGE environment var
-# See: https://stackoverflow.com/a/41893197/359999
-for var in "$@"; do
-   if [[ $var == --lang=* ]]; then
-      LANGUAGE=${var//--lang=}
-   fi
-done
-
 cat > "$WRAPPER_PATH" <<_EOF
 #!/bin/bash
 
 # umask 002 ensures default permissions of files are 664 (rw-rw-r--) and directories are 775 (rwxrwxr-x).
 umask 002
 
+# Debian/Ubuntu seems to not respect --lang, it instead needs to be a LANGUAGE environment var
+# See: https://stackoverflow.com/a/41893197/359999
+for var in "\$@"; do
+   if [[ \$var == --lang=* ]]; then
+      LANGUAGE=\${var//--lang=}
+   fi
+done
+
 # Set language environment variable
-export LANGUAGE="$LANGUAGE"
+export LANGUAGE="\$LANGUAGE"
 
 # Note: exec -a below is a bashism.
 exec -a "\$0" "$BASE_PATH" --no-sandbox "\$@"

NodeDocker/config.toml

@@ -2,9 +2,9 @@
 # Configs have a mapping between the Docker image to use and the capabilities that need to be matched to
 # start a container with the given image.
 configs = [
-    "selenium/standalone-firefox:4.8.0-20230210", '{"browserName": "firefox", "platformName": "linux"}',
-    "selenium/standalone-chrome:4.8.0-20230210", '{"browserName": "chrome", "platformName": "linux"}',
-    "selenium/standalone-edge:4.8.0-20230210", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
+    "selenium/standalone-firefox:4.8.1-20230221", '{"browserName": "firefox", "platformName": "linux"}',
+    "selenium/standalone-chrome:4.8.1-20230221", '{"browserName": "chrome", "platformName": "linux"}',
+    "selenium/standalone-edge:4.8.1-20230221", '{"browserName": "MicrosoftEdge", "platformName": "linux"}'
     ]
 
 # URL for connecting to the docker daemon
@@ -14,7 +14,7 @@ configs = [
 # socat -4 TCP-LISTEN:2375,fork UNIX-CONNECT:/var/run/docker.sock
 url = "http://127.0.0.1:2375"
 # Docker image used for video recording
-video-image = "selenium/video:ffmpeg-4.3.1-20230210"
+video-image = "selenium/video:ffmpeg-4.3.1-20230221"
 
 # Uncomment the following section if you are running the node on a separate VM
 # Fill out the placeholders with appropriate values

NodeEdge/wrap_edge_binary

@@ -4,22 +4,22 @@ WRAPPER_PATH=$(readlink -f /usr/bin/microsoft-edge)
 BASE_PATH="$WRAPPER_PATH-base"
 mv "$WRAPPER_PATH" "$BASE_PATH"
 
-# Debian/Ubuntu seems to not respect --lang, it instead needs to be a LANGUAGE environment var
-# See: https://stackoverflow.com/a/41893197/359999
-for var in "$@"; do
-   if [[ $var == --lang=* ]]; then
-      LANGUAGE=${var//--lang=}
-   fi
-done
-
 cat > "$WRAPPER_PATH" <<_EOF
 #!/bin/bash
 
 # umask 002 ensures default permissions of files are 664 (rw-rw-r--) and directories are 775 (rwxrwxr-x).
 umask 002
 
+# Debian/Ubuntu seems to not respect --lang, it instead needs to be a LANGUAGE environment var
+# See: https://stackoverflow.com/a/41893197/359999
+for var in "\$@"; do
+   if [[ \$var == --lang=* ]]; then
+      LANGUAGE=\${var//--lang=}
+   fi
+done
+
 # Set language environment variable
-export LANGUAGE="$LANGUAGE"
+export LANGUAGE="\$LANGUAGE"
 
 # Note: exec -a below is a bashism.
 exec -a "\$0" "$BASE_PATH" --no-sandbox "\$@"