ruby-kafka-aws-iam 1.4.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12a6cd684ff2abb033b8b9c1c915e0d68eba5d55ca1bc42f1f219f2ded135ee3
-  data.tar.gz: f6a0344386a80000a7b48bd6b199917b0abc32558377cf79cfca2a28d717d4c4
+  metadata.gz: 4210fcd2155979ae945a9b1c64638b3e2d0b4c63cbd4a6332406e8bfa2f8e26a
+  data.tar.gz: 48d2ecf50daff8e8b23f77e8fb90c8086686cfdc7a5d65a50645b97ded4676bc
 SHA512:
-  metadata.gz: 4e24776f995ae5b32a92bfc73cf2164963a803aa6704a6796ebae4e677284f27b8c7eaa61001b25fa90ebcb6e45c8565ed89c059f912e05053a3958b4ffd5106
-  data.tar.gz: 83fe226fa24bafcfedabb24d91d959139132f40e6db8853253f418e7bfc069995b0db9eda0e0950105d67462dde24544353fcb87e3a66c230dcf0a8c62d81ff1
+  metadata.gz: 650343b839e07b14608e1bcd7b7e893cd6307918f9c9d2894d2f813739e616b56ad2d0ba2a0dbf0986ebaf38ee2dc4848bfc8c2581e1402916148caf3943c83e
+  data.tar.gz: 3e5d7edfb7fc7867d10df945766c84d38fbf64fd03b84e0fa496cbf523faa8824d8ebc10f258c170667e9482eae3682ee76ebb0aed494de235fd74ce4bea10f0

data/lib/kafka/client.rb

@@ -86,7 +86,9 @@ module Kafka
                    sasl_gssapi_keytab: nil, sasl_plain_authzid: '', sasl_plain_username: nil, sasl_plain_password: nil,
                    sasl_scram_username: nil, sasl_scram_password: nil, sasl_scram_mechanism: nil,
                    sasl_aws_msk_iam_access_key_id: nil,
-                   sasl_aws_msk_iam_secret_key_id: nil, sasl_aws_msk_iam_aws_region: nil,
+                   sasl_aws_msk_iam_secret_key_id: nil,
+                   sasl_aws_msk_iam_aws_region: nil,
+                   sasl_aws_msk_iam_session_token: nil,
                    sasl_over_ssl: true, ssl_ca_certs_from_system: false, partitioner: nil, sasl_oauth_token_provider: nil, ssl_verify_hostname: true,
                    resolve_seed_brokers: false)
       @logger = TaggedLogger.new(logger)
@@ -117,6 +119,7 @@ module Kafka
         sasl_aws_msk_iam_access_key_id: sasl_aws_msk_iam_access_key_id,
         sasl_aws_msk_iam_secret_key_id: sasl_aws_msk_iam_secret_key_id,
         sasl_aws_msk_iam_aws_region: sasl_aws_msk_iam_aws_region,
+        sasl_aws_msk_iam_session_token: sasl_aws_msk_iam_session_token,
         sasl_oauth_token_provider: sasl_oauth_token_provider,
         logger: @logger
       )

data/lib/kafka/connection.rb

@@ -127,12 +127,7 @@ module Kafka
       @logger.debug "Opening connection to #{@host}:#{@port} with client id #{@client_id}..."
 
       if @ssl_context
-        @socket = SSLSocketWithTimeout.new(@host,
-                                           @port,
-                                           connect_timeout: @connect_timeout,
-                                           timeout: @socket_timeout,
-                                           ssl_context: @ssl_context,
-                                           logger: @logger)
+        @socket = SSLSocketWithTimeout.new(@host, @port, connect_timeout: @connect_timeout, timeout: @socket_timeout, ssl_context: @ssl_context)
       else
         @socket = SocketWithTimeout.new(@host, @port, connect_timeout: @connect_timeout, timeout: @socket_timeout)
       end

data/lib/kafka/sasl/awsmskiam.rb

@@ -9,12 +9,13 @@ module Kafka
     class AwsMskIam
       AWS_MSK_IAM = "AWS_MSK_IAM"
 
-      def initialize(aws_region:, access_key_id:, secret_key_id:, logger:)
+      def initialize(aws_region:, access_key_id:, secret_key_id:, session_token: nil,logger:)
         @semaphore = Mutex.new
 
         @aws_region = aws_region
         @access_key_id = access_key_id
         @secret_key_id = secret_key_id
+        @session_token = session_token
         @logger = TaggedLogger.new(logger)
       end
 
@@ -71,6 +72,7 @@ module Kafka
           '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
       end
@@ -91,6 +93,7 @@ module Kafka
           "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-Expires" => "900",
+          "X-Amz-Security-Token" => @session_token,
           "X-Amz-SignedHeaders" => "host"
         )
       end

data/lib/kafka/sasl_authenticator.rb

@@ -14,8 +14,8 @@ module Kafka
                    sasl_oauth_token_provider:,
                    sasl_aws_msk_iam_access_key_id:,
                    sasl_aws_msk_iam_secret_key_id:,
-                   sasl_aws_msk_iam_aws_region:
-                  )
+                   sasl_aws_msk_iam_aws_region:,
+                   sasl_aws_msk_iam_session_token: nil)
       @logger = TaggedLogger.new(logger)
 
       @plain = Sasl::Plain.new(
@@ -42,6 +42,7 @@ module Kafka
         access_key_id: sasl_aws_msk_iam_access_key_id,
         secret_key_id: sasl_aws_msk_iam_secret_key_id,
         aws_region: sasl_aws_msk_iam_aws_region,
+        session_token: sasl_aws_msk_iam_session_token,
         logger: @logger,
       )
 

data/lib/kafka/ssl_socket_with_timeout.rb

@@ -21,13 +21,12 @@ module Kafka
     # @param timeout [Integer] the read and write timeout, in seconds.
     # @param ssl_context [OpenSSL::SSL::SSLContext] which SSLContext the ssl connection should use
     # @raise [Errno::ETIMEDOUT] if the timeout is exceeded.
-    def initialize(host, port, connect_timeout: nil, timeout: nil, ssl_context:, logger: nil)
+    def initialize(host, port, connect_timeout: nil, timeout: nil, ssl_context:)
       addr = Socket.getaddrinfo(host, nil)
       sockaddr = Socket.pack_sockaddr_in(port, addr[0][3])
 
       @connect_timeout = connect_timeout
       @timeout = timeout
-      @logger = logger
 
       @tcp_socket = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
       @tcp_socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
@@ -94,7 +93,6 @@ module Kafka
     def read(num_bytes)
       buffer = String.new
 
-      @logger.debug "Reading #{num_bytes} bytes from #{@ssl_socket}"
       until buffer.length >= num_bytes
         begin
           # Unlike plain TCP sockets, SSL sockets don't support IO.select
@@ -103,8 +101,6 @@ module Kafka
           # catch exceptions from read_nonblock and gradually build up
           # our read buffer.
           buffer << @ssl_socket.read_nonblock(num_bytes - buffer.length)
-
-          @logger.debug "Bytes read: #{buffer.length}"
         rescue IO::WaitReadable
           if select_with_timeout(@ssl_socket, :read)
             retry

data/lib/kafka/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-kafka-aws-iam
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.4
 platform: ruby
 authors:
 - Daniel Schierbeck