Add tests for extra config options

Signed-off-by: Brian Dwyer <[email protected]>

Author: bdwyertech

attributes/default.rb

@@ -66,7 +66,7 @@
   client['send_env']      = ['LANG', 'LC_*', 'LANGUAGE']
 
   # extra client configuration options
-  client['extras'].tap    = {}
+  client['extras']        = {}
 end
 
 # sshd

spec/recipes/client_spec.rb

@@ -191,6 +191,33 @@
     end
   end
 
+  describe 'extra configuration values' do
+    context 'without custom extra config value' do
+      cached(:chef_run) do
+        ChefSpec::ServerRunner.new.converge(described_recipe)
+      end
+
+      it 'does not have any extra config options' do
+        expect(chef_run).to render_file('/etc/ssh/ssh_config')
+        expect(chef_run).not_to render_file('/etc/ssh/ssh_config').
+          with_content(/^# Extra Configuration Options/)
+      end
+    end
+
+    context 'with custom extra config value' do
+      cached(:chef_run) do
+        ChefSpec::ServerRunner.new do |node|
+          node.normal['ssh-hardening']['ssh']['client']['extras']['#ExtraConfig'] = 'Value'
+        end.converge(described_recipe)
+      end
+
+      it 'uses the extra config attributes' do
+        expect(chef_run).to render_file('/etc/ssh/ssh_config').with_content(/^# Extra Configuration Options/)
+        expect(chef_run).to render_file('/etc/ssh/ssh_config').with_content(/^#ExtraConfig Value/)
+      end
+    end
+  end
+
   context 'chef-solo' do
     cached(:chef_run) do
       ChefSpec::SoloRunner.new.converge(described_recipe)

spec/recipes/server_spec.rb

@@ -403,6 +403,33 @@
     end
   end
 
+  describe 'extra configuration values' do
+    context 'without custom extra config value' do
+      cached(:chef_run) do
+        ChefSpec::ServerRunner.new.converge(described_recipe)
+      end
+
+      it 'does not have any extra config options' do
+        expect(chef_run).to render_file('/etc/ssh/sshd_config')
+        expect(chef_run).not_to render_file('/etc/ssh/sshd_config').
+          with_content(/^# Extra Configuration Options/)
+      end
+    end
+
+    context 'with custom extra config value' do
+      cached(:chef_run) do
+        ChefSpec::ServerRunner.new do |node|
+          node.normal['ssh-hardening']['ssh']['server']['extras']['#ExtraConfig'] = 'Value'
+        end.converge(described_recipe)
+      end
+
+      it 'uses the extra config attributes' do
+        expect(chef_run).to render_file('/etc/ssh/sshd_config').with_content(/^# Extra Configuration Options/)
+        expect(chef_run).to render_file('/etc/ssh/sshd_config').with_content(/^#ExtraConfig Value/)
+      end
+    end
+  end
+
   it 'disables the challenge response authentication' do
     expect(chef_run).to render_file('/etc/ssh/sshd_config').
       with_content(/ChallengeResponseAuthentication no/)

templates/default/openssh.conf.erb

@@ -118,9 +118,9 @@ UseRoaming <%= @node['ssh-hardening']['ssh']['client']['roaming'] ? 'yes' : 'no'
 SendEnv <%= @node['ssh-hardening']['ssh']['client']['send_env'].join(' ') %>
 <% end %>
 
-<%- unless Array(@node['ssh-hardening']['ssh']['client']['extras']).empty? %>
+<%- unless @node['ssh-hardening']['ssh']['client']['extras'].empty? %>
 # Extra Configuration Options
-  <%- Array(@node['ssh-hardening']['ssh']['client']['extras']).each do |key, value| %>
+  <%- @node['ssh-hardening']['ssh']['client']['extras'].each do |key, value| %>
 <%= key %> <%= value %>
   <% end -%>
 <% end -%>

templates/default/opensshd.conf.erb

@@ -230,9 +230,9 @@ X11Forwarding no
 #X11Forwarding no
 <% end %>
 
-<%- unless Array(@node['ssh-hardening']['ssh']['server']['extras']).empty? %>
+<%- unless @node['ssh-hardening']['ssh']['server']['extras'].empty? %>
 # Extra Configuration Options
-  <%- Array(@node['ssh-hardening']['ssh']['server']['extras']).each do |key, value| %>
+  <%- @node['ssh-hardening']['ssh']['server']['extras'].each do |key, value| %>
 <%= key %> <%= value %>
   <% end -%>
 <% end -%>