grape-slack-bot 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf068ba32d5e7319a9e8d96710dfa364fcccedf1e0755b32305409455293b7cc
-  data.tar.gz: 2c7bba45e4a549dcc1ac64b707349244b19dcbc6ef0a069504e192a350c4f10e
+  metadata.gz: 92616381f617b332e3c87bff1078c1039fa1fb15b9e6b6c1cc536be3e4a4d7fb
+  data.tar.gz: e9d7d54737d837adfde2df90d79446ba92a8db469c04156c9b16e608bd272b0c
 SHA512:
-  metadata.gz: b362b4a0a379c2ff986fe11d554e1aaef10b3581190c7487833c2c69b503cc2f57d1e6b393e4afb19442176079bdc472a2717e57c8921d6dc0f51a92d64f0e9e
-  data.tar.gz: f150f3b05dda3a59d8b818bd574dfd5fcb08f688ad2eb6d263bba31bc821351f858a5bb1e05a3ee17199fe1d7dd0c4bab628127251314cbb6d1d7a809bc46bff
+  metadata.gz: 3c6a8d172c58244862bd8724db7a329a827e13a57b527daaecb21545f63f2a8ea5003a3f4800bd63d014b2c4a4c60c0d34b729bcd84325e7541015e56db03b4f
+  data.tar.gz: da94c5ffcb89090fdc79addf066d24f7cbc5643e7e729556f660806b430781fb25a4086dc64aa4efbf1eb257e99e210d0199d626172638b6361a4143d99d7f65

data/lib/slack_bot/config.rb

@@ -52,7 +52,7 @@ module SlackBot
               config: self,
               handler_name: handler_name
             )
-          endpoint.instance_eval(&) if block
+          endpoint.instance_eval(&) if block_given?
           endpoint
         end
     end
@@ -116,7 +116,7 @@ module SlackBot
               endpoint: self,
               handler_name: handler_name
             )
-          command.instance_eval(&) if block
+          command.instance_eval(&) if block_given?
           command
         end
     end
@@ -166,7 +166,7 @@ module SlackBot
         )
 
       command_config = @argument_command_configs[argument_token.to_sym]
-      command_config.instance_eval(&) if block
+      command_config.instance_eval(&) if block_given?
 
       command_config
     end

data/lib/slack_bot/grape_extension.rb

@@ -12,8 +12,13 @@ module SlackBot
     end
 
     def verify_slack_signature!
-      slack_signing_secret = ENV.fetch("SLACK_SIGNING_SECRET")
-      timestamp = request.headers.fetch("x-slack-request-timestamp")
+      slack_signing_secret = ENV["SLACK_SIGNING_SECRET"]
+      timestamp = request.headers["x-slack-request-timestamp"] || request.headers["X-Slack-Request-Timestamp"]
+      slack_signature = request.headers["x-slack-signature"] || request.headers["X-Slack-Signature"]
+      if slack_signing_secret.blank? || timestamp.blank? || slack_signature.blank?
+        raise SlackBot::Errors::SignatureAuthenticationError.new("Missing signature headers")
+      end
+
       request_body = request.body.read
       sig_basestring = "v0:#{timestamp}:#{request_body}"
       my_signature =
@@ -23,7 +28,6 @@ module SlackBot
           slack_signing_secret,
           sig_basestring
         )
-      slack_signature = request.headers.fetch("x-slack-signature")
       if ActiveSupport::SecurityUtils.secure_compare(
         my_signature,
         slack_signature

data/lib/slack_bot.rb

@@ -22,5 +22,5 @@ require "slack_bot/pager"
 require "slack_bot/grape_extension"
 
 module SlackBot
-  VERSION = "1.7.0".freeze
+  VERSION = "1.7.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-slack-bot
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Andrei Makarov