Skip to content

Commit 67a8a17

Browse files
committed
Update Debian SSL protocols and ciphers to match defaults
Debian 10 and Ubuntu 18.04 (oldest of supported Debian-based distros) default to these values. This gives a safer out-of-the-box experience.
1 parent 8fbf28b commit 67a8a17

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

manifests/params.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,10 @@
727727
$ssl_protocol = []
728728
$ssl_cipher = 'PROFILE=SYSTEM'
729729
$ssl_proxy_cipher_suite = 'PROFILE=SYSTEM'
730+
} elsif $facts['os']['family'] == 'Debian' {
731+
$ssl_protocol = ['all', '-SSLv3']
732+
$ssl_cipher = 'HIGH:!aNULL'
733+
$ssl_proxy_cipher_suite = undef
730734
} else {
731735
$ssl_protocol = ['all', '-SSLv2', '-SSLv3']
732736
$ssl_cipher = 'HIGH:MEDIUM:!aNULL:!MD5:!RC4:!3DES'

spec/acceptance/apache_ssl_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ class { 'apache':
2525
it { is_expected.to be_file }
2626
if os[:family].include?('redhat') && os[:release].to_i >= 8
2727
it { is_expected.not_to contain 'SSLProtocol' }
28+
elsif ['debian', 'ubuntu'].include?(os[:family])
29+
it { is_expected.to contain 'SSLProtocol all -SSLv3' }
2830
else
2931
it { is_expected.to contain 'SSLProtocol all -SSLv2 -SSLv3' }
3032
end

spec/classes/mod/ssl_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
it { is_expected.to contain_class('apache::params') }
7070
it { is_expected.to contain_apache__mod('ssl') }
7171
it { is_expected.not_to contain_package('libapache2-mod-ssl') }
72-
it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all -SSLv2 -SSLv3}) }
72+
it { is_expected.to contain_file('ssl.conf').with_content(%r{SSLProtocol all -SSLv3}) }
7373
end
7474
context 'on a FreeBSD OS' do
7575
include_examples 'FreeBSD 9'

0 commit comments

Comments
 (0)