From ed06c43df71c186aaeb481ddceaa2564e1397e7d Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Thu, 24 May 2018 16:03:33 +0200
Subject: [PATCH] Revert "hardening SSL + HEADER (#10)"
This reverts commit f418e8113c64e99362001e1773b5fb37ad5e0c67.
# Conflicts:
# templates/haproxy.cfg.tmpl
---
templates/haproxy.cfg.tmpl | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/templates/haproxy.cfg.tmpl b/templates/haproxy.cfg.tmpl
index e2e7ea4..cbc4655 100644
--- a/templates/haproxy.cfg.tmpl
+++ b/templates/haproxy.cfg.tmpl
@@ -3,8 +3,7 @@ global
log /dev/log local0 notice
maxconn 4096
tune.ssl.default-dh-param 2048
- ssl-default-bind-options no-sslv3 no-tls-tickets force-tlsv12
- ssl-default-bind-ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:!CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
+ ssl-default-bind-ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
defaults
log global
@@ -26,23 +25,15 @@ frontend http-in
{{ range $host, $container := groupBy $ "Env.AUTOCONFIG_HOST" }}
redirect location https://{{ $host }}/mail/config-v1.1.xml code 301 if { hdr_beg(host) -i autoconfig }
{{end}}
- redirect scheme https code 301 if ! { ssl_fc }
+ redirect scheme https code 301
frontend https-in
mode http
- bind *:443 ssl crt /etc/haproxy/certs alpn h2,http/1.1
+ bind *:443 ssl no-sslv3 crt /etc/haproxy/certs
reqadd X-Forwarded-Proto:\ https
+ rspadd Strict-Transport-Security:\ max-age=15768000
rspidel Server
rspidel X-Powered-By
- rspidel X-Frame-Options
- rspidel X-XSS-Protection
- rspidel X-Frame-Options
- rspidel X-Content-Type-Options
- rspadd X-Frame-Options:\ SAMEORIGIN # OR DENY
- rspadd X-XSS-Protection:\ 1;\ mode=block
- rspadd X-Content-Type-Options:\ nosniff
- rspadd Strict-Transport-Security:\ max-age=15768000
- rspadd Referrer-Policy:\ no-referrer-when-downgrade
use_backend letsencrypt-web if { path_beg /.well-known/acme }
{{ range $host, $containers := groupBy $ "Env.LIBRESH_WEBHOOK_HOST" }}
--
GitLab