right_hook 0.3.2 → 0.4.0

data/lib/right_hook/app.rb

@@ -11,19 +11,19 @@ module RightHook
       event_type = params[:event_type]
       content = request.body.read
 
-      halt 404 unless Event::KNOWN_TYPES.include?(event_type)
-      halt 501 unless respond_to?("on_#{event_type}")
+      halt 404, "Unknown event type" unless Event::KNOWN_TYPES.include?(event_type)
+      halt 501, "Event type not implemented" unless respond_to?("on_#{event_type}")
 
       require_valid_signature(content, owner, repo_name, event_type)
 
-      json = JSON.parse(content)
+      json = JSON.parse(params['payload'])
       case event_type
       when Event::PULL_REQUEST
         on_pull_request(owner, repo_name, json['number'], json['action'], json['pull_request'])
       when Event::ISSUE
         on_issue(owner, repo_name, json['action'], json['issue'])
       else
-        halt 500
+        halt 500, "Server bug"
       end
     end
 
@@ -34,7 +34,9 @@ module RightHook
 
       # http://pubsubhubbub.googlecode.com/git/pubsubhubbub-core-0.4.html#authednotify
       # "If the signature does not match, subscribers MUST still return a 2xx success response to acknowledge receipt, but locally ignore the message as invalid."
-      halt 202 unless request.env['X-Hub-Signature'] == "sha1=#{expected_signature}"
+      received_signature = request.env['HTTP_X_HUB_SIGNATURE']
+      calculated_signature = "sha1=#{expected_signature}"
+      halt 202, "Signature mismatch" unless received_signature == calculated_signature
     end
   end
 end

data/lib/right_hook/version.rb

@@ -1,3 +1,3 @@
 module RightHook
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/app/issue_spec.rb

@@ -31,7 +31,9 @@ describe RightHook::App do
     end
 
     it 'captures the interesting data' do
-      post '/hook/mark-rushakoff/right_hook/issue', ISSUE_JSON, generate_secret_header('issue', ISSUE_JSON)
+      post '/ignore', {payload: ISSUE_JSON}
+      body = last_request.body.read
+      post '/hook/mark-rushakoff/right_hook/issue', {payload: ISSUE_JSON}, generate_secret_header('issue', body)
       expect(last_response.status).to eq(200)
       expect(app.owner).to eq('mark-rushakoff')
       expect(app.repo_name).to eq('right_hook')
@@ -42,7 +44,7 @@ describe RightHook::App do
     end
 
     it 'fails when the secret is wrong' do
-      post '/hook/mark-rushakoff/right_hook/issue', ISSUE_JSON, generate_secret_header('wrong', ISSUE_JSON)
+      post '/hook/mark-rushakoff/right_hook/issue', {payload: ISSUE_JSON}, generate_secret_header('wrong', 'stuff')
       expect(last_response.status).to eq(202)
       expect(app.owner).to be_nil
     end

data/spec/app/pull_request_spec.rb

@@ -32,7 +32,9 @@ describe RightHook::App do
     end
 
     it 'captures the interesting data' do
-      post '/hook/mark-rushakoff/right_hook/pull_request', PULL_REQUEST_JSON, generate_secret_header('pull_request', PULL_REQUEST_JSON)
+      post '/ignore', {payload: PULL_REQUEST_JSON}
+      body = last_request.body.read
+      post '/hook/mark-rushakoff/right_hook/pull_request', {payload: PULL_REQUEST_JSON}, generate_secret_header('pull_request', body)
       expect(last_response.status).to eq(200)
       expect(app.owner).to eq('mark-rushakoff')
       expect(app.repo_name).to eq('right_hook')
@@ -44,7 +46,7 @@ describe RightHook::App do
     end
 
     it 'fails when the secret is wrong' do
-      post '/hook/mark-rushakoff/right_hook/pull_request', PULL_REQUEST_JSON, generate_secret_header('wrong', PULL_REQUEST_JSON)
+      post '/hook/mark-rushakoff/right_hook/pull_request', {payload: PULL_REQUEST_JSON}, generate_secret_header('wrong', 'stuff')
       expect(last_response.status).to eq(202)
       expect(app.owner).to be_nil
     end

data/spec/support/spec_helpers.rb

@@ -4,7 +4,8 @@ module RightHook
   module SpecHelpers
     def generate_secret_header(secret, body)
       sha = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new('sha1'), secret, body)
-      {'X-Hub-Signature' => "sha1=#{sha}"}
+      # GitHub sends it as 'X-Hub-Signature', but Rack provides it as HTTP_X_HUB_SIGNATURE... :/
+      {'HTTP_X_HUB_SIGNATURE' => "sha1=#{sha}"}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_hook
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler