pushyd 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f089c97e7a6a3ef7b973c85d0ed46441095cd65
-  data.tar.gz: d663be735567c62e089e4037969bff5dc303c502
+  metadata.gz: de49b896a3b942b2babca81aa547804008fe7e39
+  data.tar.gz: b31568f729c9bf37c5b423f578c94a68ffaef429
 SHA512:
-  metadata.gz: b9bebfd5975a91d43c6bc0bd8cf8f1d3382571712483d7d75abe87ea1da1fb6e9c97f4fb43a111f6b31ced941f26406be20f5f94e918a97ee4f96e9e5cec51e1
-  data.tar.gz: 7e16e42759376aa51ef81fb3df3910dc35726d9241761446e1e16e83a91ec8b0c14c4e09d43ec8666d1335b718891633c6834d61063fdec28d0b033344fecc2e
+  metadata.gz: 73bafb1821c8c3d52f59c5202f24ee18c367c472eb2b80c082e5b81a5b7f2fa1b7568a882b46c1b4d9558b013cb99de8090dc2a30a054f57e685a08454148a77
+  data.tar.gz: bcd83b4f5351c6eee60798bf37fcf2d85f5c9ada8a7d0bcce64907aa32cf8ec347140f2e8cc2de56f3f055685eedd354e6c4b17c726bf2a0911514b92934f304

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    pushyd (0.6.0)
+    pushyd (0.7.0)
+      api-auth
       bunny (~> 2.3)
       chamber (~> 2.9)
       daemons
@@ -15,6 +16,7 @@ GEM
   specs:
     addressable (2.4.0)
     amq-protocol (2.0.1)
+    api-auth (2.0.0)
     ast (2.3.0)
     bunny (2.4.0)
       amq-protocol (>= 2.0.1)
@@ -38,7 +40,7 @@ GEM
     json (1.8.3)
     mime-types (2.99.2)
     netrc (0.11.0)
-    newrelic_rpm (3.15.2.317)
+    newrelic_rpm (3.16.0.318)
     parser (2.3.1.2)
       ast (~> 2.2)
     powerpack (0.1.1)

data/bin/pushyd

@@ -23,13 +23,14 @@ begin
   Conf.app_env = "production"
 
   # Parse options and check compliance
-  OptionParser.new do |opts|
+  parser = OptionParser.new do |opts|
     opts.banner = "Usage: #{File.basename $PROGRAM_NAME} [options] start|stop"
     opts.on("-l", "--log LOGFILE")           { |path| cmd_logfile = File.expand_path(path)}
     opts.on("-c", "--config CONFIGFILE")     { |path| cmd_config = File.expand_path(path)}
     opts.on("-e", "--environment ENV")       { |env| Conf.app_env = env }
     opts.on("",   "--dev")                   { Conf.app_env = "development" }
-  end.order!(ARGV)
+  end
+  parser.order!(ARGV)
 
   # Load Chamber-based configuration
   Conf.prepare config: cmd_config, logfile: cmd_logfile
@@ -53,17 +54,20 @@ puts "Environment     \t #{Conf.app_env}"
 puts "Config files    \t #{Conf.files}"
 puts "Started at      \t #{Conf.app_started}"
 puts "Loging to file  \t #{Conf[:log][:file]}" if Conf[:log].is_a? Enumerable
-puts "Process name    \t #{Conf.gen_process_name}"
+puts "Process name    \t #{Conf.generate(:process_name)}"
 puts
 puts Conf.dump
 
 # Run daemon
 run_options = {
+monitor: false,
   ontop: false,
-  :backtrace  => true,
-  :multiple   => false
+  backtrace: true,
+  multiple: false,
+  dir_mode: :normal,
+  dir: '/tmp/'
   }
-Daemons.run_proc(Conf.gen_process_name, run_options) do
+Daemons.run_proc(Conf.generate(:process_name), run_options) do
   # Load code
   puts "--- load code"
   require_relative "../lib/pushyd"

data/lib/pushyd/proxy.rb

@@ -1,3 +1,4 @@
+require 'api_auth'
 require 'rest_client'
 require 'terminal-table'
 
@@ -47,7 +48,6 @@ module PushyDaemon
     def handle_message rule, delivery_info, metadata, payload
       # Prepare data
       rule_name = rule[:name]
