chef-vault 1.1.0 → 1.2.0

data/README.rdoc

@@ -7,6 +7,8 @@ Gem that allows you to encrypt passwords & certificates using the public key of
 a list of chef nodes.  This allows only those chef nodes to decrypt the 
 password or certificate.
 
+This is supported on both Chef 10 and Chef 11 API.
+
 = INSTALLATION:
 
 Be sure you are running the latest version Chef. Versions earlier than 0.10.0

data/lib/chef-vault/version.rb

@@ -1,4 +1,4 @@
 class ChefVault
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

data/lib/chef/knife/EncryptCert.rb

@@ -81,9 +81,7 @@ class EncryptCert < Chef::Knife
           puts("INFO: Skipping #{client} as it is already in the data bag...")
         else
           puts("INFO: Adding #{client} to public_key array...")
-          cert_der = api.get("clients/#{client}")['certificate']
-          cert = OpenSSL::X509::Certificate.new cert_der
-          keyfob[client]=OpenSSL::PKey::RSA.new cert.public_key
+          keyfob[client] = get_client_public_key(client)
         end
       rescue Exception => node_error
         puts("WARNING: Caught exception: #{node_error.message} while processing #{client}, so skipping...")

data/lib/chef/knife/EncryptPassword.rb

@@ -79,9 +79,7 @@ class EncryptPassword < Chef::Knife
           puts("INFO: Skipping #{client} as it is already in the data bag...")
         else
           puts("INFO: Adding #{client} to public_key array...")
-          cert_der = api.get("clients/#{client}")['certificate']
-          cert = OpenSSL::X509::Certificate.new cert_der
-          keyfob[client]=OpenSSL::PKey::RSA.new cert.public_key
+          keyfob[client] = get_client_public_key(client)
         end
       rescue Exception => node_error
         puts("WARNING: Caught exception: #{node_error.message} while processing #{client}, so skipping...")

data/lib/chef/knife/compat.rb

@@ -12,5 +12,28 @@ module ChefVault
         Shef::Extensions.extend_context_object(obj)
       end
     end
+
+    def get_client_public_key(client)
+      client = api.get("clients/#{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']
+        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
+      end
+      
+      public_key = OpenSSL::PKey::RSA.new client.public_key
+      
+      public_key
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-vault
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef