ruby-kafka-aws-iam 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4210fcd2155979ae945a9b1c64638b3e2d0b4c63cbd4a6332406e8bfa2f8e26a
-  data.tar.gz: 48d2ecf50daff8e8b23f77e8fb90c8086686cfdc7a5d65a50645b97ded4676bc
+  metadata.gz: 410a10299e8244f0e25ca5d6cea717a54792caa24cf006674d2d2eb45124b646
+  data.tar.gz: 97492d2e16908532076a635049bddb7149ec374a282e6c3b13c20000fe0d523f
 SHA512:
-  metadata.gz: 650343b839e07b14608e1bcd7b7e893cd6307918f9c9d2894d2f813739e616b56ad2d0ba2a0dbf0986ebaf38ee2dc4848bfc8c2581e1402916148caf3943c83e
-  data.tar.gz: 3e5d7edfb7fc7867d10df945766c84d38fbf64fd03b84e0fa496cbf523faa8824d8ebc10f258c170667e9482eae3682ee76ebb0aed494de235fd74ce4bea10f0
+  metadata.gz: 95e075270ff241afba5b09f03ba18dddcf500022daa56077b2cfeb35a95ed66f69f3db356b7b4bb8a3f77a50bb4c44509d1197d4b936b8418723cce757259d76
+  data.tar.gz: 6f2a8046c8b4a77ea3980b5c6b3f88aa7df51a078451b97705defda0c4fcfcc8567407e39817542607ffcec3155c58009a56905550d72d8ec35ceb294b880010

data/lib/kafka/sasl/awsmskiam.rb

@@ -63,31 +63,31 @@ module Kafka
 
       def authentication_payload(host:, time_now:)
         {
-          'version': "2020_10_22",
-          'host': host,
-          'user-agent': "ruby-kafka",
-          'action': "kafka-cluster:Connect",
-          'x-amz-algorithm': "AWS4-HMAC-SHA256",
-          'x-amz-credential': @access_key_id + "/" + time_now.strftime("%Y%m%d") + "/" + @aws_region + "/kafka-cluster/aws4_request",
-          'x-amz-date': time_now.strftime("%Y%m%dT%H%M%SZ"),
-          'x-amz-signedheaders': "host",
-          'x-amz-expires': "900",
-          'x-amz-security-token': @session_token,
-          'x-amz-signature': signature(host: host, time_now: time_now)
-        }.to_json
+          'version' => "2020_10_22",
+          'host' => host,
+          'user-agent' => "ruby-kafka",
+          'action' => "kafka-cluster:Connect",
+          'x-amz-algorithm' => "AWS4-HMAC-SHA256",
+          'x-amz-credential' => @access_key_id + "/" + time_now.strftime("%Y%m%d") + "/" + @aws_region + "/kafka-cluster/aws4_request",
+          'x-amz-date' => time_now.strftime("%Y%m%dT%H%M%SZ"),
+          'x-amz-signedheaders' => "host",
+          'x-amz-expires' => "900",
+          'x-amz-security-token' => @session_token,
+          'x-amz-signature' => signature(host: host, time_now: time_now)
+        }.delete_if { |_, v| v.nil? }.to_json
       end
 
       def canonical_request(host:, time_now:)
         "GET\n" +
-        "/\n" +
-        canonical_query_string(time_now: time_now) + "\n" +
-        canonical_headers(host: host) + "\n" +
-        signed_headers + "\n" +
-        hashed_payload
+          "/\n" +
+          canonical_query_string(time_now: time_now) + "\n" +
+          canonical_headers(host: host) + "\n" +
+          signed_headers + "\n" +
+          hashed_payload
       end
 
       def canonical_query_string(time_now:)
-        URI.encode_www_form(
+        params = {
           "Action" => "kafka-cluster:Connect",
           "X-Amz-Algorithm" => "AWS4-HMAC-SHA256",
           "X-Amz-Credential" => @access_key_id + "/" + time_now.strftime("%Y%m%d") + "/" + @aws_region + "/kafka-cluster/aws4_request",
@@ -95,7 +95,9 @@ module Kafka
           "X-Amz-Expires" => "900",
           "X-Amz-Security-Token" => @session_token,
           "X-Amz-SignedHeaders" => "host"
-        )
+        }.delete_if { |_, v| v.nil? }
+
+        URI.encode_www_form(params)
       end
 
       def canonical_headers(host:)
@@ -112,9 +114,9 @@ module Kafka
 
       def string_to_sign(host:, time_now:)
         "AWS4-HMAC-SHA256" + "\n" +
-        time_now.strftime("%Y%m%dT%H%M%SZ") + "\n" +
-        time_now.strftime("%Y%m%d") + "/" + @aws_region + "/kafka-cluster/aws4_request" + "\n" +
-        bin_to_hex(digest.digest(canonical_request(host: host, time_now: time_now)))
+          time_now.strftime("%Y%m%dT%H%M%SZ") + "\n" +
+          time_now.strftime("%Y%m%d") + "/" + @aws_region + "/kafka-cluster/aws4_request" + "\n" +
+          bin_to_hex(digest.digest(canonical_request(host: host, time_now: time_now)))
       end
 
       def signature(host:, time_now:)

data/lib/kafka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kafka
-  VERSION = "1.4.4"
+  VERSION = "1.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-kafka-aws-iam
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: digest-crc