Yuvipanda has submitted this change and it was merged.

Change subject: ssh: Allow temporary opt out from more secure ssh
......................................................................


ssh: Allow temporary opt out from more secure ssh

Complaints on IRC and in person about people unable to ssh to
labs, even on not-so-out-of-date OSes (Debian Squeeze). This allows
labs projects to opt out of the more secure ssh defaults temporarily
while announcements and user education is made.

Change-Id: Ib9f3c3ab8e69a6d5aeeb73bfc4c5d7578e6f0703
---
M modules/ssh/manifests/server.pp
M modules/ssh/templates/sshd_config.erb
2 files changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Yuvipanda: Looks good to me, approved
  Merlijn van Deen: Looks good to me, but someone else must approve
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/ssh/manifests/server.pp b/modules/ssh/manifests/server.pp
index 304558b..e6631ea 100644
--- a/modules/ssh/manifests/server.pp
+++ b/modules/ssh/manifests/server.pp
@@ -3,6 +3,8 @@
     $listen_address = undef,
     $permit_root = true,
     $authorized_keys_file = undef,
+    $disable_nist_kex = true, # Allow labs projects to temporarily opt out of 
nist kex disabling
+    $explicit_macs = true, # Allow labs projects to temporarily opt out of 
more secure MACs
 ) {
     package { 'openssh-server':
         ensure => latest;
diff --git a/modules/ssh/templates/sshd_config.erb 
b/modules/ssh/templates/sshd_config.erb
index 1927b01..36b50ac 100644
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -20,11 +20,13 @@
 #Privilege Separation is turned on for security
 UsePrivilegeSeparation yes
 
+<%- if @disable_nist_kex -%>
 <% if scope.function_os_version(['debian >= jessie || ubuntu >= trusty']) %>
 KexAlgorithms [email protected],diffie-hellman-group-exchange-sha256
 <% elsif scope.function_os_version(['ubuntu == precise'])%>
 KexAlgorithms diffie-hellman-group-exchange-sha256
 <% end %>
+<%- end -%>
 
 # Lifetime and size of ephemeral version 1 server key
 KeyRegenerationInterval 3600
@@ -42,12 +44,14 @@
 PermitRootLogin no
 <% end %>
 
+<%- if @explicit_macs -%>
 # Message Authentication codes
 <% if scope.function_os_version(['debian >= jessie || ubuntu >= trusty']) %>
 MACs 
[email protected],[email protected],[email protected],hmac-sha2-512,hmac-sha2-256,[email protected]
 <% elsif scope.function_os_version(['ubuntu == precise'])%>
 MACs hmac-sha2-512,hmac-sha2-256
 <% end %>
+<%- end -%>
 
 StrictModes yes
 

-- 
To view, visit https://gerrit.wikimedia.org/r/212909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9f3c3ab8e69a6d5aeeb73bfc4c5d7578e6f0703
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to