github_webhook 1.0.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 884527952c3de87ab10113b15faa48a4a3943557
-  data.tar.gz: e9d7222f4ea4724f6426ccf6643f5270063502c9
+SHA256:
+  metadata.gz: eeb186a10b99f572358acea6a3cba8678fb064b203a98afda9f07bab407b9e24
+  data.tar.gz: 8393af3c4ff44abf949488732113c200110dfe040886e17bda22c5ba18f33e9c
 SHA512:
-  metadata.gz: 55a2b86574e657e4c2d50149d0c2fbf928a7ba7acbfd0f89032615142c4f03541728a0aee4c666ed5c33ec748d3963ebc4911877be33b0cfcc5ee9a724cd710b
-  data.tar.gz: 507a45eb2713452ad0513e4bf6396a50aae2e639fde460b91a43b03358753faef905102cb1ec2b7db837c584a115f5c881e8da60cecdbf422406ff4c49379e5c
+  metadata.gz: adbcecc3754189f8c73d68839ae8b4a3e48b1711e81b7d6ce95a74011a9e5212412dd4aeaa3dad86c435435063f3e2f3f665fa96294251b5550e11cf794400ad
+  data.tar.gz: 5b65bba2ee6a2ddc1b3f61ad05db8a635e6456f18cbc541fb9370e26c90f44ffacf9b796c02c9fd77ff3cb4ec4cff1533d5acadcd0e2a7e764ff3886824a5e83

data/.github/workflows/ruby.yml

@@ -0,0 +1,24 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7.x
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake

data/.gitignore

@@ -1,3 +1,5 @@
 .DS_Store
 *.gem
 coverage
