diff --git a/Dockerfile b/Dockerfile index 1a36771..f6e71cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM perl:5.32.1 +FROM perl:5.34.0 # Move it WORKDIR /opt @@ -18,7 +18,6 @@ RUN apt-get -y upgrade RUN apt-get -y install fortune-mod ruby RUN cpanm --installdeps . RUN gem install cgi -RUN gem install ipaddress # Finish setting up the environment ENV MOJO_REVERSE_PROXY=1 diff --git a/cgi-bin/whoami.cgi b/cgi-bin/whoami.cgi index 19eec5a..34e904a 100755 --- a/cgi-bin/whoami.cgi +++ b/cgi-bin/whoami.cgi @@ -5,7 +5,6 @@ # Oct 2020 require 'cgi' -require 'ipaddress' # Create CGI object cgi = CGI.new('html4') @@ -38,7 +37,7 @@ cgi_env = { 'address' => remote_addr, 'port' => remote_port, 'method' => request_method, - 'webmaster' => server_admin, + 'webmaster' => 'swaggboi@slackware.uk', 'protocol' => server_protocol, 'server' => server_software } @@ -54,7 +53,7 @@ easter_egg = { } # Easter egg for IPv6 footer = - if IPAddress.valid_ipv6?(cgi_env['address']) + if cgi_env['address'] =~ /[a-fA-F:]/ cgi.img(easter_egg) + cgi.br + "\n" + cgi.br + "\n" + footer else '