pushyd 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba39e2325a7509e30286b4f11a82947c057cf292
-  data.tar.gz: da884f2520bc928813fe9f040d4f655ece0d0837
+  metadata.gz: fd36ea01bb992654b0c3a791e49baa77b0e66140
+  data.tar.gz: 1ee9dd52f747456503f799bd98cee05f5f90e66a
 SHA512:
-  metadata.gz: d1df640a0cf5b6a768f0af39d7e27f4ade48289f4a2ca3549e68744ebc3b05f7478d959d55b69aef56b7c8cda9fb80c3ef4b6d3bb796563c5d86150dc1027428
-  data.tar.gz: 01db0c676f7d2a5f6c7f4299a1f6a2551fdf65603b24b8c1f8e11daeb110e955b1c98cba91d1c8ac949cafa25810c85b5faea7ed33de6986bb462e1edd390739
+  metadata.gz: fcd38ca1879c702300a43ff3c64568bb738419111b8fe10f4b4307dea965853bfd382616b2384f7730f1409e10694813d5242f851ed8a24cbf2aa266b9c71f11
+  data.tar.gz: e0924559663f6d9accde4e22cf7f09c0fedcc801b9b55546651c6e235d042325fc87791700c0546e37ce3d1d4f08736c462cb6405663cc7a5b938c6e44693a43

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushyd (0.21.0)
+    pushyd (0.22.0)
       api-auth
       bmc-daemon-lib (~> 0.4.3)
       bunny (~> 2.3)
@@ -36,7 +36,7 @@ GEM
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
       http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.2)
+    http-cookie (1.0.3)
       domain_name (~> 0.5)
     http-form_data (1.0.1)
     http_parser.rb (0.6.0)
@@ -44,7 +44,7 @@ GEM
     mime-types (2.99.3)
     multi_json (1.12.1)
     netrc (0.11.0)
-    newrelic_rpm (3.16.2.321)
+    newrelic_rpm (3.16.3.323)
     parser (2.3.1.4)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -54,13 +54,13 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rollbar (2.13.1)
+    rollbar (2.13.3)
       multi_json
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.3)
+    rspec-core (3.5.4)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)

data/bin/pushyd

@@ -83,5 +83,12 @@ Daemons.run_proc(Conf.generate(:process_name), run_options) do
 
   # Start daemon
   Conf.log :launcher, "start daemon"
-  PushyDaemon::Daemon.run
+
+  # Start the proxy
+  PushyDaemon::Proxy.new
+
+  # Backup infinite loop in case shout does nothing
+  loop do
+    sleep 1
+  end
 end

data/lib/pushyd/constants.rb

@@ -6,7 +6,7 @@ MSG_RLAY                = "RLAY"
 # Constants: AMQP protocol
 AMQP_HEARTBEAT_INTERVAL = 30
 AMQP_RECOVERY_INTERVAL  = 5
-AMQP_PREFETCH           = 3
+AMQP_PREFETCH           = 5
 AMQP_MANUAL_ACK         = false
 
 # Constants: shouter
@@ -17,9 +17,9 @@ LOGGER_FORMAT = {
   context: {
     caller: "%-17s",
     rule:   "%-20s",
-    }
-  # array:    "PA%s     %s",
-  # hash:     "PH%s     %-20s %s",
+    },
+  array:    "     - %s",
+  hash:     "     = %-20s %s",
   }
 
 

data/lib/pushyd/consumer.rb

@@ -65,7 +65,7 @@ module PushyDaemon
 
       # Check if we need to relay anything
       unless @rule[:relay]
-        log_debug "handle_relay: no [relay] URL"
+        # log_debug "handle_relay: no [relay] URL"
         return
       end
 
@@ -95,7 +95,7 @@ module PushyDaemon
 
       # Compute: payload MD5, HMAC signature
       headers_md5 headers, request_body
-      headers_sign headers, @rule[:sign], [:date]
+      headers_sign headers, @rule[:sign]
 
       # Build final request
       request = RestClient::Request.new url: relay_url,
