loadrunner 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b9fd36357c745fed71eae60ca9b40ee65a4efa9
-  data.tar.gz: 6bae665acbdf5c16086c7c31f041f6a5e855c78b
+  metadata.gz: d485cc0bc26a01f141b992aaed25b970e290470c
+  data.tar.gz: a7b1bacff31b40b289b509c626ef07720146334c
 SHA512:
-  metadata.gz: baeaa1f2dee184b212ed6e9c0fff2437b05d2d5ed9c553708e383b06dfec022415e01eb7d90aebc131ce8eab26da683e9d6c2446ca2ee1e4619a30525ec40343
-  data.tar.gz: e99dc43867d5b07839a0e9a94d3e1330e74b803c1ba9a5afaed3d7493b50d4636a3b927651308697662f9777a6ba8938508f10c05f1510005128587477cc0292
+  metadata.gz: e5e7b9da7b9302209943c6c1a08acc43230210d9872fcd3d20817f3af9384076d3cc044c589199e13f52c9680c718b496aadf208e3a9599b112abbf96f0f526b
+  data.tar.gz: d726f209f0dc7d64c991fc01f546e48d12207b978aaf9bd75ab0676ef14f525938a37addb384dadb4ced30640f6fe186ae3dba81e5865acdd14cd22790105ec7

data/lib/load_runner/command_line.rb

@@ -1,5 +1,6 @@
 require 'singleton'
 require 'docopt'
+require 'awesome_print'
 
 module LoadRunner
 
@@ -33,7 +34,9 @@ module LoadRunner
     def send
       client = Client.new client_opts
       response = client.send args['EVENT'], payload_opts
-      puts response
+
+      puts "Reesponse code: #{response.code}"
+      ap response
     end
 
     def server
@@ -44,10 +47,13 @@ module LoadRunner
     def client_opts
       {
         base_url: args['URL'], 
-        secret_token: '123'
+        secret_token: ENV['GITHUB_SECRET_TOKEN']
       }
     end
 
+    # Convert command line arguments to a hash suitable for consumption
+    # by Client#send. In essence, we are simply converting the input REF
+    # argument, which can come in several forms, to a valid git ref.
     def payload_opts
       result = { repo: args['REPO'] }
 

data/lib/load_runner/runner.rb

@@ -57,8 +57,8 @@ module LoadRunner
       handlers = ["#{base}/#{opts[:event]}"]
 
       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}/#{opts[:event]}@branch=#{opts[:branch]}" if opts[:branch]
+        h << "#{base}/#{opts[:event]}@tag=#{opts[:tag]}" if opts[:tag]
       end
     end
 

data/lib/load_runner/server.rb

@@ -8,7 +8,7 @@ module LoadRunner
       request.body.rewind
       payload_body = request.body.read
 
-      verify_signature payload_body if secret_token
+      verify_signature payload_body
 
       push = ActiveSupport::HashWithIndifferentAccess.new JSON.parse payload_body
 

data/lib/load_runner/server_helper.rb

@@ -1,9 +1,21 @@
 module LoadRunner
   module ServerHelper
     def verify_signature(payload_body)
-      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, "Bad Signature" unless signature_match
+      request_signature = request.env['HTTP_X_HUB_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
+
+      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
     end
 
     def secret_token

data/lib/load_runner/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loadrunner
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-12 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: runfile
   requirement: !ruby/object:Gem::Requirement