add TLS1.3

Dockerfile

@@ -5,6 +5,7 @@ RUN apt-get update && apt-get install -y \
         libfreetype6-dev \
         libjpeg62-turbo-dev \
         libpng-dev \
+        libapache2-mod-security2 \
     && docker-php-ext-install -j$(nproc) iconv \
     && docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ \
     && docker-php-ext-install -j$(nproc) gd
@@ -17,6 +18,14 @@ RUN mkdir -p /speedtest/
 
 COPY backend/ /speedtest/backend
 
+# TLS1.3
+COPY docker/etc/ports.conf /etc/apache2/ports.conf
+COPY docker/etc/default-ssl.conf /etc/apache2/sites-enabled/default-ssl.conf
+COPY docker/etc/ssl.conf /etc/apache2/mods-available/ssl.conf
+## Certificate and key
+COPY cert/cert.pem /etc/ssl/certs/cert.pem
+COPY cert/key.pem /etc/ssl/private/key.pem
+
 COPY results/*.php /speedtest/results/
 COPY results/*.ttf /speedtest/results/
 
@@ -40,5 +49,5 @@ ENV WEBPORT=80
 
 # Final touches
 
-EXPOSE 80
+EXPOSE 443
 CMD ["bash", "/entrypoint.sh"]

docker/entrypoint.sh

@@ -86,6 +86,8 @@ if [ "$WEBPORT" != "80" ]; then
 fi
 
 echo "Done, Starting APACHE"
+# TLS1.3
+a2enmod rewrite ssl security2
 
-# This runs apache
-apache2-foreground
+/etc/init.d/apache2 start
+/usr/bin/tail -f /dev/null

docker/etc/default-ssl.conf

@@ -0,0 +1,134 @@
+<IfModule mod_ssl.c>
+	<VirtualHost _default_:443>
+		ServerAdmin webmaster@localhost
+
+		DocumentRoot /var/www/html
+
+		# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
+		# error, crit, alert, emerg.
+		# It is also possible to configure the loglevel for particular
+		# modules, e.g.
+		#LogLevel info ssl:warn
+
+		ErrorLog ${APACHE_LOG_DIR}/error.log
+		CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+		# For most configuration files from conf-available/, which are
+		# enabled or disabled at a global level, it is possible to
+		# include a line for only one particular virtual host. For example the
+		# following line enables the CGI configuration for this host only
+		# after it has been globally disabled with "a2disconf".
+		#Include conf-available/serve-cgi-bin.conf
+
+		#   SSL Engine Switch:
+		#   Enable/Disable SSL for this virtual host.
+		SSLEngine on
+
+		#   A self-signed (snakeoil) certificate can be created by installing
+		#   the ssl-cert package. See
+		#   /usr/share/doc/apache2/README.Debian.gz for more info.
+		#   If both key and certificate are stored in the same file, only the
+		#   SSLCertificateFile directive is needed.
+		SSLCertificateFile	/etc/ssl/certs/cert.pem
+		SSLCertificateKeyFile /etc/ssl/private/key.pem
+
+		#   Server Certificate Chain:
+		#   Point SSLCertificateChainFile at a file containing the
+		#   concatenation of PEM encoded CA certificates which form the
+		#   certificate chain for the server certificate. Alternatively
+		#   the referenced file can be the same as SSLCertificateFile
+		#   when the CA certificates are directly appended to the server
+		#   certificate for convinience.
+		#SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt
+
+		#   Certificate Authority (CA):
+		#   Set the CA certificate verification path where to find CA
+		#   certificates for client authentication or alternatively one
+		#   huge file containing all of them (file must be PEM encoded)
+		#   Note: Inside SSLCACertificatePath you need hash symlinks
+		#		 to point to the certificate files. Use the provided
+		#		 Makefile to update the hash symlinks after changes.
+		#SSLCACertificatePath /etc/ssl/certs/
+		#SSLCACertificateFile /etc/apache2/ssl.crt/ca-bundle.crt
+
+		#   Certificate Revocation Lists (CRL):
+		#   Set the CA revocation path where to find CA CRLs for client
+		#   authentication or alternatively one huge file containing all
+		#   of them (file must be PEM encoded)
+		#   Note: Inside SSLCARevocationPath you need hash symlinks
+		#		 to point to the certificate files. Use the provided
+		#		 Makefile to update the hash symlinks after changes.
+		#SSLCARevocationPath /etc/apache2/ssl.crl/
+		#SSLCARevocationFile /etc/apache2/ssl.crl/ca-bundle.crl
+
+		#   Client Authentication (Type):
+		#   Client certificate verification type and depth.  Types are
+		#   none, optional, require and optional_no_ca.  Depth is a
+		#   number which specifies how deeply to verify the certificate
+		#   issuer chain before deciding the certificate is not valid.
+		#SSLVerifyClient require
+		#SSLVerifyDepth  10
+
+		#   SSL Engine Options:
+		#   Set various options for the SSL engine.
+		#   o FakeBasicAuth:
+		#	 Translate the client X.509 into a Basic Authorisation.  This means that
+		#	 the standard Auth/DBMAuth methods can be used for access control.  The
+		#	 user name is the `one line' version of the client's X.509 certificate.
+		#	 Note that no password is obtained from the user. Every entry in the user
+		#	 file needs this password: `xxj31ZMTZzkVA'.
+		#   o ExportCertData:
+		#	 This exports two additional environment variables: SSL_CLIENT_CERT and
+		#	 SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+		#	 server (always existing) and the client (only existing when client
+		#	 authentication is used). This can be used to import the certificates
+		#	 into CGI scripts.
+		#   o StdEnvVars:
+		#	 This exports the standard SSL/TLS related `SSL_*' environment variables.
+		#	 Per default this exportation is switched off for performance reasons,
+		#	 because the extraction step is an expensive operation and is usually
+		#	 useless for serving static content. So one usually enables the
+		#	 exportation for CGI and SSI requests only.
+		#   o OptRenegotiate:
+		#	 This enables optimized SSL connection renegotiation handling when SSL
+		#	 directives are used in per-directory context.
+		#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
+		<FilesMatch "\.(cgi|shtml|phtml|php)$">
+				SSLOptions +StdEnvVars
+		</FilesMatch>
+		<Directory /usr/lib/cgi-bin>
+				SSLOptions +StdEnvVars
+		</Directory>
+
+		#   SSL Protocol Adjustments:
+		#   The safe and default but still SSL/TLS standard compliant shutdown
+		#   approach is that mod_ssl sends the close notify alert but doesn't wait for
+		#   the close notify alert from client. When you need a different shutdown
+		#   approach you can use one of the following variables:
+		#   o ssl-unclean-shutdown:
+		#	 This forces an unclean shutdown when the connection is closed, i.e. no
+		#	 SSL close notify alert is send or allowed to received.  This violates
+		#	 the SSL/TLS standard but is needed for some brain-dead browsers. Use
+		#	 this when you receive I/O errors because of the standard approach where
+		#	 mod_ssl sends the close notify alert.
+		#   o ssl-accurate-shutdown:
+		#	 This forces an accurate shutdown when the connection is closed, i.e. a
+		#	 SSL close notify alert is send and mod_ssl waits for the close notify
+		#	 alert of the client. This is 100% SSL/TLS standard compliant, but in
+		#	 practice often causes hanging connections with brain-dead browsers. Use
+		#	 this only for browsers where you know that their SSL implementation
+		#	 works correctly.
+		#   Notice: Most problems of broken clients are also related to the HTTP
+		#   keep-alive facility, so you usually additionally want to disable
+		#   keep-alive for those clients, too. Use variable "nokeepalive" for this.
+		#   Similarly, one has to force some clients to use HTTP/1.0 to workaround
+		#   their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
+		#   "force-response-1.0" for this.
+		# BrowserMatch "MSIE [2-6]" \
+		#		nokeepalive ssl-unclean-shutdown \
+		#		downgrade-1.0 force-response-1.0
+
+	</VirtualHost>
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

docker/etc/ports.conf

@@ -0,0 +1,15 @@
+# If you just change the port or add more ports here, you will likely also
+# have to change the VirtualHost statement in
+# /etc/apache2/sites-enabled/000-default.conf
+
+# Listen 80
+
+<IfModule ssl_module>
+	Listen 443
+</IfModule>
+
+<IfModule mod_gnutls.c>
+	Listen 443
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

docker/etc/ssl.conf

@@ -0,0 +1,87 @@
+<IfModule mod_ssl.c>
+
+        # Pseudo Random Number Generator (PRNG):
+        # Configure one or more sources to seed the PRNG of the SSL library.
+        # The seed data should be of good random quality.
+        # WARNING! On some platforms /dev/random blocks if not enough entropy
+        # is available. This means you then cannot use the /dev/random device
+        # because it would lead to very long connection times (as long as
+        # it requires to make more entropy available). But usually those
+        # platforms additionally provide a /dev/urandom device which doesn't
+        # block. So, if available, use this one instead. Read the mod_ssl User
+        # Manual for more details.
+        #
+        SSLRandomSeed startup builtin
+        SSLRandomSeed startup file:/dev/urandom 512
+        SSLRandomSeed connect builtin
+        SSLRandomSeed connect file:/dev/urandom 512
+
+        ##
+        ##  SSL Global Context
+        ##
+        ##  All SSL configuration in this context applies both to
+        ##  the main server and all SSL-enabled virtual hosts.
+        ##
+
+        #
+        #   Some MIME-types for downloading Certificates and CRLs
+        #
+        AddType application/x-x509-ca-cert .crt
+        AddType application/x-pkcs7-crl .crl
+
+        #   Pass Phrase Dialog:
+        #   Configure the pass phrase gathering process.
+        #   The filtering dialog program (`builtin' is a internal
+        #   terminal dialog) has to provide the pass phrase on stdout.
+        SSLPassPhraseDialog  exec:/usr/share/apache2/ask-for-passphrase
+
+        #   Inter-Process Session Cache:
+        #   Configure the SSL Session Cache: First the mechanism 
+        #   to use and second the expiring timeout (in seconds).
+        #   (The mechanism dbm has known memory leaks and should not be used).
+        #SSLSessionCache                 dbm:${APACHE_RUN_DIR}/ssl_scache
+        SSLSessionCache         shmcb:${APACHE_RUN_DIR}/ssl_scache(512000)
+        SSLSessionCacheTimeout  300
+
+        #   Semaphore:
+        #   Configure the path to the mutual exclusion semaphore the
+        #   SSL engine uses internally for inter-process synchronization. 
+        #   (Disabled by default, the global Mutex directive consolidates by default
+        #   this)
+        #Mutex file:${APACHE_LOCK_DIR}/ssl_mutex ssl-cache
+
+
+        #   SSL Cipher Suite:
+        #   List the ciphers that the client is permitted to negotiate. See the
+        #   ciphers(1) man page from the openssl package for list of all available
+        #   options.
+        #   Enable only secure ciphers:
+        SSLCipherSuite ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:DHE-DSS-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA256:ECDH-RSA-AES256-GCM-SHA384:ECDH-ECDSA-AES256-GCM-SHA384:ECDH-RSA-AES256-SHA384:ECDH-ECDSA-AES256-SHA384:AES256-GCM-SHA384:AES256-SHA256
+
+        # SSL server cipher order preference:
+        # Use server priorities for cipher algorithm choice.
+        # Clients may prefer lower grade encryption.  You should enable this
+        # option if you want to enforce stronger encryption, and can afford
+        # the CPU cost, and did not override SSLCipherSuite in a way that puts
+        # insecure ciphers first.
+        # Default: Off
+        SSLHonorCipherOrder on
+
+        #   The protocols to enable.
+        #   Available values: all, SSLv3, TLSv1, TLSv1.1, TLSv1.2
+        #   SSL v2  is no longer supported
+        SSLProtocol -all +TLSv1.2 +TLSv1.3
+        SSLCertificateFile /etc/ssl/certs/cert.pem
+	SSLCertificateKeyFile /etc/ssl/private/key.pem
+
+        #   Allow insecure renegotiation with clients which do not yet support the
+        #   secure renegotiation protocol. Default: Off
+        #SSLInsecureRenegotiation on
+
+        #   Whether to forbid non-SNI clients to access name based virtual hosts.
+        #   Default: Off
+        #SSLStrictSNIVHostCheck On
+
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet