chef_handler_foreman 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21fab85d6ff9110b08cc8e2ee0282c3a3115bee1
-  data.tar.gz: c0e49b5679ef653d329936ac1e5d5084221af978
+  metadata.gz: 718d58d3a2f128912963d25ec640369276fbd9a8
+  data.tar.gz: 155ec66bf4d85295070a69496949ea289e749b40
 SHA512:
-  metadata.gz: 9cdb697d5e51963f999af809a768d3552b2efabd92ce39b4527ac05ffdb174541cc09693fbf64e3ae24b095826413024f0f1296df5038d9449a0b67618ddeba1
-  data.tar.gz: 999b4f8cd62099bf400e4274e34f7dc2a6ea79324ded6d072ce1dcc17f22bdd9b9c1fecbd45d53daa94ce7541e27961deeee2e28fb7f79b987c66b8dcda3a963
+  metadata.gz: ade834538128c1ad4870625081303065a799797f1a89f4edab89ac228b7f17f4209cf294673ff85cbae0130551b94e4cd2d4d7561060cf2b64c56e19928e841a
+  data.tar.gz: cf43b3658e2fcb037f2dcaa519e63660133328f9d52c1bbb3bd462d0ed77d039d893b46465c5ccd97a6097f3dd9dd3810b2a0d32d9b6da23312a4b1c4a5924dc

data/lib/chef_handler_foreman/foreman_hooks.rb

@@ -10,6 +10,7 @@ require "#{File.dirname(__FILE__)}/foreman_uploader"
 
 module ChefHandlerForeman
   module ForemanHooks
+    attr_reader :foreman_uploader, :foreman_facts_handler, :foreman_report_handler, :foreman_reporter
 
     # Provide a chef-client cookbook friendly option
     def foreman_server_url(url)

data/lib/chef_handler_foreman/foreman_resource_reporter.rb

@@ -109,16 +109,7 @@ module ChefHandlerForeman
     end
 
     def resources_per_status
-      if @why_run
-        {
-          "applied"         => @total_updated,
-          "restarted"       => @total_restarted,
-          "failed"          => @total_failed,
-          "failed_restarts" => @total_failed_restart,
-          "skipped"         => @total_skipped,
-          "pending"         => 0
-        }
-      else
+      if Chef::Config.why_run
         {
           "applied"         => 0,
           "restarted"       => 0,
@@ -127,6 +118,15 @@ module ChefHandlerForeman
           "skipped"         => @total_skipped,
           "pending"         => @total_updated + @total_restarted + @total_failed + @total_failed_restart
         }
+      else
+        {
+          "applied"         => @total_updated,
+          "restarted"       => @total_restarted,
+          "failed"          => @total_failed,
+          "failed_restarts" => @total_failed_restart,
+          "skipped"         => @total_skipped,
+          "pending"         => 0
+        }
       end
     end
 

data/lib/chef_handler_foreman/foreman_uploader.rb

@@ -26,7 +26,7 @@ module ChefHandlerForeman
       @options = opts
     end
 
-    def foreman_request(path, body, client_name)
+    def foreman_request(path, body, client_name, method = 'post')
       uri              = URI.parse(options[:url])
       http             = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl     = uri.scheme == 'https'
@@ -44,21 +44,39 @@ module ChefHandlerForeman
         end
       end
 
-      req = Net::HTTP::Post.new("#{uri.path}/#{path}")
+      req = build_request(method, uri, path)
       req.add_field('Accept', 'application/json,version=2')
-      req.content_type = 'application/json'
-      body_json        = body.to_json
-      req.body         = body_json
-      req.add_field('X-Foreman-Signature', sign_request(body_json, options[:client_key]))
       req.add_field('X-Foreman-Client', client_name)
-      response         = http.request(req)
+      req.body = body.to_json
+      req.content_type = 'application/json'
+      # signature can be computed once we set body and X-Foreman-Client
+      req.add_field('X-Foreman-Signature', signature(req))
+      response = http.request(req)
+    end
+
+    def build_request(method, uri, path)
+      Net::HTTP.const_get(method.capitalize).new("#{uri.path}/#{path}")
+    rescue NameError => e
+      raise "unsupported method #{method}, try one of get, post, delete, put"
     end
 
-    def sign_request(body_json, key_path)
-      hash_body = Digest::SHA256.hexdigest(body_json)
-      key = OpenSSL::PKey::RSA.new(File.read(key_path))
+    def signature(request)
+      case request
+        when Net::HTTP::Post, Net::HTTP::Patch, Net::HTTP::Put
+          sign_data(request.body)
+        when Net::HTTP::Get, Net::HTTP::Delete
+          sign_data(request['X-Foreman-Client'])
+        else
+          raise "Don't know how to sign #{req.class} requests"
+      end
+    end
+
+    def sign_data(data)
+      hash_to_sign = Digest::SHA256.hexdigest(data)
+      key = OpenSSL::PKey::RSA.new(File.read(options[:client_key]))
       # Base64.encode64 is adding \n in the string
-      signature = Base64.encode64(key.sign(OpenSSL::Digest::SHA256.new, hash_body)).gsub("\n",'')
+      signature = Base64.encode64(key.sign(OpenSSL::Digest::SHA256.new, hash_to_sign)).gsub("\n",'')
     end
   end
 end
+

data/lib/chef_handler_foreman/version.rb

@@ -1,3 +1,3 @@
 module ChefHandlerForeman
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_handler_foreman
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-01 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler