convoy.rb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d84ba6e548b79893bcad3e8deb0a86d80c591e4009f0d6a11d64011a7b918593
-  data.tar.gz: 2b5cf92c2939fb48e766928e86e63a0800ef99591a92a9472023a3f62d90e858
+  metadata.gz: e8f15617864719123de4834de4b15ae72db7ab5015e9a58a5abd51e4d08dbdac
+  data.tar.gz: 41e3736a899549a250bdfe9067e7b8c9d8cbbd24662c4eba4e6f2bebedabe3d0
 SHA512:
-  metadata.gz: 30d0410db297a90f8a21243cf8aa477569865df8ae57af66159428f8745644f805f6900e18f0f0e022588ea2b0ee0b60ffa2bd961503ea625c21a9e791dfd14c
-  data.tar.gz: 939f323b06ff770b6f4b9d48a3c196fca4a4a99cc72889ae6876b1e8139497d09d2a3ede98091a4cd7b434629a1cad274d0759bf5eb68e166d62112fa5725ee0
+  metadata.gz: 65ec9158b0afd2ca52b44133f70aa9355ba515c520a78eddc95d1e2d576917c2a5e1bf9a40dae5caf6bc5e3f14a9b5798700a2c9928df03a10d9453198b30273
+  data.tar.gz: a60f5bc98eef97a940fad99c84111c164f6948ce01c17929cea9c712ec1403084b293119895e88138f0284c1fc53419e797b5944cabcf55fc8159c312884a417

data/lib/convoy/version.rb

@@ -1,3 +1,3 @@
 module Convoy
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/convoy/webhook.rb

@@ -34,8 +34,7 @@ module Convoy
       is_advanced = (sig_header.split(",")).length > 1
       
       if is_advanced
-        verify_advanced_signature(payload, sig_header)
-        return
+        return verify_advanced_signature(payload, sig_header)
       end
 
       verify_simple_signature(payload, sig_header)
@@ -49,7 +48,7 @@ module Convoy
 
     def verify_advanced_signature(payload, sig_header)
       timestamp_header, signatures = get_timestamp_and_signatures(sig_header)
-      payload = "{#{timestamp_header}},{#{payload}}"
+      payload = "#{Integer(timestamp_header)},#{payload}"
 
       verify_timestamp(timestamp_header)
 
@@ -57,6 +56,8 @@ module Convoy
         raise SignatureVerificationError.new,
         "No signatures found matching the expected signature for payload"
       end
+
+      return true
     end
 
     def verify_timestamp(timestamp_header)
@@ -76,17 +77,19 @@ module Convoy
     def compute_signature(payload)
       case @encoding
       when "hex"
-        return OpenSSL::HMAC.hexdigest(@hash, @secret, payload)
+        val = OpenSSL::HMAC.hexdigest(@hash, @secret, payload)
+        return val
       when "base64"
         hmac = OpenSSL::HMAC.digest(@hash, @secret, payload)
-        return Base64.encode64(hmac)
+        return Base64.strict_encode64(hmac)
       end
     end
 
     def get_timestamp_and_signatures(sig_header)
       list_items = sig_header.split(/,\s*/).map { |i| i.split("=", 2) }
       timestamp = Integer(list_items.select { |i| i[0] == "t" }[0][1])
-      [Time.at(timestamp), list_items[1]]
+      signatures = list_items[1..].map { |i| i[1] }
+      [Time.at(timestamp), signatures]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convoy.rb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Subomi Oluwalana
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2024-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk