trello_webhook 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b516b3bbf281076131e7425b83785c805ee142c
-  data.tar.gz: ffd3fe3ca304c6bb3838c953e8f54a7648e3d939
+  metadata.gz: cf5d4536a072b5daee10b7d6af1afda4b6716deb
+  data.tar.gz: 5a3fdb95d69b3f963ee45c288e29083adbb64008
 SHA512:
-  metadata.gz: b67b80ba9683a4112430f15214baa95c0e803126e713add3d1c2f65110d103b9fcc676610ad42c06e358e33c642a059053b07be8a754e6bef4a2e66ffa86f19f
-  data.tar.gz: 4391bf738eefe3787fa7bfd7c2dd4f737b865c3b6b8f84893db1a41fffc866df1af0797395c81ff8e4ae540a3a7af9f3e59d811c30e047ae5fc9a3f33212bf0c
+  metadata.gz: 9fea62229a954721c3d2bd0714e4899a72904494c4e6e2602af9de4f6233706ee9eae48e832e7d16dd547f8ee267ec098f970741db41391b818c84c7bc699ad0
+  data.tar.gz: fe088550c5ddd8f90a8283f3b14ac729f55dda1e13d397e88360fee68ae3da4e6096a496f3e124e3dc7482d60f9e57d39b35cf907fbd56200c5cb05d828ae47c

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 2.2.0
   - 2.1.0
   - 2.0.0
+  - 1.9.3

data/README.md

@@ -18,7 +18,7 @@ gem 'trello_webhook'
 And then execute:
 
 ```bash
-$ bundle install
+bundle install
 ```
 
 ## Configuration
@@ -59,4 +59,4 @@ webhook.description = "The webhook description"
 webhook.id_model = "The board model id" # Run `Trello::Board.all` to find it.
 webhook.callback_url = "#{ENV['BASE_URL']}/trello_webhooks"  # BASE_URL is your website's url. Use ngrok in dev.
 webhook.save
-```
+```

data/lib/trello_webhook/processor.rb

@@ -1,8 +1,11 @@
+require 'openssl'
+require 'base64'
+
 module TrelloWebhook::Processor
   extend ActiveSupport::Concern
 
   included do
-    before_filter :authenticate_trello_request!, :only => :create
+    before_action :authenticate_trello_request!, only: :create
   end
 
   class SignatureError < StandardError; end
@@ -33,14 +36,19 @@ module TrelloWebhook::Processor
   def authenticate_trello_request!
     raise UnspecifiedWebhookSecretError.new unless respond_to?(:webhook_secret)
 
-    normalized_payload = "#{request_body}#{request_url}".unpack('U*').pack('c*')
-    expected_signature = Base64.strict_encode64(OpenSSL::HMAC.digest(HMAC_DIGEST, webhook_secret, normalized_payload))
+    expected = base64digest(base64digest(request_body + request_url))
+    actual = base64digest(signature_header)
 
-    if signature_header != expected_signature
-      raise SignatureError.new "Actual: #{signature_header}, Expected: #{expected_signature}"
+    if actual != expected
+      raise SignatureError.new "Actual: #{actual}, Expected: #{expected}"
     end
   end
 
+  def base64digest(message)
+    hash = OpenSSL::HMAC.digest('sha1', webhook_secret, message)
+    Base64.strict_encode64(hash)
+  end
+
   def request_body
     @request_body ||= (
       request.body.rewind

data/lib/trello_webhook/version.rb

@@ -1,3 +1,3 @@
 module TrelloWebhook
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/trello_webhook/processor_spec.rb

@@ -16,17 +16,19 @@ module TrelloWebhook
       end
     end
 
-    class ControllerWithoutSecret
+    class ControllerWithoutImplementedCallback
       ### Helpers to mock ActionController::Base behavior
       attr_accessor :request, :updated
 
-      def self.skip_before_filter(*args); end
-      def self.before_filter(*args); end
+      def self.skip_before_action(*args); end
+      def self.before_action(*args); end
       def head(*args); end
       ###
 
       include TrelloWebhook::Processor
+    end
 
+    class ControllerWithoutSecret < ControllerWithoutImplementedCallback
       def update_card(payload)
         @updated = payload[:foo]
       end
@@ -45,18 +47,20 @@ module TrelloWebhook
     end
 
     let(:controller_without_secret) do
-      ControllerWithoutSecret.new
+      controller = ControllerWithoutSecret.new
+      controller.request = Request.new
+      controller
     end
 
     describe "#create" do
       it "raises an error when secret is not defined" do
-        expect { controller_without_secret.send :authenticate_trello_request! }.to raise_error
+        expect { controller_without_secret.send :authenticate_trello_request! }.to raise_error(Processor::UnspecifiedWebhookSecretError)
       end
 
       it "calls the #update_card method in controller" do
         controller.request.body = StringIO.new({ :foo => "bar", :action => { type: 'updateCard' } }.to_json.to_s)
         controller.request.headers['X-Trello-Webhook'] = "3YUv3UBpzV8IbZrOnIpRC+Cf+Nk="
-        controller.send :authenticate_trello_request!  # Manually as we don't have the before_filter logic in our Mock object
+        controller.send :authenticate_trello_request!  # Manually as we don't have the before_action logic in our Mock object
         controller.create
         expect(controller.updated).to eq "bar"
       end
@@ -64,12 +68,15 @@ module TrelloWebhook
       it "raises an error when signature does not match" do
         controller.request.body = StringIO.new({ :foo => "bar" }.to_json.to_s)
         controller.request.headers['X-Trello-Webhook'] = "thatsnotrightgeorge"
-        expect { controller_without_secret.send :authenticate_trello_request! }.to raise_error
+        expect { controller_without_secret.send :authenticate_trello_request! }.to raise_error(Processor::UnspecifiedWebhookSecretError)
       end
 
       it "raises an error when the trello event method is not implemented" do
-        expect { controller_without_secret.create }.to raise_error
+        controller = ControllerWithoutImplementedCallback.new
+        controller.request = Request.new
+        controller.request.body = StringIO.new({ :foo => "bar", :action => { type: 'updateCard' } }.to_json.to_s)
+        expect { controller.create }.to raise_error(Processor::CallbackNotImplementedError)
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trello_webhook
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sebastien Saunier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Process Trello Webhooks in your Rails app (Controller mixin)