Merge pull request #430 from zmap/dependabot/docker/docker-runner/ubuntu-24.04

Bump ubuntu from 16.04 to 24.04 in /docker-runner

Author: phillip-stephens

.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

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.

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"
 

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

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 .

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

integration_tests/telnet/container/inetd.conf

@@ -0,0 +1 @@
+telnet  stream  tcp     nowait  root    /usr/sbin/tcpd  /usr/sbin/telnetd