github_webhook 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56016facfc0ab28b56bc588e152852a637d56c95
-  data.tar.gz: f0ff11bc356e334855cf92f83193aa53fd56cdc1
+  metadata.gz: 8e1aafa2b371f63f8ff7276d892c0279845d4a84
+  data.tar.gz: 203d5fca9f09fd28ac501eabf2ae1f656b4358be
 SHA512:
-  metadata.gz: 0826b815bff7d4edda1faf73bee0df2e1b0a13251fd0bb0f6805bfd0f5367ba81f2e6a2b8d6bc3193e549d7aad61bb0c0e912225e477a4cf033d34282a2912d3
-  data.tar.gz: 837e31c5deae7e64b6f21407b1e67ba560aba9b98fa611952e753e0c90a46ec53dd1612fe9b4f954affdc66135ce5d02aa7468f0fc264fb4a3d0680353a20d5f
+  metadata.gz: fe0d6e2cc1f78f99cf0ec4b9825ee086332058c764ec117c1011007f81e458d13e2aa9352fa31c9e30ae30a067a1945fc63aed24dbd02eebca3678e5f4ed35f7
+  data.tar.gz: b2de02e5b6cc046efa2fc07bbe74057eed8571592f1f7260d3831b4f5788cba3392f466c43f1ee31816f8094b86a1b4628741663f068d59eeea25e4508f788c1

data/Gemfile.lock

@@ -1,25 +1,27 @@
 PATH
   remote: .
   specs:
-    github_webhook (0.3.2)
+    github_webhook (0.4.0)
       activesupport (~> 4)
+      rack (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.5.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    i18n (0.6.9)
+    i18n (0.7.0)
     json (1.8.3)
-    minitest (5.3.5)
+    minitest (5.8.4)
+    rack (1.6.4)
     rake (10.3.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -34,8 +36,8 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    thread_safe (0.3.4)
-    tzinfo (1.2.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/README.md

@@ -13,7 +13,7 @@ to a [GitHub webhook](https://developer.github.com/webhooks/)
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'github_webhook', '~> 0.3.0'
+gem 'github_webhook', '~> 0.4.0'
 ```
 
 And then execute:

data/github_webhook.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "rack", "~> 1.3"
   spec.add_dependency "activesupport", "~> 4"
 
   spec.add_development_dependency "bundler", "~> 1.5"

data/lib/github_webhook/processor.rb

@@ -9,6 +9,7 @@ module GithubWebhook::Processor
   class SignatureError < StandardError; end
   class UnspecifiedWebhookSecretError < StandardError; end
   class UnsupportedGithubEventError < StandardError; end
+  class UnsupportedContentTypeError < StandardError; end
 
   GITHUB_EVENTS_WHITELIST = %w(ping commit_comment create delete deployment deployment_status download follow fork fork_apply gist gollum issue_comment issues member membership page_build public pull_request pull_request_review_comment push release repository status team_add watch)
 
@@ -53,7 +54,20 @@ module GithubWebhook::Processor
   end
 
   def json_body
-    @json_body ||= ActiveSupport::HashWithIndifferentAccess.new(JSON.load(request_body))
+    @json_body ||= (
+      content_type = request.headers['Content-Type']
+      case content_type
+      when 'application/x-www-form-urlencoded'
+        require 'rack'
+        payload = Rack::Utils.parse_query(request_body)['payload']
+      when 'application/json'
+        payload = request_body
+      else
+        raise UnsupportedContentTypeError.new(
+          "Content-Type #{content_type} is not supported. Use 'application/x-www-form-urlencoded' or 'application.json")
+      end
+      ActiveSupport::HashWithIndifferentAccess.new(JSON.load(payload))
+    )
   end
 
   def signature_header

data/lib/github_webhook/version.rb

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

data/spec/github_webhook/processor_spec.rb

@@ -49,10 +49,22 @@ module GithubWebhook
         expect { controller_without_secret.send :authenticate_github_request! }.to raise_error(Processor::UnspecifiedWebhookSecretError)
       end
 
-      it "calls the #push method in controller" do
+      it "calls the #push method in controller (json)" do
         controller.request.body = StringIO.new({ :foo => "bar" }.to_json.to_s)
         controller.request.headers['X-Hub-Signature'] = "sha1=52b582138706ac0c597c315cfc1a1bf177408a4d"
         controller.request.headers['X-GitHub-Event'] = 'push'
+        controller.request.headers['Content-Type'] = 'application/json'
+        controller.send :authenticate_github_request!  # Manually as we don't have the before_filter logic in our Mock object
+        controller.create
+        expect(controller.pushed).to eq "bar"
+      end
+
+      it "calls the #push method (x-www-form-urlencoded encoded)" do
+        body = "payload=" + CGI::escape({ :foo => "bar" }.to_json.to_s)
+        controller.request.body = StringIO.new(body)
+        controller.request.headers['X-Hub-Signature'] = "sha1=6986874ecdf710b04de7ef5a040161d41687407a"
+        controller.request.headers['X-GitHub-Event'] = 'push'
+        controller.request.headers['Content-Type'] = 'application/x-www-form-urlencoded'
         controller.send :authenticate_github_request!  # Manually as we don't have the before_filter logic in our Mock object
         controller.create
         expect(controller.pushed).to eq "bar"
@@ -62,18 +74,29 @@ module GithubWebhook
         controller.request.body = StringIO.new({ :foo => "bar" }.to_json.to_s)
         controller.request.headers['X-Hub-Signature'] = "sha1=FOOBAR"
         controller.request.headers['X-GitHub-Event'] = 'push'
+        controller.request.headers['Content-Type'] = 'application/json'
         expect { controller.send :authenticate_github_request! }.to raise_error(Processor::SignatureError)
       end
 
       it "raises an error when the github event method is not implemented" do
         controller.request.headers['X-GitHub-Event'] = 'deployment'
+        controller.request.headers['Content-Type'] = 'application/json'
         expect { controller.create }.to raise_error(NoMethodError)
       end
 
       it "raises an error when the github event is not in the whitelist" do
         controller.request.headers['X-GitHub-Event'] = 'fake_event'
+        controller.request.headers['Content-Type'] = 'application/json'
         expect { controller.send :check_github_event! }.to raise_error(Processor::UnsupportedGithubEventError)
       end
+
+      it "raises an error when the content type is not correct" do
+        controller.request.body = StringIO.new({ :foo => "bar" }.to_json.to_s)
+        controller.request.headers['X-Hub-Signature'] = "sha1=52b582138706ac0c597c315cfc1a1bf177408a4d"
+        controller.request.headers['X-GitHub-Event'] = 'ping'
+        controller.request.headers['Content-Type'] = 'application/xml'
+        expect { controller.send :authenticate_github_request! }.to raise_error(Processor::UnsupportedContentTypeError)
+      end
     end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: github_webhook
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Sebastien Saunier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement