Skip to content

Commit 6d929fd

Browse files
Cleanup the attribute handling in templates
and have it the same way: - only crypto related parameters are passed as template var - all other attributes are referenced directly via node obj from template
1 parent 8e36493 commit 6d929fd

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

recipes/client.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
variables(
3939
mac: node['ssh-hardening']['ssh']['client']['mac'] || DevSec::Ssh.get_client_macs(node['ssh-hardening']['ssh']['client']['weak_hmac']),
4040
kex: node['ssh-hardening']['ssh']['client']['kex'] || DevSec::Ssh.get_client_kexs(node['ssh-hardening']['ssh']['client']['weak_kex']),
41-
cipher: node['ssh-hardening']['ssh']['client']['cipher'] || DevSec::Ssh.get_client_ciphers(node['ssh-hardening']['ssh']['client']['cbc_required']),
42-
roaming: node['ssh-hardening']['ssh']['client']['roaming']
41+
cipher: node['ssh-hardening']['ssh']['client']['cipher'] || DevSec::Ssh.get_client_ciphers(node['ssh-hardening']['ssh']['client']['cbc_required'])
4342
)
4443
end

recipes/server.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,7 @@
6969
mac: node['ssh-hardening']['ssh']['server']['mac'] || DevSec::Ssh.get_server_macs(node['ssh-hardening']['ssh']['server']['weak_hmac']),
7070
kex: node['ssh-hardening']['ssh']['server']['kex'] || DevSec::Ssh.get_server_kexs(node['ssh-hardening']['ssh']['server']['weak_kex']),
7171
cipher: node['ssh-hardening']['ssh']['server']['cipher'] || DevSec::Ssh.get_server_ciphers(node['ssh-hardening']['ssh']['server']['cbc_required']),
72-
use_priv_sep: node['ssh-hardening']['ssh']['use_privilege_separation'] || DevSec::Ssh.get_server_privilege_separarion,
73-
deny_users: node['ssh-hardening']['ssh']['deny_users'],
74-
allow_users: node['ssh-hardening']['ssh']['allow_users'],
75-
deny_groups: node['ssh-hardening']['ssh']['deny_groups'],
76-
allow_groups: node['ssh-hardening']['ssh']['allow_groups']
72+
use_priv_sep: node['ssh-hardening']['ssh']['use_privilege_separation'] || DevSec::Ssh.get_server_privilege_separarion
7773
)
7874
notifies :restart, 'service[sshd]'
7975
end

templates/default/openssh.conf.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@ Compression yes
111111
#VisualHostKey yes
112112

113113
# http://undeadly.org/cgi?action=article&sid=20160114142733
114-
UseRoaming <%= @roaming ? 'yes' : 'no' %>
114+
UseRoaming <%= @node['ssh-hardening']['ssh']['client']['roaming'] ? 'yes' : 'no' %>

0 commit comments

Comments
 (0)