diff --git a/log4shell-goof/log4shell-client/pom.xml b/log4shell-goof/log4shell-client/pom.xml index 5f36c4f8c..d90b3c42c 100644 --- a/log4shell-goof/log4shell-client/pom.xml +++ b/log4shell-goof/log4shell-client/pom.xml @@ -23,7 +23,7 @@ org.apache.logging.log4j log4j-slf4j-impl - 2.14.1 + 2.17.1 diff --git a/log4shell-goof/log4shell-server/Dockerfile b/log4shell-goof/log4shell-server/Dockerfile index ed6b0d833..cbda5f293 100644 --- a/log4shell-goof/log4shell-server/Dockerfile +++ b/log4shell-goof/log4shell-server/Dockerfile @@ -3,7 +3,7 @@ COPY pom.xml pom.xml COPY src src RUN --mount=target=$HOME/.m2,type=cache mvn clean package -FROM openjdk:8 as ldap +FROM openjdk:25 as ldap COPY --from=build target/log4shell-server-*-jar-with-dependencies.jar /server.jar EXPOSE 8000 EXPOSE 9999 diff --git a/log4shell-goof/log4shell-server/pom.xml b/log4shell-goof/log4shell-server/pom.xml index 94de0952b..de0085d39 100644 --- a/log4shell-goof/log4shell-server/pom.xml +++ b/log4shell-goof/log4shell-server/pom.xml @@ -20,22 +20,22 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.17.1 com.unboundid unboundid-ldapsdk - 3.1.1 + 4.0.5 io.undertow undertow-core - 2.2.13.Final + 2.2.37.Final commons-collections commons-collections - 3.1 + 3.2.2 org.apache.commons diff --git a/todolist-goof/Dockerfile b/todolist-goof/Dockerfile index 3d4c4fdfd..4f62466d2 100644 --- a/todolist-goof/Dockerfile +++ b/todolist-goof/Dockerfile @@ -10,7 +10,7 @@ COPY todolist-web-common todolist-web-common COPY todolist-web-struts todolist-web-struts RUN --mount=target=$HOME/.m2,type=cache mvn install -FROM tomcat:8.5.21 +FROM tomcat:11.0.6 RUN mkdir /tmp/extracted_files COPY web.xml /usr/local/tomcat/conf/web.xml diff --git a/todolist-goof/exploits/tomcat-rce/Dockerfile b/todolist-goof/exploits/tomcat-rce/Dockerfile index a1a44eb40..ac09324b6 100644 --- a/todolist-goof/exploits/tomcat-rce/Dockerfile +++ b/todolist-goof/exploits/tomcat-rce/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3 +FROM python:3.14-rc-alpine3.20 RUN pip install requests COPY exploit.py /exploit.py diff --git a/todolist-goof/k8s/calico.yaml b/todolist-goof/k8s/calico.yaml index f79ef13bc..c6226075a 100644 --- a/todolist-goof/k8s/calico.yaml +++ b/todolist-goof/k8s/calico.yaml @@ -4106,7 +4106,7 @@ spec: - mountPath: /host/opt/cni/bin name: cni-bin-dir securityContext: - privileged: true + privileged: false # This container installs the CNI binaries # and CNI network config file on each node. - name: install-cni @@ -4147,7 +4147,7 @@ spec: - mountPath: /host/etc/cni/net.d name: cni-net-dir securityContext: - privileged: true + privileged: false # Adds a Flex Volume Driver that creates a per-pod Unix Domain Socket to allow Dikastes # to communicate with Felix over the Policy Sync API. - name: flexvol-driver @@ -4156,7 +4156,7 @@ spec: - name: flexvol-driver-host mountPath: /host/driver securityContext: - privileged: true + privileged: false containers: # Runs calico-node container on each Kubernetes node. This # container programs network policy and routes on each @@ -4233,7 +4233,7 @@ spec: - name: FELIX_HEALTHENABLED value: "true" securityContext: - privileged: true + privileged: false resources: requests: cpu: 250m diff --git a/todolist-goof/pom.xml b/todolist-goof/pom.xml index 4df79d1b1..52ae2030f 100644 --- a/todolist-goof/pom.xml +++ b/todolist-goof/pom.xml @@ -10,10 +10,10 @@ https://github.com/snyk/java-goof - 3.2.6.RELEASE - 4.3.7.Final + 6.1.14 + 5.4.24.Final 5.3.8 - 2.3.20 + 7.0.0 UTF-8 diff --git a/todolist-goof/todolist-core/pom.xml b/todolist-goof/todolist-core/pom.xml index aeb2068be..89a99db4d 100644 --- a/todolist-goof/todolist-core/pom.xml +++ b/todolist-goof/todolist-core/pom.xml @@ -59,7 +59,7 @@ org.hsqldb hsqldb - 2.3.2 + 2.7.1 diff --git a/todolist-goof/todolist-web-common/pom.xml b/todolist-goof/todolist-web-common/pom.xml index 1e4535726..a02996839 100644 --- a/todolist-goof/todolist-web-common/pom.xml +++ b/todolist-goof/todolist-web-common/pom.xml @@ -21,12 +21,12 @@ com.fasterxml.jackson.core jackson-core - 2.6.5 + 2.15.0 com.fasterxml.jackson.core jackson-databind - 2.6.5 + 2.15.0 com.fasterxml.jackson.core @@ -59,7 +59,7 @@ org.hibernate hibernate-validator - 4.3.1.Final + 6.0.23.Final diff --git a/todolist-goof/todolist-web-struts/pom.xml b/todolist-goof/todolist-web-struts/pom.xml index e58874f82..c0c7d9f6b 100644 --- a/todolist-goof/todolist-web-struts/pom.xml +++ b/todolist-goof/todolist-web-struts/pom.xml @@ -27,7 +27,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.17.1 org.apache.logging.log4j @@ -90,7 +90,7 @@ org.zeroturnaround zt-zip - 1.12 + 1.13 jar