smart_proxy_chef 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f52bafb874c675e729ede6b64f05a61d30522d50
-  data.tar.gz: 3ea968011835b0bb98e1406ab814c560a5ca3067
+  metadata.gz: 7d2d28589334b1dd4348fdb64179ee703847ff63
+  data.tar.gz: 887c69f465dbf1b6da515f0c9fafcc881077e3a7
 SHA512:
-  metadata.gz: 2e3f9c348e46e3e5d02f48a05a7a6747c03a8adbcb65b54faa7179e882329e08964c74e5d5f97be2e7ce27b48445ab64ab84b6d7dbd7fbd3c3e0cca3ab1ebc76
-  data.tar.gz: 021689d60f75eb6102ffd0ee48d170d091d35882ede4062f8c366f1e5181a9e309e0e959478f10933d0487ddd6dc496e53ec90ae3831fd271e9bf212104f58d2
+  metadata.gz: b04a508b2a54db80f5b5e6106636cb444495d90a74235e16f784ac07cff0626bbe87d1516aa0c5847d3c560975d1f472109d30d3566a695a6be2897b13782832
+  data.tar.gz: 9d6b04059fb1bd4eb3be73fcc9f92008c951c97f2742a656d5c7f7717ce06c3ca723af0ca2668575b04c847aa5d7bf9496f92efe1e480ab89586289db33fbec5

data/lib/smart_proxy_chef_plugin/authentication.rb

@@ -1,29 +1,28 @@
 module ChefPlugin
   class Authentication
-    require 'chef'
+    require 'smart_proxy_chef_plugin/resources/client'
     require 'digest/sha2'
     require 'base64'
     require 'openssl'
 
     def verify_signature_request(client_name,signature,body)
-      #We need to retrieve node public key
+      #We need to retrieve client public key
       #to verify signature
-      chefurl = ChefPlugin::Plugin.settings.chef_server_url
-      chef_smartproxy_clientname = ChefPlugin::Plugin.settings.chef_smartproxy_clientname
-      key = ChefPlugin::Plugin.settings.chef_smartproxy_privatekey
-      rest = ::Chef::REST.new(chefurl,chef_smartproxy_clientname,key)
       begin
-        public_key = OpenSSL::PKey::RSA.new(rest.get_rest("/clients/#{client_name}").public_key)
+        client = Resources::Client.new.show(client_name)
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
         Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
         Errno::ECONNREFUSED, OpenSSL::SSL::SSLError => e
-        raise Proxy::Error::Unauthorized, "Failed to authenticate node : "+e.message
+        raise Proxy::Error::Unauthorized, "Failed to authenticate node: "+e.message
       end
 
+      raise Proxy::Error::Unauthorized, "Could not find client with name #{client_name}" if client.nil?
+      public_key = OpenSSL::PKey::RSA.new(client.public_key)
+
       #signature is base64 encoded
       decoded_signature = Base64.decode64(signature)
       hash_body = Digest::SHA256.hexdigest(body)
-      public_key.verify(OpenSSL::Digest::SHA256.new,decoded_signature,hash_body)
+      public_key.verify(OpenSSL::Digest::SHA256.new, decoded_signature, hash_body)
     end
 
     def authenticated(request, &block)
@@ -35,7 +34,7 @@ module ChefPlugin
         signature   = request.env['HTTP_X_FOREMAN_SIGNATURE']
 
         raise Proxy::Error::Unauthorized, "Failed to authenticate node #{client_name}. Missing some headers" if client_name.nil? or signature.nil?
-        auth = verify_signature_request(client_name,signature,content)
+        auth = verify_signature_request(client_name, signature, content)
       end
 
       if auth

data/lib/smart_proxy_chef_plugin/chef_api.rb

@@ -3,6 +3,8 @@ require 'smart_proxy_chef_plugin/resources/client'
 
 module ChefPlugin
   class ChefApi < ::Sinatra::Base
+    helpers ::Proxy::Helpers
+
     get "/nodes/:fqdn" do
       logger.debug "Showing node #{params[:fqdn]}"
 

data/lib/smart_proxy_chef_plugin/version.rb

@@ -1,3 +1,3 @@
 module ChefPlugin
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_chef
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,20 +108,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10'
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 11.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 11.6.2
 - !ruby/object:Gem::Dependency
   name: chef-api
   requirement: !ruby/object:Gem::Requirement