From c7e533d7e5794be20a4f7be8525c5091bd8bc09a Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Tue, 27 Sep 2016 00:56:52 +0200 Subject: [PATCH] mod_ssl: FreeBSD support --- README.rst | 8 +- apache/files/FreeBSD/apache-2.4.config.jinja | 4 +- .../files/FreeBSD/generic_module.conf.jinja | 4 + apache/files/FreeBSD/mod_ssl.conf.jinja | 214 ++++++++++++++++++ apache/map.jinja | 1 + apache/mod_socache_shmcb.sls | 20 ++ apache/mod_ssl.sls | 18 ++ 7 files changed, 266 insertions(+), 3 deletions(-) create mode 100644 apache/files/FreeBSD/generic_module.conf.jinja create mode 100644 apache/files/FreeBSD/mod_ssl.conf.jinja create mode 100644 apache/mod_socache_shmcb.sls diff --git a/README.rst b/README.rst index bea57cb..90a3976 100644 --- a/README.rst +++ b/README.rst @@ -94,14 +94,20 @@ using data from Pillar. (Debian and RedHat Only) Allows you to install the basic Core Rules (CRS) and some basic configuration for mod_security2 ``apache.mod_security.rules`` +----------------------------- This state can create symlinks based on basic Core Rules package. (Debian only) Or it can distribute a mod_security rule file and place it /etc/modsecurity/ +``mod_socache_shmcb`` +--------------------- + +Enables mod_socache_shmcb. (FreeBSD only) + ``apache.mod_ssl`` ---------------------- -Installs and enables the mod_ssl module (Debian and RedHad only) +Installs and enables the mod_ssl module (Debian, RedHat and FreeBSD only) ``apache.mod_vhost_alias`` ---------------------- diff --git a/apache/files/FreeBSD/apache-2.4.config.jinja b/apache/files/FreeBSD/apache-2.4.config.jinja index f354219..77a8e2c 100644 --- a/apache/files/FreeBSD/apache-2.4.config.jinja +++ b/apache/files/FreeBSD/apache-2.4.config.jinja @@ -40,8 +40,6 @@ ServerRoot "/usr/local" # # Mutex default:/var/run -Include {{ apache.portsfile }} - # # Dynamic Shared Object (DSO) Support # @@ -171,6 +169,8 @@ LoadModule alias_module libexec/apache24/mod_alias.so # Third party modules IncludeOptional etc/apache24/modules.d/[0-9][0-9][0-9]_*.conf +Include {{ apache.portsfile }} + # # If you wish httpd to run as a different user or group, you must run diff --git a/apache/files/FreeBSD/generic_module.conf.jinja b/apache/files/FreeBSD/generic_module.conf.jinja new file mode 100644 index 0000000..8882b45 --- /dev/null +++ b/apache/files/FreeBSD/generic_module.conf.jinja @@ -0,0 +1,4 @@ +# Managed by saltstack + +LoadModule {{ module_name }}_module libexec/apache24/mod_{{ module_name }}.so + diff --git a/apache/files/FreeBSD/mod_ssl.conf.jinja b/apache/files/FreeBSD/mod_ssl.conf.jinja new file mode 100644 index 0000000..dad5f59 --- /dev/null +++ b/apache/files/FreeBSD/mod_ssl.conf.jinja @@ -0,0 +1,214 @@ +# Managed by saltstack + +LoadModule ssl_module libexec/apache24/mod_ssl.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 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 builtin + +# Inter-Process Session Cache: +# Configure the SSL Session Cache: First the mechanism +# to use and second the expiring timeout (in seconds). +#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. + +SSLMutex file:${APACHE_RUN_DIR}/ssl_mutex + + +# SSL Cipher Suite: +# List the ciphers that the client is permitted to negotiate. +# See the mod_ssl documentation for a complete list. +# enable only secure ciphers: +#SSLCipherSuite HIGH:MEDIUM:!ADH +SSLCipherSuite EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:+CAMELLIA256:+AES256:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!ECDSA:CAMELLIA256-SHA:AES256-SHA:CAMELLIA128-SHA:AES128-SHA + +# Mitigate the CRIME attack +#SSLCompression off + +# Use this instead if you want to allow cipher upgrades via SGC facility. +# In this case you also have to use something like +# SSLRequire %{SSL_CIPHER_USEKEYSIZE} >= 128 +# see http://httpd.apache.org/docs/2.2/ssl/ssl_howto.html.en#upgradeenc +#SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL + +# enable only secure protocols: SSLv3 and TLSv1, but not SSLv2 +SSLProtocol all -SSLv2 -SSLv3 + +SSLHonorCipherOrder On + +# (bettercrypto.org) +# Add six earth month HSTS header for all users... +Header add Strict-Transport-Security "max-age=15768000" +# If you want to protect all subdomains, use the following header +# ALL subdomains HAVE TO support HTTPS if you use this! +# Strict-Transport-Security: max-age=15768000 ; includeSubDomains + +# SSL Engine Switch: +# Enable/Disable SSL for this virtual host. +SSLEngine on +SSLOptions +StrictRequire + +# A self-signed (snakeoil) certificate can be created by installing +# the ssl-cert package. See +# /usr/share/doc/apache2.2-common/README.Debian.gz for more info. +# If both key and certificate are stored in the same file, only the +# SSLCertificateFile directive is needed. +SSLCertificateFile /usr/local/etc/apache24/ssl/apache2-cert.pem +SSLCertificateKeyFile /usr/local/etc/apache24/ssl/apache2-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 /usr/local/etc/apache24/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 /usr/local/etc/apache24/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 /usr/local/etc/apache24/ssl.crl/ +#SSLCARevocationFile /usr/local/etc/apache24/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 + +# 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 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 +# MSIE 7 and newer should be able to use keepalive +BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown + + diff --git a/apache/map.jinja b/apache/map.jinja index 5ea22b4..5bda047 100644 --- a/apache/map.jinja +++ b/apache/map.jinja @@ -89,6 +89,7 @@ 'vhostdir': '/usr/local/etc/apache22/Includes', 'confdir': '/usr/local/etc/apache22/Includes', + 'modulesdir': '/usr/local/etc/apache22/modules.d', 'confext': '', 'default_site': 'default', 'default_site_ssl': 'default-ssl', diff --git a/apache/mod_socache_shmcb.sls b/apache/mod_socache_shmcb.sls new file mode 100644 index 0000000..af8cb3e --- /dev/null +++ b/apache/mod_socache_shmcb.sls @@ -0,0 +1,20 @@ +{% from "apache/map.jinja" import apache with context %} + +{% if grains['os_family']=="FreeBSD" %} + +include: + - apache + +{{ apache.modulesdir }}/009_mod_socache_shmcb.conf: + file.managed: + - source: salt://apache/files/{{ salt['grains.get']('os_family') }}/generic_module.conf.jinja + - mode: 644 + - template: jinja + - require: + - pkg: apache + - watch_in: + - module: apache-restart + - context: + module_name: socache_shmcb + +{% endif %} diff --git a/apache/mod_ssl.sls b/apache/mod_ssl.sls index 74fb7c9..38606ba 100644 --- a/apache/mod_ssl.sls +++ b/apache/mod_ssl.sls @@ -1,3 +1,5 @@ +{% from "apache/map.jinja" import apache with context %} + {% if grains['os_family']=="Debian" %} include: @@ -22,4 +24,20 @@ mod_ssl: - watch_in: - module: apache-restart +{% elif grains['os_family']=="FreeBSD" %} + +include: + - apache + - apache.mod_socache_shmcb + +{{ apache.modulesdir }}/010_mod_ssl.conf: + file.managed: + - source: salt://apache/files/{{ salt['grains.get']('os_family') }}/mod_ssl.conf.jinja + - mode: 644 + - template: jinja + - require: + - pkg: apache + - watch_in: + - module: apache-restart + {% endif %}