Add Reverse Proxy directives, GeoIP, Certificates management, mostly …

…for RedHat

README.rst

@@ -25,6 +25,11 @@ Installs the Apache package and starts the service.
 
 Configures apache based on os_family
 
+``apache.certificates``
+-----------------
+
+Deploy SSL certificates from pillars
+
 ``apache.mod_mpm``
 ------------------
 
@@ -75,6 +80,11 @@ Installs and Enables the mod_pagespeed module. (Debian and RedHat Only)
 
 Installs and enables the mod_perl2 module (Debian and FreeBSD only)
 
+``apache.mod_geoip``
+-------------------
+
+Installs and enables the mod_geoIP (RedHat only)
+
 ``apache.mod_php5``
 -------------------
 

apache/certificates.sls

@@ -0,0 +1,51 @@
+{% from "apache/map.jinja" import apache with context %}
+
+include:
+  - apache
+
+{%- for site, confcert in salt['pillar.get']('apache:sites', {}).iteritems() %}
+
+{% if confcert.SSLCertificateKeyFile is defined and confcert.SSLCertificateKeyFile_content is defined %}
+# Deploy {{ site }} key file
+apache_cert_config_{{ site }}_key_file:
+  file.managed:
+    - name: {{ confcert.SSLCertificateKeyFile }}
+    - contents_pillar: apache:sites:{{ site }}:SSLCertificateKeyFile_content
+    - makedirs: True
+    - mode: 600
+    - user: root
+    - group: root
+    - watch_in:
+      - module: apache-reload
+{% endif %}
+
+{% if confcert.SSLCertificateFile is defined and confcert.SSLCertificateFile_content is defined %}
+# Deploy {{ site }} cert file
+apache_cert_config_{{ site }}_cert_file:
+  file.managed:
+    - name: {{ confcert.SSLCertificateFile }}
+    - contents_pillar: apache:sites:{{ site }}:SSLCertificateFile_content
+    - makedirs: True
+    - mode: 600
+    - user: root
+    - group: root
+    - watch_in:
+      - module: apache-reload
+{% endif %}
+
+{% if confcert.SSLCertificateChainFile is defined and confcert.SSLCertificateChainFile_content is defined %}
+# Deploy {{ site }} bundle file
+apache_cert_config_{{ site }}_bundle_file:
+  file.managed:
+    - name: {{ confcert.SSLCertificateChainFile }}
+    - contents_pillar: apache:sites:{{ site }}:SSLCertificateChainFile_content
+    - makedirs: True
+    - mode: 600
+    - user: root
+    - group: root
+    - watch_in:
+      - module: apache-reload
+{% endif %}
+
+{%- endfor %}
+

apache/files/RedHat/apache-2.4.config.jinja

