From 6c34c73f7e4c5203321547b699c6eaba9de8e2fe Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 27 Jun 2013 10:52:54 +0200
Subject: switch to own define for managing ssh keys

The problem with puppet's built-in ssh_authorized_key is that you can
purge unmanaged keys in a authorized_keys file. see
https://leap.se/code/issues/3010 for details.

Conflicts:
	puppet/modules/site_sshd/manifests/authorized_keys.pp

Change-Id: I640bf7ebc0f0f7fb19cc46feb4cb2702d6561a9b
---
 .../modules/site_sshd/manifests/authorized_keys.pp | 23 +++++++++++++++++-----
 .../site_sshd/manifests/authorized_keys/key.pp     |  8 --------
 .../site_sshd/manifests/deploy_authorized_keys.pp  |  9 +++++++++
 puppet/modules/site_sshd/manifests/init.pp         |  2 +-
 .../site_sshd/templates/authorized_keys.erb        |  6 ++++++
 5 files changed, 34 insertions(+), 14 deletions(-)
 delete mode 100644 puppet/modules/site_sshd/manifests/authorized_keys/key.pp
 create mode 100644 puppet/modules/site_sshd/manifests/deploy_authorized_keys.pp
 create mode 100644 puppet/modules/site_sshd/templates/authorized_keys.erb

(limited to 'puppet/modules/site_sshd')

diff --git a/puppet/modules/site_sshd/manifests/authorized_keys.pp b/puppet/modules/site_sshd/manifests/authorized_keys.pp
index 8e0c15ac..c18f691c 100644
--- a/puppet/modules/site_sshd/manifests/authorized_keys.pp
+++ b/puppet/modules/site_sshd/manifests/authorized_keys.pp
@@ -1,6 +1,19 @@
-class site_sshd::authorized_keys ( $keys = $site_sshd::authorized_keys ) {
-  tag 'leap_authorized_keys'
-
-  create_resources(site_sshd::authorized_keys::key, $keys)
-
+define site_sshd::authorized_keys ($keys, $ensure = 'present', $home = '') {
+  # This line allows default homedir based on $title variable.
+  # If $home is empty, the default is used.
+  $homedir = $home ? {'' => "/home/${title}", default => $home}
+  file {
+    "${homedir}/.ssh":
+      ensure  => 'directory',
+      owner   => $title,
+      group   => $title,
+      mode    => '0700';
+    "${homedir}/.ssh/authorized_keys":
+      ensure  => $ensure,
+      owner   => $ensure ? {'present' => $title, default => undef },
+      group   => $ensure ? {'present' => $title, default => undef },
+      mode    => '0600',
+      require => File["${homedir}/.ssh"],
+      content => template('site_sshd/authorized_keys.erb');
+  }
 }
diff --git a/puppet/modules/site_sshd/manifests/authorized_keys/key.pp b/puppet/modules/site_sshd/manifests/authorized_keys/key.pp
deleted file mode 100644
index 56271cdc..00000000
--- a/puppet/modules/site_sshd/manifests/authorized_keys/key.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-define site_sshd::authorized_keys::key ($key, $type) {
-  ssh_authorized_key {
-    $name:
-      type  => $type,
-      user  => 'root',
-      key   => $key
-  }
-}
diff --git a/puppet/modules/site_sshd/manifests/deploy_authorized_keys.pp b/puppet/modules/site_sshd/manifests/deploy_authorized_keys.pp
new file mode 100644
index 00000000..97ca058f
--- /dev/null
+++ b/puppet/modules/site_sshd/manifests/deploy_authorized_keys.pp
@@ -0,0 +1,9 @@
+class site_sshd::deploy_authorized_keys ( $keys ) {
+  tag 'leap_authorized_keys'
+
+  site_sshd::authorized_keys {'root':
+    keys => $keys,
+    home => '/root'
+  }
+
+}
diff --git a/puppet/modules/site_sshd/manifests/init.pp b/puppet/modules/site_sshd/manifests/init.pp
index 905d5c9b..90dd2d0e 100644
--- a/puppet/modules/site_sshd/manifests/init.pp
+++ b/puppet/modules/site_sshd/manifests/init.pp
@@ -7,7 +7,7 @@ class site_sshd {
 
   $authorized_keys = $ssh['authorized_keys']
 
-  class { 'site_sshd::authorized_keys':
+  class { 'site_sshd::deploy_authorized_keys':
     keys => $authorized_keys
   }
 
diff --git a/puppet/modules/site_sshd/templates/authorized_keys.erb b/puppet/modules/site_sshd/templates/authorized_keys.erb
new file mode 100644
index 00000000..3c65e8ab
--- /dev/null
+++ b/puppet/modules/site_sshd/templates/authorized_keys.erb
@@ -0,0 +1,6 @@
+# NOTICE: This file is autogenerated by Puppet
+# all manually added keys will be overridden
+
+<% keys.sort.each do |user, hash| -%>
+<%=hash['type']-%> <%=hash['key']%> <%=user%> 
+<% end -%> 
-- 
cgit v1.2.3