-      rule_relay = rule[:relay]
       msg_exchange = delivery_info.exchange
       msg_rkey = delivery_info.routing_key.force_encoding('UTF-8')
       msg_headers = metadata.headers || {}
@@ -63,7 +63,7 @@ module PushyDaemon
         }
 
       # Build notification payload
-      post_body = {
+      propagate_data = {
         exchange: msg_exchange,
         route: msg_rkey,
         sent_at: msg_headers['sent_at'],
@@ -72,25 +72,63 @@ module PushyDaemon
         }
 
       # Propagate data if needed
-      propagate rule_relay, post_body if rule_relay
+      propagate rule, propagate_data
     end
 
-    def propagate relay_url, post_body
+    def propagate rule, data
       # Nothing more to do if no relay
-      return if relay_url.nil? || relay_url.empty?
+      return if rule[:relay].nil? || rule[:relay].empty?
 
-      # Generate a unique identifier
+      # Prepare stuff
+      relay_auth = rule[:auth].to_s
+      relay_uri = URI(rule[:relay])
+      relay_url = relay_uri.to_s
       id = identifier(6)
+      # log_info "propagate: user[#{relay_uri.user}] url[#{relay_url}]"
+
+      # Build POST body and log message
+      post_body = JSON.pretty_generate(data)
+      log_message WAY_PROP, id, relay_url, data
+
+      # Prepare request
+      request = RestClient::Request.new url: relay_url,
+        method: :post,
+        payload: post_body,
+        headers: {
+          content_type: :json,
+          accept: :json,
+          user_agent: Conf.generate(:user_agent),
+          }
+
+      # Accordong to auth type
+      # log_info "propagate: auth[#{relay_auth}] class[#{relay_auth.class}]"
+
+      if !rule["hmac-user"]
+        # log_info "propagate: normal"
+
+      elsif !rule["hmac-secret"]
+        log_error "propagate: hmac: missing secret"
+        return
+      else
+        log_info "propagate: hmac: signing request"
+        request = ApiAuth.sign!(request, rule["hmac-user"].to_s, rule["hmac-secret"].to_s)
+      end
 
-      # Log message details
-      log_message WAY_PROP, id, relay_url, post_body
-
-      # Push message to URL
-      response = RestClient.post relay_url.to_s, JSON.pretty_generate(post_body), :content_type => :json
-      log_info "#{id}: #{response.body}"
-
+      # Send request
+      log_info "propagate: url", request.headers
+      response = request.execute
+
+      # Handle exceptions
+      rescue RestClient::ExceptionWithResponse, URI::InvalidURIError => e
+        log_error "propagate: rest-client: #{e.message}"
+      rescue RestClient::InternalServerError => e
+        log_error "propagate: rest-client: #{e.message}"
+      rescue ApiAuth::ApiAuthError, ApiAuth::UnknownHTTPRequest => e
+        log_error "propagate: api-auth: #{e.message}"
+      rescue Errno::ECONNREFUSED => e
+        log_error "propagate: connection refused: #{e.message}"
       rescue StandardError => e
-        log_error "propagate: #{e.message}"
+        log_error "propagate: unknown: #{e.message}, #{e.inspect}", e.backtrace
     end
 
     def parse payload, content_type #, fields = []

data/lib/shared/conf.rb

@@ -10,6 +10,7 @@ module Shared
 
   class Conf
     extend Chamber
+    PIDFILE_DIR = "/tmp/"
 
     class << self
       attr_accessor :app_env
@@ -21,7 +22,6 @@ module Shared
       attr_reader   :app_spec
       attr_reader   :files
       attr_reader   :host
-
     end
 
     def self.init app_root
@@ -51,11 +51,12 @@ module Shared
       fail ConfigMissingParameter, "gemspec: missing version" unless @app_ver
 
       # Now we know app_name, initalize app_libs
-      @app_libs = File.expand_path( @app_root + "/lib/#{@app_name}/" )
+      @app_libs = File.expand_path("lib/#{@app_name}/", @app_root)
 
       # Add other config files
-      add_default_config
-      add_etc_config
+      #add_default_config
+      add_config generate(:config_defaults)
+      add_config generate(:config_etc)
 
       # Return something
       return @app_name
@@ -64,17 +65,20 @@ module Shared
     def self.prepare args = {}
       ensure_init
 
-      # Add extra config file
-      add_extra_config args[:config]
-
-      # Load configuration files
-      load_files
+      # Add extra config file and load them all
+      add_config args[:config]
+      reload!
 
       # Set Rack env
       ENV["RACK_ENV"] = @app_env.to_s
 
+      # Set up encodings
+      Encoding.default_internal = "utf-8"
+      Encoding.default_external = "utf-8"
+
       # Init New Relic
-      prepare_newrelic self[:newrelic], self.at(:logs, :newrelic)
+      newrelic_logfile = File.expand_path(Conf[:logs][:newrelic], Conf[:logs][:path])
+      prepare_newrelic self[:newrelic], newrelic_logfile
 
       # Try to access any key to force parsing of the files
       self[:dummy]
@@ -104,57 +108,55 @@ module Shared
 
     def self.newrelic_enabled?
       ensure_init
-      !!self[:newrelic]
+      self[:newrelic] && self[:newrelic][:licence]
     end
 
     # Defaults generators
-    def self.gen_pidfile
+    def self.generate what
       ensure_init
-      "/tmp/#{@app_name}-#{@host}-#{Process.pid}.pid"
-    end
-    def self.gen_process_name
-      ensure_init
-      "#{@app_name}/#{@app_env}/#{Process.pid}"
-    end
-    def self.gen_config_etc
-      ensure_init
-      "/etc/#{@app_name}.yml"
-    end
-    def self.gen_config_sample
-      ensure_init
-      "#{@app_root}/#{@app_name}.sample.yml"
-    end
-    def self.gen_config_message
-      config_etc = gen_config_etc
-      config_sample = gen_config_sample
-      return "
-A default configuration is available here: #{config_sample}.
-You should copy it to the default location: #{config_etc}.
-sudo cp #{config_sample} #{config_etc}
-"
+      return case what
+
+      when :user_agent
+        "#{@app_name}/#{@app_ver}" if @app_name && @app_ver
+
+      when :config_defaults
+        "#{@app_root}/defaults.yml" if @app_root
+
+      when :config_etc
+        "/etc/#{@app_name}.yml" if @app_name
+
+      when :process_name
+        parts = [@app_name, @app_env]
+        parts << self[:port] if self[:port]
+        parts.join('-')
+
+      when :pidfile
+        process_name = self.generate(:process_name)
+        File.expand_path "#{process_name}.pid", PIDFILE_DIR
+
+      when :config_message
+        config_defaults = self.generate(:config_defaults)
+        config_etc = self.generate(:config_etc)
+
+        "A default configuration is available (#{config_defaults}) and can be copied to the default location (#{config_etc}): \n sudo cp #{config_defaults} #{config_etc}"
+
+      end
     end
 
+
   protected
 
     def self.load_files
       load files: @files, namespaces: { environment: @app_env }
     end
 
-    def self.add_default_config
-      @files << "#{@app_root}/defaults.yml" if @app_root
-    end
-
-    def self.add_etc_config
-      @files << File.expand_path("/etc/#{@app_name}.yml") if @app_name
-    end
-
-    def self.add_extra_config path
-      @files << File.expand_path(path) if path
+    def self.add_config path
+      @files << File.expand_path(path) if path && File.readable?(path)
     end
 
     def self.prepare_newrelic section, logfile
       # Disable NewRelic if no config present
-      unless section.is_a?(Hash) && section[:licence]
+      unless self.newrelic_enabled?
         ENV["NEWRELIC_AGENT_ENABLED"] = "false"
         return
       end

data/pushyd.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   # Project version
-  spec.version                      = "0.6.0"
+  spec.version                      = "0.7.0"
 
   # Project description
   spec.name                         = "pushyd"
@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency       "json"
   spec.add_runtime_dependency       "bunny", "~> 2.3"
   spec.add_runtime_dependency       "rest-client", "~> 1.8"
+  spec.add_runtime_dependency       "api-auth"
   spec.add_runtime_dependency       "terminal-table"
   spec.add_runtime_dependency       "newrelic_rpm"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushyd
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Bruno MEDICI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: api-auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement