riemann-client 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33657c1dcec6dce903bd90154f17f3a31174b6e0fa146609941dc36960c2b6e2
-  data.tar.gz: 372a73585a2046e5af3a16ddd84254af64e6f6d17c6911183cf6c408eb22ac07
+  metadata.gz: 4d1995b06fc640ef8e66c806a1d89d59dfa58238c11049310255bf542121a4ea
+  data.tar.gz: dccb036f711cc73847cd81104756cd2d8b52fd9a5aa67c0528bd721a040ab504
 SHA512:
-  metadata.gz: 694404b98fe75bb304f8d8da0903eb128d2600ecd83bc3b6c3d4e2b41eef2695a82e6df00c0f9c3a59115837e58314e6cdb88d56c1b10c959bd912d69ace479c
-  data.tar.gz: 874fdd45638f808e1bf9641616fe5342c01c3a51245f9d66542a9aec60751a093462e70c123e027a463dcedfcb608dfc98087ae4ad189fd02aa97210b8e90fdd
+  metadata.gz: 3079702426c293a96a1e07b38ccffb281a53ab31ca653bfb5dcf2952a0a53c5e714b55e92d42ba28bb0cfff0b97bf472a2eb319dc90a12350f72273e4954bd09
+  data.tar.gz: 46c21db177b2d22c61bd82bfd94b62321b54c893a596f37daf9f8e1e9297a02689784d3637a8be54cd0d9b4dd4f9f7e21a10c91d1e5232fe001b84d984173c8f

data/.github/dependabot.yml

@@ -5,7 +5,14 @@
 
 version: 2
 updates:
+  # Open PR for gem updates
   - package-ecosystem: "bundler" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+
+  # Open PR for GitHub Actions updates
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.rubocop.yml

@@ -1,4 +1,6 @@
 ---
+AllCops:
+  TargetRubyVersion: 2.6
 require:
 - rubocop-rspec
 Metrics/AbcSize:
@@ -13,8 +15,5 @@ Metrics/MethodLength:
   Enabled: false
 Metrics/PerceivedComplexity:
   Enabled: false
-Naming/VariableNumber:
-  AllowedIdentifiers:
-  - TLSv1_2
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [v1.2.1](https://github.com/riemann/riemann-ruby-client/tree/v1.2.1) (2023-07-30)
+
+[Full Changelog](https://github.com/riemann/riemann-ruby-client/compare/v1.2.0...v1.2.1)
+
+**Fixed bugs:**
+
+- Fix sending large batch of events over TLS [\#51](https://github.com/riemann/riemann-ruby-client/pull/51) ([smortex](https://github.com/smortex))
+
+## [v1.2.0](https://github.com/riemann/riemann-ruby-client/tree/v1.2.0) (2023-06-28)
+
+[Full Changelog](https://github.com/riemann/riemann-ruby-client/compare/v1.1.0...v1.2.0)
+
+**Implemented enhancements:**
+
+- Allow connection to Riemann using TLS 1.3 [\#49](https://github.com/riemann/riemann-ruby-client/pull/49) ([smortex](https://github.com/smortex))
+
 ## [v1.1.0](https://github.com/riemann/riemann-ruby-client/tree/v1.1.0) (2023-01-23)
 
 [Full Changelog](https://github.com/riemann/riemann-ruby-client/compare/v1.0.1...v1.1.0)

data/lib/riemann/client/ssl_socket.rb

@@ -20,7 +20,7 @@ module Riemann
           ctx.key = OpenSSL::PKey::RSA.new(File.read(@key_file))
           ctx.cert = OpenSSL::X509::Certificate.new(File.read(@cert_file))
           ctx.ca_file = @ca_file if @ca_file
-          ctx.ssl_version = :TLSv1_2
+          ctx.min_version = OpenSSL::SSL::TLS1_2_VERSION
           ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER if @ssl_verify
         end
       end
@@ -53,40 +53,6 @@ module Riemann
         end
         ssl_socket
       end
-
-      # Internal: Read up to a maxlen of data from the socket and store it in outbuf
-      #
-      # maxlen - the maximum number of bytes to read from the socket
-      # outbuf - the buffer in which to store the bytes.
-      #
-      # Returns the bytes read
-      def readpartial(maxlen, outbuf = nil)
-        super(maxlen, outbuf)
-      rescue OpenSSL::SSL::SSLErrorWaitReadable
-        unless wait_readable(read_timeout)
-          raise Timeout, "Could not read from #{host}:#{port} in #{read_timeout} seconds"
-        end
-
-        retry
-      end
-
-      # Internal: Write the given data to the socket
-      #
-      # buf - the data to write to the socket.
-      #
-      # Raises an error if it is unable to write the data to the socket within the
-      # write_timeout.
-      #
-      # returns nothing
-      def write(buf)
-        super(buf)
-      rescue OpenSSL::SSL::SSLErrorWaitWritable
-        unless wait_writable(write_timeout)
-          raise Timeout, "Could not write to #{host}:#{port} in #{write_timeout} seconds"
-        end
-
-        retry
-      end
     end
   end
 end

data/lib/riemann/client/tcp.rb

@@ -17,7 +17,7 @@ module Riemann
 
       # Public: Return a socket factory
       def self.socket_factory
-        @socket_factory || proc { |options|
+        @socket_factory ||= proc { |options|
           if options[:ssl]
             SSLSocket.connect(options)
           else
@@ -29,6 +29,8 @@ module Riemann
       def initialize(options = {}) # rubocop:disable Lint/MissingSuper
         @options = options
         @locket  = Monitor.new
+        @socket  = nil
+        @pid     = nil
       end
 
       def socket

data/lib/riemann/client/tcp_socket.rb

@@ -311,7 +311,7 @@ module Riemann
       # Returns the bytes read
       def readpartial(maxlen, outbuf = nil)
         socket.read_nonblock(maxlen, outbuf)
-      rescue Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::ECONNRESET
+      rescue Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::ECONNRESET, IO::WaitReadable
         unless wait_readable(read_timeout)
           raise Timeout, "Could not read from #{host}:#{port} in #{read_timeout} seconds"
         end
@@ -332,11 +332,19 @@ module Riemann
           written = socket.write_nonblock(buf)
           buf = buf[written, buf.length]
         end
-      rescue Errno::EWOULDBLOCK, Errno::EINTR, Errno::EAGAIN, Errno::ECONNRESET
+      rescue Errno::EWOULDBLOCK, Errno::EINTR, Errno::EAGAIN, Errno::ECONNRESET, IO::WaitWritable
         unless wait_writable(write_timeout)
           raise Timeout, "Could not write to #{host}:#{port} in #{write_timeout} seconds"
         end
 
+        retry
+      rescue IO::WaitReadable
+        # Also rescued for SSL renegotiation in OpenSSL::SSL::SSLSocket according to
+        # https://ruby-doc.org/core-2.7.1/IO.html#method-c-select
+        unless wait_readable(read_timeout)
+          raise Timeout, "Could not write to #{host}:#{port} in #{write_timeout} seconds"
+        end
+
         retry
       end
 

data/lib/riemann/client/udp.rb

@@ -11,6 +11,7 @@ module Riemann
         @host     = opts[:host] || HOST
         @port     = opts[:port] || PORT
         @max_size = opts[:max_size] || MAX_SIZE
+        @socket   = nil
       end
 
       def socket

data/lib/riemann/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Riemann
-  VERSION = '1.1.0'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.15
 signing_key:
 specification_version: 4
 summary: Client for the distributed event system Riemann.