@@ -109,7 +109,7 @@ module PushyDaemon
 
       # Handle exceptions
       rescue RestClient::ExceptionWithResponse, URI::InvalidURIError, RestClient::InternalServerError => e
-        log_error "#{request_prefix} rest-client exception: #{e.message}"
+        log_error "#{request_prefix} rest-client: #{e.message}"
       rescue ApiAuth::ApiAuthError, ApiAuth::UnknownHTTPRequest => e
         log_error "#{request_prefix} api-auth: #{e.message}"
       rescue Errno::ECONNREFUSED => e

data/lib/pushyd/proxy.rb

@@ -37,9 +37,14 @@ module PushyDaemon
       # Send config table to logs
       log_info "Proxy initialized", @table.to_s.lines
 
+      rescue BmcDaemonLib::MqConsumerException, EndpointConnectionError, ShouterInterrupted, Errno::EACCES => e
+        log_error "Proxy: #{e.message}"
+        abort "EXITING #{e.class}: #{e.message}"
+
       rescue StandardError => e
-        puts "Proxy.initialize: exception: #{e.inspect}"
-        log_error "Proxy.initialize: exception: #{e.inspect}"
+        log_error "Proxy: #{e.message}", e.backtrace
+        abort "EXITING #{e.class}: #{e.message} \n #{e.backtrace.to_yaml}"
+
         raise MqConsumerException, e.message
 
     end

data/lib/pushyd.rb

@@ -15,7 +15,6 @@ require_relative "pushyd/constants"
 require_relative "pushyd/proxy"
 require_relative "pushyd/consumer"
 require_relative "pushyd/shouter"
-require_relative "pushyd/daemon"
 
 # Init
 require_relative "pushyd/initialize"

data/lib/shared/hmac_signature.rb

@@ -4,95 +4,89 @@ require 'base64'
 module Shared
   module HmacSignature
 
-    def headers_sign headers, config, names = ['date']
+    def headers_md5 headers, payload
+      headers['Content-MD5'] = Digest::MD5.hexdigest(payload.to_s)
+    end
+
+    def headers_sign headers, config
       # Extract and check
       return unless config.is_a? Hash
-      hmac_method = config[:method]
-      hmac_user   = config[:user]
-      hmac_secret = config[:secret]
-      #log_debug "headers_sign config", config
+      hmac_method   = config[:method]
+      hmac_user     = config[:user]
+      hmac_secret   = config[:secret]
+      log_debug "headers_sign config", config
 
       # Check params
-      unless config[:method] && config[:user] && config[:secret]
+      unless hmac_method && hmac_user && hmac_secret
         log_error "headers_sign: missing method/user/secret"
         return
       end
 
-      # Check params
-      unless config[:method] == 'hmac-kong'
-        log_error "headers_sign: only [hmac-kong] method is supported"
+      # Check headers, and translate names to strings
+      unless config[:headers].is_a? Array
+        log_error "headers_sign: [headers] should be an array of headers to be signed"
         return
       end
+      hmac_headers = config[:headers].map(&:to_s)
 
-      # OK, lets go
-      hmac_sign_kong headers, config[:user], config[:secret], names
-      # log_info "headers_sign: after signing", headers
-    end
+      # Update date
+      headers['Date'] = Time.now.utc.strftime('%a, %d %b %Y %H:%M:%S GMT')
 
-    def headers_md5 headers, payload
-      headers['Content-MD5'] = Digest::MD5.hexdigest(payload.to_s)
+      # Let's apply the requested method
+      case hmac_method
+      when 'hmac-kong'
+        hmac_sign_kong headers, hmac_user, hmac_secret, hmac_headers
+      else
+        log_error "headers_sign: only [hmac-kong] method is supported"
+        return
+      end
     end
 
   private
 
