From 4727e44765bb7d750834d4c5ac15682db39a8d0c Mon Sep 17 00:00:00 2001 From: Alexander Smolyakov Date: Thu, 24 Aug 2023 17:55:16 +0400 Subject: [PATCH 1/2] Remove Maven patch --- .../.devcontainer/local-features/setup-user/install.sh | 7 ------- src/universal/test-project/test.sh | 2 -- 2 files changed, 9 deletions(-) diff --git a/src/universal/.devcontainer/local-features/setup-user/install.sh b/src/universal/.devcontainer/local-features/setup-user/install.sh index 82e61af91..6fcb97f8c 100644 --- a/src/universal/.devcontainer/local-features/setup-user/install.sh +++ b/src/universal/.devcontainer/local-features/setup-user/install.sh @@ -20,13 +20,6 @@ chmod +x /etc/profile.d/00-restore-env.sh export DEBIAN_FRONTEND=noninteractive -# Temporary: Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-29425 -MAVEN_PATH=$(cd /usr/local/sdkman/candidates/maven/3*/lib/ && pwd) -rm -f ${MAVEN_PATH}/commons-io-* -curl -sSL https://github.com/apache/commons-io/archive/refs/tags/commons-io-2.11.0-RC1.tar.gz | tar -xzC /tmp 2>&1 -jar cf ${MAVEN_PATH}/commons-io-2.11.jar /tmp/commons-io-commons-io-2.11.0-RC1 -rm -rf /tmp/commons-io-commons-io-2.11.0-RC1 - # Temporary: Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0536 & https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0155 rm -rf /usr/local/nvs/deps/node_modules/follow-redirects/* curl -sSL https://github.com/follow-redirects/follow-redirects/archive/refs/tags/v1.15.2.tar.gz | tar -xzC /tmp 2>&1 diff --git a/src/universal/test-project/test.sh b/src/universal/test-project/test.sh index 126a19bf2..1d552e2a8 100644 --- a/src/universal/test-project/test.sh +++ b/src/universal/test-project/test.sh @@ -183,8 +183,6 @@ check "java-12.0.2-installed-by-oryx" ls /opt/java/ | grep 12.0.2 check "java-version-on-path-is-12.0.2" java --version | grep 12.0.2 # Test patches -MAVEN_PATH=$(cd /usr/local/sdkman/candidates/maven/3*/lib/ && pwd) -check "commons-io-lib" bash -c "ls ${MAVEN_PATH} | grep commons-io-2.11.jar" ls -la /home/codespace From d0687c67a6ed1acf31c176e342dd45a94bfb9744 Mon Sep 17 00:00:00 2001 From: Alexander Smolyakov Date: Thu, 24 Aug 2023 17:55:31 +0400 Subject: [PATCH 2/2] Remove NVS patch --- .../.devcontainer/local-features/setup-user/install.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/universal/.devcontainer/local-features/setup-user/install.sh b/src/universal/.devcontainer/local-features/setup-user/install.sh index 6fcb97f8c..0dc3ad6ac 100644 --- a/src/universal/.devcontainer/local-features/setup-user/install.sh +++ b/src/universal/.devcontainer/local-features/setup-user/install.sh @@ -20,11 +20,6 @@ chmod +x /etc/profile.d/00-restore-env.sh export DEBIAN_FRONTEND=noninteractive -# Temporary: Due to https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0536 & https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0155 -rm -rf /usr/local/nvs/deps/node_modules/follow-redirects/* -curl -sSL https://github.com/follow-redirects/follow-redirects/archive/refs/tags/v1.15.2.tar.gz | tar -xzC /tmp 2>&1 -mv /tmp/follow-redirects-1.15.2/* /usr/local/nvs/deps/node_modules/follow-redirects/ - sudo_if() { COMMAND="$*" if [ "$(id -u)" -eq 0 ] && [ "$USERNAME" != "root" ]; then