From b874b4db281c919abe916e954b694be968ccc5fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 21:06:19 +0000 Subject: [PATCH 1/5] --- updated-dependencies: - dependency-name: ubuntu dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- docker-runner/service-base.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-runner/service-base.Dockerfile b/docker-runner/service-base.Dockerfile index 6c15600a7..ce6f59ab9 100644 --- a/docker-runner/service-base.Dockerfile +++ b/docker-runner/service-base.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:24.04 # Base Ubuntu container with the apt cache already updated. # Many containers will be able to use this as their base. From fd857f8bcf4ffa7caac39283e1c4397e562eb02d Mon Sep 17 00:00:00 2001 From: phillip-stephens Date: Mon, 27 Jan 2025 15:04:29 -0800 Subject: [PATCH 2/5] move to latest ubuntu for github image --- .github/workflows/integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 3ac6269bb..a29693442 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -37,7 +37,7 @@ jobs: integration-test: name: Integration Test - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - name: Check out source uses: actions/checkout@v4 From 74f5d01f630583f675ac16c9673e339a3e97eabc Mon Sep 17 00:00:00 2001 From: devStorm <59678453+developStorm@users.noreply.github.com> Date: Mon, 27 Jan 2025 23:51:19 +0000 Subject: [PATCH 3/5] fix: config for new lighthttp version --- integration_tests/http/container/lighttpd.conf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/integration_tests/http/container/lighttpd.conf b/integration_tests/http/container/lighttpd.conf index 381ff7421..be83a804e 100644 --- a/integration_tests/http/container/lighttpd.conf +++ b/integration_tests/http/container/lighttpd.conf @@ -3,6 +3,7 @@ server.modules = ( "mod_alias", "mod_compress", "mod_redirect", + "mod_openssl", # "mod_rewrite", ) @@ -16,14 +17,14 @@ index-file.names = ( "index.php", "index.html", "index.lighttpd.html" url.access-deny = ( "~", ".inc" ) static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" ) -compress.cache-dir = "/var/cache/lighttpd/compress/" -compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" ) +deflate.cache-dir = "/var/cache/lighttpd/compress/" +deflate.mimetypes = ( "application/javascript", "text/css", "text/html", "text/plain" ) # default listening port for IPv6 falls back to the IPv4 port ## Use ipv6 if available #include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port -include_shell "/usr/share/lighttpd/create-mime.assign.pl" -include_shell "/usr/share/lighttpd/include-conf-enabled.pl" +include_shell "/usr/share/lighttpd/create-mime.conf.pl" +include "/etc/lighttpd/conf-enabled/*.conf" debug.log-request-handling = "enable" From 6a15d1773ac8d3915d89b93afe713a038b0500ad Mon Sep 17 00:00:00 2001 From: devStorm <59678453+developStorm@users.noreply.github.com> Date: Mon, 27 Jan 2025 23:57:17 +0000 Subject: [PATCH 4/5] chore: bump CUPS version in expect test --- integration_tests/ipp/test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integration_tests/ipp/test.sh b/integration_tests/ipp/test.sh index 823381e34..ef2d7740c 100755 --- a/integration_tests/ipp/test.sh +++ b/integration_tests/ipp/test.sh @@ -29,8 +29,8 @@ function test_cups() { echo "ipp/test: Incorrect minor version. Expected 1, got $minor" exit 1 fi - if ! [ $cups = "CUPS/2.1" ]; then - echo "ipp/test: Incorrect CUPS version. Expected CUPS/2.1, got $cups" + if ! [ $cups = "CUPS/2.4" ]; then + echo "ipp/test: Incorrect CUPS version. Expected CUPS/2.4, got $cups" exit 1 fi } @@ -56,8 +56,8 @@ function test_cups_tls() { echo "ipp/test: Incorrect minor version. Expected 1, got $minor" exit 1 fi - if ! [ $cups = "CUPS/2.1" ]; then - echo "ipp/test: Incorrect CUPS version. Expected CUPS/2.1, got $cups" + if ! [ $cups = "CUPS/2.4" ]; then + echo "ipp/test: Incorrect CUPS version. Expected CUPS/2.4, got $cups" exit 1 fi if [ "$tls" = "null" ]; then From 97d4b4177151e285de10787732a328cd6c76906f Mon Sep 17 00:00:00 2001 From: devStorm <59678453+developStorm@users.noreply.github.com> Date: Tue, 28 Jan 2025 00:28:24 +0000 Subject: [PATCH 5/5] fix: switch to inetutils-telnetd for telnet test --- integration_tests/telnet/container/Dockerfile | 3 ++- integration_tests/telnet/container/entrypoint.sh | 4 ++-- integration_tests/telnet/container/inetd.conf | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 integration_tests/telnet/container/inetd.conf diff --git a/integration_tests/telnet/container/Dockerfile b/integration_tests/telnet/container/Dockerfile index dd2b6aeac..e5853f0de 100644 --- a/integration_tests/telnet/container/Dockerfile +++ b/integration_tests/telnet/container/Dockerfile @@ -1,6 +1,7 @@ FROM zgrab2_service_base:latest -RUN apt-get install -y telnetd +RUN apt-get install -y inetutils-telnetd +COPY inetd.conf /etc/inetd.conf WORKDIR / COPY entrypoint.sh . diff --git a/integration_tests/telnet/container/entrypoint.sh b/integration_tests/telnet/container/entrypoint.sh index e1bb8efbe..bc54ec773 100755 --- a/integration_tests/telnet/container/entrypoint.sh +++ b/integration_tests/telnet/container/entrypoint.sh @@ -3,8 +3,8 @@ set -x while true; do - if ! /usr/sbin/in.telnetd -debug 23; then - echo "in.telnetd exited unexpectedly. Restarting..." + if ! inetutils-inetd -d; then + echo "telnetd exited unexpectedly. Restarting..." sleep 1 fi done diff --git a/integration_tests/telnet/container/inetd.conf b/integration_tests/telnet/container/inetd.conf new file mode 100644 index 000000000..48906ee59 --- /dev/null +++ b/integration_tests/telnet/container/inetd.conf @@ -0,0 +1 @@ +telnet stream tcp nowait root /usr/sbin/tcpd /usr/sbin/telnetd