-    def hmac_sign_kong headers, client_id, client_secret, names
-      # Update date
-      headers['Date'] = Time.now.strftime('%a, %d %b %Y %H:%M:%S GMT')
-      # headers['Content-MD5'] = Date.now.strftime('%a, %d %b %Y %H:%M:%S GMT')
-      # log_debug "hmac_sign_kong: headers", headers
-
-      # Filter headers we're going to hash
-      myheaders = hmac_headers_filter headers, names
+    def hmac_sign_kong headers, client_id, client_secret, selection
+      # Ensure we have :date in headers and no dup
+      selected = selection.push("date").uniq
 
       # Signe string of headers
-      signature = hmac_headers_hash myheaders, client_secret
-      log_debug "hmac_sign_kong signed [#{signature}] from headers #{myheaders.keys.inspect}"
+      signature = hmac_headers_hash headers, selected, client_secret
+      log_debug "hmac_sign_kong: signed [#{signature}] from #{selected.inspect}"
 
       # Add auth header
-      headers['Authorization'] = hmac_build_header(client_id, myheaders, signature)
+      headers['Authorization'] = hmac_build_header(client_id, selection, signature)
       #headers['test'] = "testing123"
 
       # That's OK
       return headers
     end
 
-    def hmac_build_header client_id, myheaders, signature
+    def hmac_build_header client_id, selection, signature
       sprintf 'hmac username="%s", algorithm="hmac-sha1", headers="%s", signature="%s"',
         client_id,
-        myheaders.keys.map(&:downcase).join(' '),
+        selection.map(&:downcase).join(' '),
         signature
     end
 
-    def hmac_headers_filter headers, selection
-      out = {}
+    def hmac_headers_hash headers, selection, client_secret
+      # Init
+      selected = []
 
-      # Build array of keys as strings, downcase
-      selection_names = selection.map{|h| h.to_s.downcase}
+      # For each selected header
+      selection.each do |sel|
+        this = sel.downcase
 
-      # For each header, stack it or not
-      headers.each do |name, value|
-        name_down = name.downcase
-        next unless selection_names.include? name_down
-        out[name_down] = value
+        # For each header, stack it or not
+        headers.each do |header_name, header_value|
+          next unless this == header_name.downcase
+          selected << sprintf("%s: %s", this, header_value)
+        end
       end
 
-      # We're done
-      return out
-    end
-
-    def hmac_headers_hash myheaders, client_secret
-      # Build headers string
-      data = myheaders.map do |name, value|
-        sprintf("%s: %s", name, value)
-      end.join("\n")
-
-      # Hash this
+      # Build headers string and hash it
+      data = selected.join("\n")
       digest  = OpenSSL::Digest.new('sha1')
       Base64.encode64(OpenSSL::HMAC.digest(digest, client_secret, data)).strip
     end
 
-    def hmac_sign_data client_secret, data
-    end
-
   end
 end

data/pushyd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.21.0"
+  spec.version                      = "0.22.0"
 
   # Project description
   spec.name                         = "pushyd"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -225,7 +225,6 @@ files:
 - lib/pushyd.rb
 - lib/pushyd/constants.rb
 - lib/pushyd/consumer.rb
-- lib/pushyd/daemon.rb
 - lib/pushyd/initialize.rb
 - lib/pushyd/proxy.rb
 - lib/pushyd/shouter.rb

data/lib/pushyd/daemon.rb

@@ -1,20 +0,0 @@
-module PushyDaemon
-  class Daemon
-
-    def self.run
-      # Create a new proxy, and dump its configuration
-      Proxy.new
-
-      # Backup infinite loop in case shout does nothing
-      loop do
-        sleep 1
-      end
-
-    rescue BmcDaemonLib::MqConsumerException, EndpointConnectionError, ShouterInterrupted => e
-      abort "EXITING #{e.class}: #{e.message}"
-    rescue Errno::EACCES, StandardError => e
-      abort "EXITING #{e.class}: #{e.message} \n #{e.backtrace.to_yaml}"
-    end
-
-  end
-end