chef-vault 1.2.4 → 1.2.5

data/Changelog.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## v1.2.5 / 2013-07-22
+* Update compat to be class ChefVault not module ChefVault to remove knife errors
+* Allow nodes/clients to be used as Admins
+
 ## v1.2.4 / 2013-07-01
 * Move compat include into the lazy-load deps
 * Modify open file commands in knife commands to avoid file locking on windows

data/lib/chef-vault/version.rb

@@ -14,6 +14,6 @@
 # limitations under the License.
 
 class ChefVault
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

data/lib/chef/knife/EncryptCert.rb

@@ -117,8 +117,7 @@ class EncryptCert < Chef::Knife
           puts("INFO: Skipping #{user} as it is already in the data bag")
         else
           puts("INFO: Adding #{user} to public_key array...")
-          public_key = api.get("users/#{user}")['public_key']
-          keyfob[user] = OpenSSL::PKey::RSA.new public_key
+          keyfob[user] = get_user_public_key(user)
         end
       rescue Exception => user_error
         puts("WARNING: Caught exception: #{user_error.message} while processing #{user}, so skipping...")

data/lib/chef/knife/EncryptPassword.rb

@@ -115,8 +115,7 @@ class EncryptPassword < Chef::Knife
           puts("INFO: Skipping #{user} as it is already in the data bag")
         else
           puts("INFO: Adding #{user} to public_key array...")
-          public_key = api.get("users/#{user}")['public_key']
-          keyfob[user] = OpenSSL::PKey::RSA.new public_key
+          keyfob[user] = get_user_public_key(user)
         end
       rescue Exception => user_error
         puts("WARNING: Caught exception: #{user_error.message} while processing #{user}, so skipping...")

data/lib/chef/knife/compat.rb

@@ -15,7 +15,7 @@
 
 # Make a wraper to chef10/11 "shef/shell" changes 
 
-module ChefVault
+class ChefVault
   module Compat
     require 'chef/version'
     def extend_context_object(obj)
@@ -29,21 +29,38 @@ module ChefVault
     end
 
     def get_client_public_key(client)
-      client = api.get("clients/#{client}")
+      get_public_key(api.get("clients/#{client}"))
+    end
 
+    def get_user_public_key(user)
+      begin
+        user = api.get("users/#{user}")
+      rescue Exception
+        puts("INFO: Could not locate user #{user}, searching for client key instead")
+        user = api.get("clients/#{user}")
+      end
+      get_public_key(user)
+    end
+
+    def get_public_key(client)
       # Check the response back from the api call to see if
       # we get 'certificate' which is Chef 10 or just 
       # 'public_key' which is Chef 11
       unless client.is_a?(Chef::ApiClient)
         name = client['name']
         certificate = client['certificate']
+        public_key = client['public_key']
+
         client = Chef::ApiClient.new
         client.name name
         client.admin false
 
-        cert_der = OpenSSL::X509::Certificate.new certificate
-        
-        client.public_key cert_der.public_key.to_s
+        if certificate
+          cert_der = OpenSSL::X509::Certificate.new certificate
+          client.public_key cert_der.public_key.to_s
+        else
+          client.public_key public_key
+        end
       end
       
       public_key = OpenSSL::PKey::RSA.new client.public_key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-vault
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef