From db321c3098d3c63a6411cd76c274ef9f5708f7a7 Mon Sep 17 00:00:00 2001 From: Pavel Skipenes <38912521+pavelskipenes@users.noreply.github.com> Date: Sun, 12 Mar 2023 15:47:35 +0000 Subject: [PATCH] SSC: refactor (#184) --- .env.example | 1 + docker-compose.yml | 13 +- docker/app/Dockerfile | 5 + docker/app/conf/httpd.conf | 6 +- docker/app/conf/settings.json | 2 +- docker/app/conf/ssl.conf | 293 +++++++++++++++++++ docker/self_signed_certificate/Dockerfile | 11 - docker/self_signed_certificate/conf/cert.ini | 7 - 8 files changed, 304 insertions(+), 34 deletions(-) create mode 100644 docker/app/conf/ssl.conf delete mode 100644 docker/self_signed_certificate/Dockerfile delete mode 100755 docker/self_signed_certificate/conf/cert.ini diff --git a/.env.example b/.env.example index 1af65fe..bc69289 100755 --- a/.env.example +++ b/.env.example @@ -9,4 +9,5 @@ DB_USERNAME="admin" DB_PASSWORD="testing_password" # Note: if username or password is changed then docker/mariadb/databases/databases.sql needs to be updated as well +BASE_URL=https://localhost LOG_NOT_FOUND_PATH=log/not_found.log diff --git a/docker-compose.yml b/docker-compose.yml index 9371fdb..ec2cf78 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,6 @@ services: - 443:443 depends_on: - ${DB_HOSTNAME} - - self_signed_certificate volumes: - ./private:/var/www/localhost/htdocs/private:ro - ./public:/var/www/localhost/htdocs/public:ro @@ -34,17 +33,7 @@ services: - ./docker/app/conf/settings.json:/var/www/localhost/htdocs/settings/settings.json:ro - ./docker/app/conf/httpd.conf:/etc/apache2/httpd.conf:ro - ./docker/storage/vendor:/var/www/localhost/htdocs/vendor:ro - - ./docker/storage/self_signed_certificate/server.key:/etc/apache2/conf.d/server.key - - ./docker/storage/self_signed_certificate/server.crt:/etc/apache2/conf.d/server.crt - - self_signed_certificate: - build: - context: ./ - dockerfile: ./docker/self_signed_certificate/Dockerfile - container_name: self_signed_certificate - volumes: - - ./docker/self_signed_certificate/conf:/app - - ./docker/storage/self_signed_certificate:/out + - ./docker/app/conf/ssl.conf:/etc/apache2/conf.d/ssl.conf:ro # Database db: image: mariadb diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile index 95875e4..b4ee39b 100755 --- a/docker/app/Dockerfile +++ b/docker/app/Dockerfile @@ -22,9 +22,14 @@ RUN apk add \ perl \ bat + # Copy over configs and application data WORKDIR /var/www/localhost/htdocs +# Generate self signed sertificate +RUN openssl req -new -newkey rsa:2048 -nodes -keyout /etc/ssl/apache2/server.key -out /etc/ssl/apache2/server.csr -subj "/CN=localhost" +RUN openssl x509 -req -days 365 -in /etc/ssl/apache2/server.csr -signkey /etc/ssl/apache2/server.key -out /etc/ssl/apache2/server.crt -extfile <(echo "basicConstraints = CA:FALSE") + COPY img ./img COPY translations ./translations diff --git a/docker/app/conf/httpd.conf b/docker/app/conf/httpd.conf index bc9dd74..24dcfc8 100755 --- a/docker/app/conf/httpd.conf +++ b/docker/app/conf/httpd.conf @@ -199,7 +199,7 @@ Group apache # e-mailed. This address appears on some server-generated pages, such # as error documents. e.g. admin@your-domain.com # -ServerAdmin you@example.com +ServerAdmin dev@localhost # # Optionally add a line containing the server version and virtual host @@ -218,7 +218,7 @@ ServerSignature On # # If your host doesn't have a registered DNS name, enter its IP address here. # -#ServerName www.example.com:80 +ServerName localhost:80 # # Deny access to the entirety of your server's filesystem. You must @@ -480,4 +480,4 @@ LogLevel warn # Load config files from the config directory "/etc/apache2/conf.d". # IncludeOptional /etc/apache2/conf.d/*.conf -LogLevel debug \ No newline at end of file +# LogLevel debug diff --git a/docker/app/conf/settings.json b/docker/app/conf/settings.json index fdc3422..b025231 100755 --- a/docker/app/conf/settings.json +++ b/docker/app/conf/settings.json @@ -1,6 +1,6 @@ { "$schema": "./docker.schema.json", - "baseurl": "https://127.0.0.1", + "baseurl": "https://localhost", "memberTable": "member", "translations_dir": "translations", "emails": { diff --git a/docker/app/conf/ssl.conf b/docker/app/conf/ssl.conf new file mode 100644 index 0000000..42e68dd --- /dev/null +++ b/docker/app/conf/ssl.conf @@ -0,0 +1,293 @@ +# +# This is the Apache server configuration file providing SSL support. +# It contains the configuration directives to instruct the server how to +# serve pages over an https connection. For detailed information about these +# directives see +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# Required modules: mod_log_config, mod_setenvif, mod_ssl, +# socache_shmcb_module (for default value of SSLSessionCache) +LoadModule ssl_module modules/mod_ssl.so +LoadModule socache_shmcb_module modules/mod_socache_shmcb.so + +# +# 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 file:/dev/random 512 +SSLRandomSeed startup file:/dev/urandom 512 +SSLRandomSeed connect builtin +#SSLRandomSeed connect file:/dev/random 512 +#SSLRandomSeed connect file:/dev/urandom 512 + + +# +# When we also provide SSL we have to listen to the +# standard HTTP port (see above) and to the HTTPS port +# +Listen 443 + +## +## SSL Global Context +## +## All SSL configuration in this context applies both to +## the main server and all SSL-enabled virtual hosts. +## + +# SSL Cipher Suite: +# List the ciphers that the client is permitted to negotiate, +# and that httpd will negotiate as the client of a proxied server. +# See the OpenSSL documentation for a complete list of ciphers, and +# ensure these follow appropriate best practices for this deployment. +# httpd 2.2.30, 2.4.13 and later force-disable aNULL, eNULL and EXP ciphers, +# while OpenSSL disabled these by default in 0.9.8zf/1.0.0r/1.0.1m/1.0.2a. +SSLCipherSuite HIGH:MEDIUM:!MD5:!RC4:!3DES:!ADH +SSLProxyCipherSuite HIGH:MEDIUM:!MD5:!RC4:!3DES:!ADH + +# By the end of 2016, only TLSv1.2 ciphers should remain in use. +# Older ciphers should be disallowed as soon as possible, while the +# kRSA ciphers do not offer forward secrecy. These changes inhibit +# older clients (such as IE6 SP2 or IE8 on Windows XP, or other legacy +# non-browser tooling) from successfully connecting. +# +# To restrict mod_ssl to use only TLSv1.2 ciphers, and disable +# those protocols which do not support forward secrecy, replace +# the SSLCipherSuite and SSLProxyCipherSuite directives above with +# the following two directives, as soon as practical. +# SSLCipherSuite HIGH:MEDIUM:!SSLv3:!kRSA +# SSLProxyCipherSuite HIGH:MEDIUM:!SSLv3:!kRSA + +# User agents such as web browsers are not configured for the user's +# own preference of either security or performance, therefore this +# must be the prerogative of the web server administrator who manages +# cpu load versus confidentiality, so enforce the server's cipher order. +SSLHonorCipherOrder on + +# SSL Protocol support: +# List the protocol versions which clients are allowed to connect with. +# Disable SSLv3 by default (cf. RFC 7525 3.1.1). TLSv1 (1.0) should be +# disabled as quickly as practical. By the end of 2016, only the TLSv1.2 +# protocol or later should remain in use. +SSLProtocol all -SSLv3 +SSLProxyProtocol all -SSLv3 + +# Pass Phrase Dialog: +# Configure the pass phrase gathering process. +# The filtering dialog program (`builtin' is an internal +# terminal dialog) has to provide the pass phrase on stdout. +SSLPassPhraseDialog builtin + +# Inter-Process Session Cache: +# Configure the SSL Session Cache: First the mechanism +# to use and second the expiring timeout (in seconds). +#SSLSessionCache "dbm:/run/apache2/ssl_scache" +SSLSessionCache "shmcb:/var/cache/mod_ssl/scache(512000)" +SSLSessionCacheTimeout 300 + +# OCSP Stapling (requires OpenSSL 0.9.8h or later) +# +# This feature is disabled by default and requires at least +# the two directives SSLUseStapling and SSLStaplingCache. +# Refer to the documentation on OCSP Stapling in the SSL/TLS +# How-To for more information. +# +# Enable stapling for all SSL-enabled servers: +#SSLUseStapling On + +# Define a relatively small cache for OCSP Stapling using +# the same mechanism that is used for the SSL session cache +# above. If stapling is used with more than a few certificates, +# the size may need to be increased. (AH01929 will be logged.) +#SSLStaplingCache "shmcb:/run/apache2/ssl_stapling(32768)" + +# Seconds before valid OCSP responses are expired from the cache +#SSLStaplingStandardCacheTimeout 3600 + +# Seconds before invalid OCSP responses are expired from the cache +#SSLStaplingErrorCacheTimeout 600 + +## +## SSL Virtual Host Context +## + + + +# General setup for the virtual host +DocumentRoot "/var/www/localhost/htdocs" +ServerName localhost:443 +ServerAdmin dev@localhost +ErrorLog logs/ssl_error.log +TransferLog logs/ssl_access.log + +# SSL Engine Switch: +# Enable/Disable SSL for this virtual host. +SSLEngine on + +# Server Certificate: +# Point SSLCertificateFile at a PEM encoded certificate. If +# the certificate is encrypted, then you will be prompted for a +# pass phrase. Note that a kill -HUP will prompt again. Keep +# in mind that if you have both an RSA and a DSA certificate you +# can configure both in parallel (to also allow the use of DSA +# ciphers, etc.) +# Some ECC cipher suites (http://www.ietf.org/rfc/rfc4492.txt) +# require an ECC certificate which can also be configured in +# parallel. +SSLCertificateFile /etc/ssl/apache2/server.crt +#SSLCertificateFile /etc/ssl/apache2/server-dsa.pem +#SSLCertificateFile /etc/ssl/apache2/server-ecc.pem + +# Server Private Key: +# If the key is not combined with the certificate, use this +# directive to point at the key file. Keep in mind that if +# you've both a RSA and a DSA private key you can configure +# both in parallel (to also allow the use of DSA ciphers, etc.) +# ECC keys, when in use, can also be configured in parallel +SSLCertificateKeyFile /etc/ssl/apache2/server.key +#SSLCertificateKeyFile /etc/ssl/apache2/server-dsa.key +#SSLCertificateKeyFile /etc/ssl/apache2/server-ecc.key + +# 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 convenience. +#SSLCertificateChainFile /etc/ssl/apache2/server-ca.pem + +# 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/apache2/ssl.crt +#SSLCACertificateFile /etc/ssl/apache2/ssl.crt/ca-bundle.pem + +# 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). +# The CRL checking mode needs to be configured explicitly +# through SSLCARevocationCheck (defaults to "none" otherwise). +# 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/ssl/apache2/ssl.crl +#SSLCARevocationFile /etc/ssl/apache2/ssl.crl/ca-bundle.crl +#SSLCARevocationCheck chain + +# 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 + +# TLS-SRP mutual authentication: +# Enable TLS-SRP and set the path to the OpenSSL SRP verifier +# file (containing login information for SRP user accounts). +# Requires OpenSSL 1.0.1 or newer. See the mod_ssl FAQ for +# detailed instructions on creating this file. Example: +# "openssl srp -srpvfile /etc/apache2/passwd.srpv -add username" +#SSLSRPVerifierFile "/etc/apache2/passwd.srpv" + +# Access Control: +# With SSLRequire you can do per-directory access control based +# on arbitrary complex boolean expressions containing server +# variable checks and other lookup directives. The syntax is a +# mixture between C and Perl. See the mod_ssl documentation +# for more details. +# +#SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)/ \ +# and %{SSL_CLIENT_S_DN_O} eq "Snake Oil, Ltd." \ +# and %{SSL_CLIENT_S_DN_OU} in {"Staff", "CA", "Dev"} \ +# and %{TIME_WDAY} >= 1 and %{TIME_WDAY} <= 5 \ +# and %{TIME_HOUR} >= 8 and %{TIME_HOUR} <= 20 ) \ +# or %{REMOTE_ADDR} =~ m/^192\.76\.162\.[0-9]+$/ +# + +# 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 StrictRequire: +# This denies access when "SSLRequireSSL" or "SSLRequire" applied even +# under a "Satisfy any" situation, i.e. when it applies access is denied +# and no other module can change it. +# o OptRenegotiate: +# This enables optimized SSL connection renegotiation handling when SSL +# directives are used in per-directory context. +#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire + + SSLOptions +StdEnvVars + + + SSLOptions +StdEnvVars + + +# 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 sent or allowed to be 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-5]" \ + nokeepalive ssl-unclean-shutdown \ + downgrade-1.0 force-response-1.0 + +# Per-Server Logging: +# The home of a custom SSL log file. Use this when you want a +# compact non-error SSL logfile on a virtual host basis. +CustomLog logs/ssl_request.log \ + "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" + + diff --git a/docker/self_signed_certificate/Dockerfile b/docker/self_signed_certificate/Dockerfile deleted file mode 100644 index 2080bdc..0000000 --- a/docker/self_signed_certificate/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM alpine - -RUN apk update -RUN apk upgrade -RUN apk add openssl - -WORKDIR /app - -CMD openssl genrsa -out /out/server.key 1024 && \ - openssl req -new -key /out/server.key -out /out/server.csr -config cert.ini && \ - openssl x509 -req -days 365 -in /out/server.csr -signkey /out/server.key -out /out/server.crt \ No newline at end of file diff --git a/docker/self_signed_certificate/conf/cert.ini b/docker/self_signed_certificate/conf/cert.ini deleted file mode 100755 index 829c82e..0000000 --- a/docker/self_signed_certificate/conf/cert.ini +++ /dev/null @@ -1,7 +0,0 @@ -[ req ] -prompt = no -default_bits = 4096 -distinguished_name = req_distinguished_name - -[ req_distinguished_name ] -C=NO \ No newline at end of file