From: Tom Hughes <tom@compton.nu>
Date: Thu, 31 May 2018 18:04:06 +0000 (+0100)
Subject: Make sure STS and Expect-CT headers are set on redirect responses
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/4410e8b71cae55972a61b251bd39979b9ff77d74?ds=sidebyside

Make sure STS and Expect-CT headers are set on redirect responses
---

diff --git a/cookbooks/apache/templates/default/ssl.erb b/cookbooks/apache/templates/default/ssl.erb
index 6835e8ea5..ffbbcbb5e 100644
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -15,9 +15,6 @@ SSLStaplingErrorCacheTimeout 60
 SSLStaplingReturnResponderErrors off
 SSLStaplingFakeTryLater off
 SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_ocspcache(512000)
-<% if node[:ssl][:strict_transport_security] -%>
 
-Header setifempty Strict-Transport-Security "<%= node[:ssl][:strict_transport_security] %>" env=HTTPS
-<% end -%>
-
-Header setifempty Expect-CT "max-age=0, report-uri=\"https://openstreetmap.report-uri.com/r/d/ct/reportOnly\"" env=HTTPS
+Header always set Strict-Transport-Security "<%= node[:ssl][:strict_transport_security] %>" "expr=%{HTTPS} == 'on'"
+Header always set Expect-CT "max-age=0, report-uri=\"https://openstreetmap.report-uri.com/r/d/ct/reportOnly\"" "expr=%{HTTPS} == 'on'