From ff11ca8a9bc4190bda067009c3b4f247f9941bbd Mon Sep 17 00:00:00 2001 From: Martin Alfke Date: Mon, 23 Jul 2018 19:32:15 +0200 Subject: [PATCH] Disable ServerkeyBits on RHEL 7.4 and later fixes #244 replaces #259 update spec tests to test changes mock operatingsystemrelease in default_facts --- manifests/init.pp | 6 +- spec/classes/init_spec.rb | 34 +++++--- spec/fixtures/sshd_config_rhel7 | 142 ++++++++++++++++++++++++++++++++ 3 files changed, 171 insertions(+), 11 deletions(-) create mode 100644 spec/fixtures/sshd_config_rhel7 diff --git a/manifests/init.pp b/manifests/init.pp index ea9f5c6..af4213f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -143,7 +143,11 @@ class ssh ( $default_sshd_gssapicleanupcredentials = 'yes' $default_sshd_acceptenv = true $default_service_hasstatus = true - $default_sshd_config_serverkeybits = '1024' + if versioncmp($::operatingsystemrelease, '7.4') < 0 { + $default_sshd_config_serverkeybits = '1024' + } else { + $default_sshd_config_serverkeybits = undef + } $default_sshd_config_hostkey = [ '/etc/ssh/ssh_host_rsa_key' ] $default_sshd_addressfamily = 'any' $default_sshd_config_tcp_keepalive = 'yes' diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 0c84210..94f9c78 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -3,16 +3,17 @@ require 'spec_helper' describe 'ssh' do default_facts = { - :fqdn => 'monkey.example.com', - :hostname => 'monkey', - :ipaddress => '127.0.0.1', - :lsbmajdistrelease => '6', - :osfamily => 'RedHat', - :root_home => '/root', - :specific => 'dummy', - :ssh_version => 'OpenSSH_6.6p1', - :ssh_version_numeric => '6.6', - :sshrsakey => 'AAAAB3NzaC1yc2EAAAABIwAAAQEArGElx46pD6NNnlxVaTbp0ZJMgBKCmbTCT3RaeCk0ZUJtQ8wkcwTtqIXmmiuFsynUT0DFSd8UIodnBOPqitimmooAVAiAi30TtJVzADfPScMiUnBJKZajIBkEMkwUcqsfh630jyBvLPE/kyQcxbEeGtbu1DG3monkeymanOBW1AKc5o+cJLXcInLnbowMG7NXzujT3BRYn/9s5vtT1V9cuZJs4XLRXQ50NluxJI7sVfRPVvQI9EMbTS4AFBXUej3yfgaLSV+nPZC/lmJ2gR4t/tKvMFF9m16f8IcZKK7o0rK7v81G/tREbOT5YhcKLK+0wBfR6RsmHzwy4EddZloyLQ==', + :fqdn => 'monkey.example.com', + :hostname => 'monkey', + :ipaddress => '127.0.0.1', + :lsbmajdistrelease => '6', + :operatingsystemrelease => '6.7', + :osfamily => 'RedHat', + :root_home => '/root', + :specific => 'dummy', + :ssh_version => 'OpenSSH_6.6p1', + :ssh_version_numeric => '6.6', + :sshrsakey => 'AAAAB3NzaC1yc2EAAAABIwAAAQEArGElx46pD6NNnlxVaTbp0ZJMgBKCmbTCT3RaeCk0ZUJtQ8wkcwTtqIXmmiuFsynUT0DFSd8UIodnBOPqitimmooAVAiAi30TtJVzADfPScMiUnBJKZajIBkEMkwUcqsfh630jyBvLPE/kyQcxbEeGtbu1DG3monkeymanOBW1AKc5o+cJLXcInLnbowMG7NXzujT3BRYn/9s5vtT1V9cuZJs4XLRXQ50NluxJI7sVfRPVvQI9EMbTS4AFBXUej3yfgaLSV+nPZC/lmJ2gR4t/tKvMFF9m16f8IcZKK7o0rK7v81G/tREbOT5YhcKLK+0wBfR6RsmHzwy4EddZloyLQ==', } default_solaris_facts = { @@ -83,6 +84,19 @@ describe 'ssh' do :sshd_config_fixture => 'sshd_config_rhel', :ssh_config_fixture => 'ssh_config_rhel', }, + 'RedHat-7.4' => { + :architecture => 'x86_64', + :osfamily => 'RedHat', + :operatingsystemrelease => '7.4', + :ssh_version => 'OpenSSH_6.6p1', + :ssh_version_numeric => '6.6', + :ssh_packages => ['openssh-server', 'openssh-clients'], + :sshd_config_mode => '0600', + :sshd_service_name => 'sshd', + :sshd_service_hasstatus => true, + :sshd_config_fixture => 'sshd_config_rhel7', + :ssh_config_fixture => 'ssh_config_rhel', + }, 'Suse-10-x86_64' => { :architecture => 'x86_64', :osfamily => 'Suse', diff --git a/spec/fixtures/sshd_config_rhel7 b/spec/fixtures/sshd_config_rhel7 new file mode 100644 index 0000000..ba55869 --- /dev/null +++ b/spec/fixtures/sshd_config_rhel7 @@ -0,0 +1,142 @@ +# This file is being maintained by Puppet. +# DO NOT EDIT + +# $OpenBSD: sshd_config,v 1.73 2005/12/06 22:38:28 reyk Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/local/bin:/bin:/usr/bin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options change a +# default value. + +#Port 22 +Port 22 +#Protocol 2,1 +Protocol 2 +#AddressFamily any +AddressFamily any + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +HostKey /etc/ssh/ssh_host_rsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +SyslogFacility AUTH +#LogLevel INFO +LogLevel INFO + +# Authentication: + +#LoginGraceTime 120 +LoginGraceTime 120 +#PermitRootLogin yes +PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 + +#RSAAuthentication yes +#PubkeyAuthentication yes +PubkeyAuthentication yes +#AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes +IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes +ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +GSSAPIAuthentication yes +#GSSAPICleanupCredentials yes +GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication mechanism. +# Depending on your PAM configuration, this may bypass the setting of +# PasswordAuthentication, PermitEmptyPasswords, and +# "PermitRootLogin without-password". If you just want the PAM account and +# session checks to run without PAM authentication, then enable this but set +# ChallengeResponseAuthentication=no +#UsePAM no +UsePAM yes + +# Accept locale-related environment variables +AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES +AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT +AcceptEnv LC_IDENTIFICATION LC_ALL +#AllowTcpForwarding yes +AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +X11Forwarding yes +#X11DisplayOffset 10 +#X11UseLocalhost yes +X11UseLocalhost yes +#PrintMotd yes +PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +ClientAliveInterval 0 +ClientAliveCountMax 3 +#ShowPatchLevel no +#UseDNS yes +UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10:30:100 +#MaxSessions 10 + +#PermitTunnel no +PermitTunnel no +#ChrootDirectory none + +# no default banner path +#Banner none +Banner none + +#XAuthLocation /usr/bin/xauth +XAuthLocation /usr/bin/xauth + +# override default of no subsystems +Subsystem sftp /usr/libexec/openssh/sftp-server +