@@ -393,3 +393,7 @@ IncludeOptional {{ apache.confdir }}/*.conf
 IncludeOptional {{ apache.vhostdir }}/*.conf
 {% endif %}
 
+# Added for security enhancements
+TraceEnable off
+ServerSignature off
+ServerTokens Prod

apache/files/RedHat/geoip.conf

@@ -0,0 +1,4 @@
+<IfModule mod_geoip.c>
+  GeoIPEnable On
+  GeoIPDBFile /usr/share/GeoIP/GeoIP.dat
+</IfModule>

apache/files/RedHat/ssl.conf

@@ -0,0 +1,210 @@
+    ##
+    ##  SSL Global Context
+    ##
+    ##  All SSL configuration in this context applies both to
+    ##  the main server and all SSL-enabled virtual hosts.
+    ##
+
+    #   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/libexec/httpd-ssl-pass-dialog
+
+    #   Inter-Process Session Cache:
+    #   Configure the SSL Session Cache: First the mechanism
+    #   to use and second the expiring timeout (in seconds).
+    SSLSessionCache         shmcb:/run/httpd/sslcache(512000)
+    SSLSessionCacheTimeout  300
+
+    #   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/urandom  256
+    SSLRandomSeed connect builtin
+    #SSLRandomSeed startup file:/dev/random  512
+    #SSLRandomSeed connect file:/dev/random  512
+    #SSLRandomSeed connect file:/dev/urandom 512
+
+    #
+    # Use "SSLCryptoDevice" to enable any supported hardware
+    # accelerators. Use "openssl engine -v" to list supported
+    # engine names.  NOTE: If you enable an accelerator and the
+    # server does not start, consult the error logs and ensure
+    # your accelerator is functioning properly.
+    #
+    SSLCryptoDevice builtin
+    #SSLCryptoDevice ubsec
+
+    ##
+    ## SSL Virtual Host Context
+    ##
+
+    <VirtualHost _default_:443>
+
+    # General setup for the virtual host, inherited from global configuration
+    #DocumentRoot "/var/www/html"
+    #ServerName www.example.com:443
+
+    # Use separate log files for the SSL virtual host; note that LogLevel
+    # is not inherited from httpd.conf.
+    ErrorLog logs/ssl_error_log
+    TransferLog logs/ssl_access_log
+    LogLevel warn
+
+    #   SSL Engine Switch:
+    #   Enable/Disable SSL for this virtual host.
+    SSLEngine on
+
+    #   SSL Protocol support:
+    # List the enable protocol levels with which clients will be able to
+    # connect.  Disable SSLv2 access by default:
+    SSLProtocol all -SSLv2 -SSLv3
+
+    #   SSL Cipher Suite:
+    #   List the ciphers that the client is permitted to negotiate.
+    #   See the mod_ssl documentation for a complete list.
+    SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!SEED:!IDEA
+
+    #   Speed-optimized SSL Cipher configuration:
+    #   If speed is your main concern (on busy HTTPS servers e.g.),
+    #   you might want to force clients to specific, performance
+    #   optimized ciphers. In this case, prepend those ciphers
+    #   to the SSLCipherSuite list, and enable SSLHonorCipherOrder.
+    #   Caveat: by giving precedence to RC4-SHA and AES128-SHA
+    #   (as in the example below), most connections will no longer
+    #   have perfect forward secrecy - if the server's key is
+    #   compromised, captures of past or future traffic must be
+    #   considered compromised, too.
+    #SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5
+    #SSLHonorCipherOrder 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.  A new
+    # certificate can be generated using the genkey(1) command.
+    SSLCertificateFile /etc/pki/tls/certs/localhost.crt
+
+    #   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.)
+    SSLCertificateKeyFile /etc/pki/tls/private/localhost.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 convinience.
+    #SSLCertificateChainFile /etc/pki/tls/certs/server-chain.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)
+    #SSLCACertificateFile /etc/pki/tls/certs/ca-bundle.crt
+
+    #   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.
+    #<Location />
+    #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]+$/
+    #</Location>
+
+    #   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
+    <Files ~ "\.(cgi|shtml|phtml|php3?)$">
+        SSLOptions +StdEnvVars
+    </Files>
+    <Directory "/var/www/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-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"
+
+    </VirtualHost>

apache/mod_geoip.sls

@@ -0,0 +1,38 @@
+{% from "apache/map.jinja" import apache with context %}
+
+{% if grains['os_family']=="RedHat" %}
+
+include:
+  - apache
+
+mod-geoip:
+  pkg.installed:
+    - pkgs:
+      - GeoIP
+      - mod_geoip
+    - require:
+      - pkg: apache
+
+    - watch_in:
+      - module: apache-restart
+
+geoip conf:
+  file.managed:
+    - name: {{ apache.confdir }}/geoip.conf
+    - user: root
+    - group: root
+    - mode: 644
+    - source: 
+      - salt://apache/files/{{ salt['grains.get']('os_family') }}/geoip.conf
+
+geoip database:
+  file.managed:
+    - name: /usr/share/GeoIP/GeoIP.dat
+    - user: root
+    - group: root
+    - mode: 644
+    - source:
+      - salt://apache/files/{{ salt['grains.get']('os_family') }}/GeoIP.dat
+
+{% endif %}
+

apache/mod_remoteip.sls

@@ -23,3 +23,21 @@ a2enmod remoteip:
       - service: apache
 
 {% endif %}
+
+
+{% if grains['os_family']=="RedHat" %}
+
+include:
+  - apache
+
+/etc/httpd/conf.d/remoteip.conf:
+  file.managed:
+    - template: jinja
+    - source:
+      - salt://apache/files/{{ salt['grains.get']('os_family') }}/remoteip.conf.jinja
+    - require:
+      - pkg: apache
+    - watch_in:
+      - service: apache
+
+{% endif %}