rack-github_webhooks 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 356ef06d3434bd82cf6259402c287ac2d576f439
-  data.tar.gz: fb0f199fc1c489350794c4545795bbd76f866e11
+  metadata.gz: e0ad149d1ccf3096eb22b95c057dea5cca062e2d
+  data.tar.gz: 5257261e19046d920788756cf143c72d2c8cab0f
 SHA512:
-  metadata.gz: 6fb61aea03f0354d2a5f817064b2cf3f94cefefbb874d490291140a050535851ef50c18e7c7ce40091164b8ae7e6f1222f4b6865b04d928bfbd1e8424ba923b8
-  data.tar.gz: 264cbf318764db94000244c4157780d35a905a82315493c16b4b39db39479423678e8afc415ad57350dcc5c4577b665b7ad0b7f4a6bce6586d4d8a8eb60d2243
+  metadata.gz: 208989b2d0f31db4b1c5ce7fc91d1f31324fd5a176c31c1f8c041e963d7ec20d6a915186c223d5074c3487aae9b5b5d3e621a1a5f3c21df313164002308fe009
+  data.tar.gz: 062f9dfd96e31a08452eaf54598f0a75daf71fc3e921cbcecc8dd145541db1d179a298a0053171b5567c982efbc7166a1b4741417f943da294ca5c80fc9fa1ec

data/CHANGELOG.md

@@ -3,9 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## 0.1.0 - 2015-11-29
+## [0.3.0] - 2015-11-29
 
-- Initial release
+### Changed
+
+- Internal refactor to separate out `Signature` class.
 
 ## [0.2.0] - 2015-11-29
 
@@ -13,4 +15,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 - Don't error when there's no 'X-Hub-Signature' header.
 
+
+## 0.1.0 - 2015-11-29
+
+- Initial release
+
 [0.2.0]: https://github.com/chrismytton/rack-github_webhooks/compare/v0.1.0...v0.2.0
+[0.3.0]: https://github.com/chrismytton/rack-github_webhooks/compare/v0.2.0...v0.3.0

data/lib/rack/github_webhooks.rb

@@ -4,11 +4,22 @@ require 'json'
 
 module Rack
   class GithubWebhooks
-    HMAC_DIGEST = OpenSSL::Digest.new('sha1')
+    class Signature
+      HMAC_DIGEST = OpenSSL::Digest.new('sha1')
+
+      def initialize(secret, hub_signature, payload_body)
+        @secret = secret
+        @hub_signature = hub_signature
+        @signature = 'sha1=' +
+                     OpenSSL::HMAC.hexdigest(HMAC_DIGEST, secret, payload_body)
+      end
 
-    attr_reader :app
-    attr_reader :secret
-    attr_reader :request
+      def valid?
+        return true unless @secret
+        return false unless @hub_signature
+        Rack::Utils.secure_compare(@signature, @hub_signature)
+      end
+    end
 
     def initialize(app, opts = {})
       @app = app
@@ -16,29 +27,14 @@ module Rack
     end
 
     def call(env)
-      @request = Rack::Request.new(env)
-      return [400, {}, ["Signatures didn't match!"]] unless signature_valid?
-      app.call(env)
-    end
-
-    private
-
-    # Taken from https://developer.github.com/webhooks/securing/
-    def signature_valid?
-      return true unless secret
-      return false unless request.env['HTTP_X_HUB_SIGNATURE']
-      Rack::Utils.secure_compare(signature, request.env['HTTP_X_HUB_SIGNATURE'])
-    end
-
-    def signature
-      "sha1=#{OpenSSL::HMAC.hexdigest(HMAC_DIGEST, secret, payload_body)}"
-    end
-
-    def payload_body
-      @payload_body ||= begin
-        request.body.rewind
-        request.body.read
-      end
+      env['rack.input'].rewind
+      signature = Signature.new(
+        @secret,
+        env['HTTP_X_HUB_SIGNATURE'],
+        env['rack.input'].read
+      )
+      return [400, {}, ["Signatures didn't match!"]] unless signature.valid?
+      @app.call(env)
     end
   end
 end

data/lib/rack/github_webhooks/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class GithubWebhooks
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-github_webhooks
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Mytton