+/Gemfile.lock
+/gemfiles/*.gemfile.lock

data/.ruby-version

@@ -0,0 +1 @@
+2.7.4

data/Appraisals

@@ -0,0 +1,15 @@
+appraise "rails-4.2" do
+  gem "rails", "~> 4.2.0"
+end
+
+appraise "rails-5.0" do
+  gem "rails", "~> 5.0.0"
+end
+
+appraise "rails-5.1" do
+  gem "rails", "~> 5.1.0"
+end
+
+appraise "rails-6.0" do
+  gem "rails", "~> 6.0"
+end

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in github_webhook.gemspec
 gemspec
+
+gem 'simplecov', require: false

data/README.md

@@ -1,5 +1,3 @@
-[![Build Status](https://travis-ci.org/ssaunier/github_webhook.svg?branch=master)](https://travis-ci.org/ssaunier/github_webhook)
-[![Code Climate](https://codeclimate.com/github/ssaunier/github_webhook/badges/gpa.svg)](https://codeclimate.com/github/ssaunier/github_webhook)
 [![Gem Version](https://badge.fury.io/rb/github_webhook.svg)](http://badge.fury.io/rb/github_webhook)
 
 
@@ -13,7 +11,7 @@ to a [GitHub webhook](https://developer.github.com/webhooks/)
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'github_webhook', '~> 1.0.5'
+gem 'github_webhook', '~> 1.2'
 ```
 
 And then execute:
@@ -46,6 +44,8 @@ class GithubWebhooksController < ActionController::Base
     # TODO: handle create webhook
   end
 
+  private
+
   def webhook_secret(payload)
     ENV['GITHUB_WEBHOOK_SECRET']
   end
@@ -91,3 +91,17 @@ You can have an overview of your webhooks at the following URL:
 ```
 https://github.com/:username/:repo/settings/hooks
 ```
+
+## Contributing
+
+### Specs
+
+This project uses [Appraisal](https://github.com/thoughtbot/appraisal) to test against multiple
+versions of Rails.
+
+On Travis, builds are also run on multiple versions of Ruby, each with multiple versions of Rails.
+
+When you run `bundle install`, it will use the latest version of Rails.
+You can then run `bundle exec rake spec` to run the test with that version of Rails.
+
+To run the specs against each version of Rails, use `bundle exec appraisal rake spec`.

data/Rakefile

@@ -1,4 +1,7 @@
 #!/usr/bin/env rake
+require "rubygems"
+require "bundler/setup"
+
 require "bundler/gem_tasks"
 
 require 'rspec'

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+
+gemspec path: "../"

data/github_webhook.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rack", ">= 1.3"
   spec.add_dependency "activesupport", ">= 4"
+  spec.add_dependency "railties", ">= 4"
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake", "~> 10.1"
-  spec.add_development_dependency "rspec", "~> 2.14"
-  spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "rake", "~> 12.3"
+  spec.add_development_dependency "rspec", "~> 3.9"
+  spec.add_development_dependency "appraisal"
 end

data/lib/github_webhook/processor.rb

@@ -13,58 +13,65 @@ module GithubWebhook::Processor
 
   # To fetch list from https://developer.github.com/v3/activity/events/types
   # run this little JS code in the console:
-  #   var events = "ping";
-  #   $('h3').each(function(i, item) {
-  #     if ($(item).text().match(/webhook event name/i)) {
-  #       events = events + ' ' + $(item).next('p').find('code').html();
-  #     }
-  #   });
-  #   console.log(events);
-  GITHUB_EVENTS_WHITELIST = %w(
+  #    document.querySelectorAll('.list-style-none li.lh-condensed a').forEach(e => console.log(e.text))
+  GITHUB_EVENTS = %w(
+    check_run
+    check_suite
+    code_scanning_alert
     commit_comment
+    content_reference
     create
     delete
+    deploy_key
     deployment
     deployment_status
-    download
-    follow
+    discussion
+    discussion_comment
     fork
-    fork_apply
-    gist
+    github_app_authorization
     gollum
     installation
     installation_repositories
-    integration_installation
-    integration_installation_repositories
-    issues
     issue_comment
+    issues
     label
     marketplace_purchase
     member
     membership
+    meta
     milestone
     organization
     org_block
+    package
     page_build
     ping
-    project
     project_card
     project_column
+    project
     public
     pull_request
     pull_request_review
     pull_request_review_comment
     push
     release
+    repository_dispatch
     repository
+    repository_import
+    repository_vulnerability_alert
+    secret_scanning_alert
+    security_advisory
+    sponsorship
+    star
     status
     team
     team_add
     watch
+    workflow_dispatch
+    workflow_run
   )
 
   def create
-    if self.respond_to? event_method
+    if self.respond_to?(event_method, true)
       self.send event_method, json_body
       head(:ok)
     else
@@ -73,7 +80,8 @@ module GithubWebhook::Processor
   end
 
   def github_ping(payload)
-    puts "[GithubWebhook::Processor] Hook ping received, hook_id: #{payload[:hook_id]}, #{payload[:zen]}"
+    GithubWebhook.logger && GithubWebhook.logger.info("[GithubWebhook::Processor] Hook ping "\
+      "received, hook_id: #{payload[:hook_id]}, #{payload[:zen]}")
   end
 
   private
@@ -81,18 +89,20 @@ module GithubWebhook::Processor
   HMAC_DIGEST = OpenSSL::Digest.new('sha1')
 
   def authenticate_github_request!
-    raise UnspecifiedWebhookSecretError.new unless respond_to?(:webhook_secret)
+    raise UnspecifiedWebhookSecretError.new unless respond_to?(:webhook_secret, true)
     secret = webhook_secret(json_body)
 
     expected_signature = "sha1=#{OpenSSL::HMAC.hexdigest(HMAC_DIGEST, secret, request_body)}"
-    if signature_header != expected_signature
-      raise SignatureError.new "Actual: #{signature_header}, Expected: #{expected_signature}"
+    unless ActiveSupport::SecurityUtils.secure_compare(signature_header, expected_signature)
+      GithubWebhook.logger && GithubWebhook.logger.warn("[GithubWebhook::Processor] signature "\
+        "invalid, actual: #{signature_header}, expected: #{expected_signature}")
+      raise SignatureError
     end
   end
 
   def check_github_event!
-    unless GITHUB_EVENTS_WHITELIST.include?(request.headers['X-GitHub-Event'])
-      raise UnsupportedGithubEventError.new("#{request.headers['X-GitHub-Event']} is not a whiltelisted GitHub event. See https://developer.github.com/v3/activity/events/types/")
+    unless GITHUB_EVENTS.include?(request.headers['X-GitHub-Event'])
+      raise UnsupportedGithubEventError.new("#{request.headers['X-GitHub-Event']} is not a whitelisted GitHub event. See https://developer.github.com/v3/activity/events/types/")
     end
   end
 
@@ -114,7 +124,7 @@ module GithubWebhook::Processor
         payload = request_body
       else
         raise UnsupportedContentTypeError.new(
-          "Content-Type #{content_type} is not supported. Use 'application/x-www-form-urlencoded' or 'application.json")
+          "Content-Type #{content_type} is not supported. Use 'application/x-www-form-urlencoded' or 'application/json")
       end
       ActiveSupport::HashWithIndifferentAccess.new(JSON.load(payload))
     )

data/lib/github_webhook/railtie.rb

@@ -0,0 +1,9 @@
+require 'rails'
+
+module GithubWebhook
+  class Railties < ::Rails::Railtie
+    initializer 'Rails logger' do
+      GithubWebhook.logger = Rails.logger
+    end
+  end
+end

data/lib/github_webhook/version.rb

@@ -1,3 +1,3 @@
 module GithubWebhook
-  VERSION = "1.0.5"
+  VERSION = "1.2.0"
 end

data/lib/github_webhook.rb

@@ -4,4 +4,11 @@ require 'active_support/concern'
 require 'active_support/core_ext/hash/indifferent_access'
 
 require 'github_webhook/version'
-require 'github_webhook/processor'
+require 'github_webhook/processor'
+require 'github_webhook/railtie'
+
+module GithubWebhook
+  class <<self
+    attr_accessor :logger
+  end
+end

data/spec/github_webhook/processor_spec.rb

@@ -28,25 +28,49 @@ module GithubWebhook
       end
     end
 
+    class ControllerWithPrivateSecret < ControllerWithoutSecret
+      private
+      def webhook_secret(payload)
+        "secret"
+      end
+    end
+
     class Controller < ControllerWithoutSecret
       def webhook_secret(payload)
         "secret"
       end
     end
 
+    let(:controller_class) { Controller }
+
     let(:controller) do
-      controller = Controller.new
+      controller = controller_class.new
       controller.request = Request.new
       controller
     end
 
-    let(:controller_without_secret) do
-      ControllerWithoutSecret.new
-    end
-
     describe "#create" do
-      it "raises an error when secret is not defined" do
-        expect { controller_without_secret.send :authenticate_github_request! }.to raise_error(Processor::UnspecifiedWebhookSecretError)
+      context 'when #webhook_secret is not defined' do
+        let(:controller_class) { ControllerWithoutSecret }
+
+        it "raises a Processor::UnspecifiedWebhookSecretError" do
+          expect { controller.send :authenticate_github_request! }
+            .to raise_error(Processor::UnspecifiedWebhookSecretError)
+        end
+      end
+
+      context 'when #webhook_secret is private' do
+        let(:controller_class) { ControllerWithPrivateSecret }
+
+        it "calls the #push method in controller" do
+          expect(controller).to receive(:github_push)
+          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
+        end
       end
 
       it "calls the #push method in controller (json)" do

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 ENV['RAILS_ENV'] ||= 'test'
 
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 require "github_webhook"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github_webhook
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Sebastien Saunier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -39,49 +39,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,16 +101,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".ruby-version"
+- Appraisals
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
 - github_webhook.gemspec
 - lib/github_webhook.rb
 - lib/github_webhook/processor.rb
+- lib/github_webhook/railtie.rb
 - lib/github_webhook/version.rb
 - spec/github_webhook/processor_spec.rb
 - spec/spec_helper.rb
@@ -118,7 +123,7 @@ homepage: https://github.com/ssaunier/github_webhook
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,9 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Process GitHub Webhooks in your Rails app (Controller mixin)
 test_files:

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.5
-addons:
-  code_climate:
-    repo_token: 50425d682162d68af0b65bd9e5160da8337d2159fc3ebc00d2a5b14386548ac5

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    github_webhook (1.0.5)
-      activesupport (>= 4)
-      rack (>= 1.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.1.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    codeclimate-test-reporter (0.4.8)
-      simplecov (>= 0.7.1, < 1.0.0)
-    concurrent-ruby (1.0.5)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    i18n (0.8.6)
-    json (1.8.6)
-    minitest (5.10.3)
-    rack (2.0.3)
-    rake (10.3.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    simplecov (0.11.2)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.5)
-  codeclimate-test-reporter
-  github_webhook!
-  rake (~> 10.1)
-  rspec (~> 2.14)
-
-BUNDLED WITH
-   1.15.3