grape-slack-bot 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2af9ee1dcca9101aaf2fb823f45ce1609c591024ab1e9084d3add79fad87d243
-  data.tar.gz: d83d3790de38c03b5f0cf6757ac7fc66334793a76d07fc9e0d82b2cb110306a5
+  metadata.gz: 14a99557c3003723987fd3dc625947edbbfffce3148f54d96936e215b6e72109
+  data.tar.gz: 985a1643aa6ce06348f43ddd03a072769a800025ddb56f608ed180de7cc881bf
 SHA512:
-  metadata.gz: 26b539c209daf44688511578754ebc222a919728a2694bca0d11a737cc0222d219bc61b382974cd10d8ff9d0f31222d0b97e61074ae5a7210516f3a003806dd9
-  data.tar.gz: '04719c66bec6569d1cf2dc99351bffc55cb6826d53fb3e07678e803bda60c5f69f590b952f6a7468b795777a2c6c79fcff48f9ec1f03241574f5b6ce7598d6ac'
+  metadata.gz: 5ef98824c8057203c4fd1256c3f45b215182b4590e956cad718ee64f89fe4d5ed2bb39845f0eef390556b6f25456953bd07600f364613358a31edfdbaf8b4e60
+  data.tar.gz: 8f480e83107bb51bacd21ff4211877d37ebb367336243484b99c0a87973f615bab6af7b1b90083dc43b8671d7a7f796be99433dd36ae82986dd3ec1c4d2e581c

data/lib/slack_bot/grape_extension.rb

@@ -12,9 +12,17 @@ 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.rewind
       request_body = request.body.read
+      request.body.rewind
+
       sig_basestring = "v0:#{timestamp}:#{request_body}"
       my_signature =
         "v0=" +
@@ -23,7 +31,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.1".freeze
+  VERSION = "1.8.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-slack-bot
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Andrei Makarov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack