loadrunner 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d485cc0bc26a01f141b992aaed25b970e290470c
-  data.tar.gz: a7b1bacff31b40b289b509c626ef07720146334c
+  metadata.gz: b8a007f7920f1973efc60d3795c4cd8dab52cb3d
+  data.tar.gz: 0baaf60bb349d17969597985c564bdb68daf1391
 SHA512:
-  metadata.gz: e5e7b9da7b9302209943c6c1a08acc43230210d9872fcd3d20817f3af9384076d3cc044c589199e13f52c9680c718b496aadf208e3a9599b112abbf96f0f526b
-  data.tar.gz: d726f209f0dc7d64c991fc01f546e48d12207b978aaf9bd75ab0676ef14f525938a37addb384dadb4ced30640f6fe186ae3dba81e5865acdd14cd22790105ec7
+  metadata.gz: dd2ddfff2c1dfa0522871c2a41c84e60b36934e56d5785e52172d5cc4bccb17c99cde8e58d78b580a4181448ba252b9b99a512ee803e694e390598f38536ef23
+  data.tar.gz: 714bea8499b8c53e358dfca0fe09e75cd97455b97729f49bd99f71d15f6e91b51562c60b0c31386ebdb5cd954325eaa2336a5b91de7bce28f8a820dabee645f1

data/lib/load_runner/client.rb

@@ -16,7 +16,7 @@ module LoadRunner
       send_payload event, payload
     end
 
-    def send_payload(event=:push, payload)
+    def send_payload(event, payload)
       @payload = payload.is_a?(String) ? payload : payload.to_json
       headers = headers event
       self.class.post "/payload", body: @payload, headers: headers

data/lib/load_runner/command_line.rb

@@ -35,7 +35,7 @@ module LoadRunner
       client = Client.new client_opts
       response = client.send args['EVENT'], payload_opts
 
-      puts "Reesponse code: #{response.code}"
+      puts "Reesponse code: #{response.code}" if response.respond_to? :code
       ap response
     end
 

data/lib/load_runner/runner.rb

@@ -25,6 +25,14 @@ module LoadRunner
       end
     end
 
+    def handlers_dir
+      @handlers_dir ||= 'handlers'
+    end
+
+    def handlers_dir=(path)
+      @handlers_dir = path
+    end
+
     private
 
     def locate_handlers
@@ -53,12 +61,12 @@ module LoadRunner
     end
 
     def matching_handlers
-      base = "handlers/#{opts[:repo]}"
-      handlers = ["#{base}/#{opts[:event]}"]
+      base = "#{handlers_dir}/#{opts[:repo]}/#{opts[:event]}"
+      handlers = ["#{base}"]
 
       handlers.tap do |h|
-        h << "#{base}/#{opts[:event]}@branch=#{opts[:branch]}" if opts[:branch]
-        h << "#{base}/#{opts[:event]}@tag=#{opts[:tag]}" if opts[:tag]
+        h << "#{base}@branch=#{opts[:branch]}" if opts[:branch]
+        h << "#{base}@tag=#{opts[:tag]}" if opts[:tag]
       end
     end
 

data/lib/load_runner/server.rb

@@ -4,16 +4,23 @@ module LoadRunner
   class Server < ServerBase
     include ServerHelper
 
+    get '/' do
+      "OK"
+    end
+
     post '/payload' do
       request.body.rewind
       payload_body = request.body.read
 
-      verify_signature payload_body
+      signature = request.env['HTTP_X_HUB_SIGNATURE']
+      state = verify_signature payload_body, signature
+      
+      halt 401, halt_messages[state] if state != :ok
 
       push = ActiveSupport::HashWithIndifferentAccess.new JSON.parse payload_body
 
       opts = {}
-      opts[:repo]   = push[:repository][:name]
+      opts[:repo]   = push.dig(:repository, :name)
       opts[:event]  = request.env['HTTP_X_GITHUB_EVENT']
       opts[:branch] = push[:ref].sub('refs/heads/', '') if push[:ref] =~ /refs\/heads/
       opts[:tag]    = push[:ref].sub('refs/tags/', '') if push[:ref] =~ /refs\/tags/

data/lib/load_runner/server_helper.rb

@@ -1,25 +1,29 @@
 module LoadRunner
   module ServerHelper
-    def verify_signature(payload_body)
-      request_signature = request.env['HTTP_X_HUB_SIGNATURE']
+    def verify_signature(payload_body, signature)
+      return :no_client if secret_token and !signature
+      return :no_server if !secret_token and signature
+      return :ok        if !secret_token and !signature
 
-      if secret_token and !request_signature
-        return halt 401, "Client did not send a signature"
-      end
-
-      if !secret_token and request_signature
-        return halt 401, "Server secret token is not configured"
-      end
+      expected_signature = generate_signature payload_body
+      signature_match = Rack::Utils.secure_compare(expected_signature, signature)
+      return signature_match ? :ok : :mismatch
+    end
 
-      if secret_token and request_signature
-        signature = 'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), secret_token, payload_body)
-        signature_match = Rack::Utils.secure_compare(signature, request.env['HTTP_X_HUB_SIGNATURE'])
-        return halt 401, "Signature mismatch" unless signature_match
-      end
+    def generate_signature(payload_body)
+      'sha1=' + OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), secret_token, payload_body)
     end
 
     def secret_token
       ENV['GITHUB_SECRET_TOKEN']
     end
+
+    def halt_messages
+      {
+        no_client: "Client did not send a signature",
+        no_server: "Server secret token is not configured",
+        mismatch: "Signature mismatch"
+      }
+    end
   end
 end

data/lib/load_runner/version.rb

@@ -1,3 +1,3 @@
 module LoadRunner
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loadrunner
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-13 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: Run your GitHub webhook server and Send simulated github events
 email: db@dannyben.com
 executables:
@@ -196,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="