thrift 0.23.0 → 0.24.0

data/lib/thrift/server/mongrel_http_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file

data/lib/thrift/server/nonblocking_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -106,7 +107,7 @@ module Thrift
         @num_threads = num
         @logger = logger
         @connections = []
-        @buffers = Hash.new { |h, k| h[k] = '' }
+        @buffers = Hash.new { |h, k| h[k] = Bytes.empty_byte_buffer }
         @signal_queue = Queue.new
         @signal_pipes = IO.pipe
         @signal_pipes[1].sync = true
@@ -138,7 +139,12 @@ module Thrift
 
       def ensure_closed
         kill_worker_threads if @worker_threads
-        @iom_thread.kill
+        if @iom_thread&.alive?
+          @iom_thread.kill
+          @iom_thread.join
+        end
+        close_connections
+        close_signal_pipes
       end
 
       private
@@ -246,6 +252,26 @@ module Thrift
         @worker_threads.clear
       end
 
+      def close_connections
+        @connections.each do |fd|
+          begin
+            fd.close
+          rescue IOError, SystemCallError, TransportException
+          end
+        end
+        @connections.clear
+        @buffers.clear
+      end
+
+      def close_signal_pipes
+        @signal_pipes.each do |pipe|
+          begin
+            pipe.close unless pipe.closed?
+          rescue IOError
+          end
+        end
+      end
+
       def slice_frame!(buf)
         if buf.length >= 4
           size = buf.unpack('N').first

data/lib/thrift/server/simple_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -23,7 +24,14 @@ module Thrift
       begin
         @server_transport.listen
         loop do
-          client = @server_transport.accept
+          begin
+            client = @server_transport.accept
+          rescue Errno::ECONNRESET, Errno::EPIPE
+            next
+          rescue => e
+            next if defined?(OpenSSL::SSL::SSLError) && e.is_a?(OpenSSL::SSL::SSLError)
+            raise
+          end
           trans = @transport_factory.get_transport(client)
           prot = @protocol_factory.get_protocol(trans)
           begin

data/lib/thrift/server/thin_http_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file

data/lib/thrift/server/thread_pool_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file

data/lib/thrift/server/threaded_server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -25,7 +26,14 @@ module Thrift
       begin
         @server_transport.listen
         loop do
-          client = @server_transport.accept
+          begin
+            client = @server_transport.accept
+          rescue Errno::ECONNRESET, Errno::EPIPE
+            next
+          rescue => e
+            next if defined?(OpenSSL::SSL::SSLError) && e.is_a?(OpenSSL::SSL::SSLError)
+            raise
+          end
           trans = @transport_factory.get_transport(client)
           prot = @protocol_factory.get_protocol(trans)
           Thread.new(prot, trans) do |p, t|

data/lib/thrift/struct.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file

data/lib/thrift/struct_union.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -20,12 +21,6 @@ require 'set'
 
 module Thrift
   module Struct_Union
-    def validate_container_size(size)
-      return size unless size < 0
-
-      raise ProtocolException.new(ProtocolException::NEGATIVE_SIZE, 'Negative size')
-    end
-
     def name_to_id(name)
       names_to_ids = self.class.instance_variable_get(:@names_to_ids)
       unless names_to_ids
@@ -61,7 +56,7 @@ module Thrift
         value.read(iprot)
       when Types::MAP
         key_type, val_type, size = iprot.read_map_begin
-        validate_container_size(size)
+        raise ProtocolException.new(ProtocolException::NEGATIVE_SIZE, 'Negative size') unless size >= 0
         # Skip the map contents if the declared key or value types don't match the expected ones.
         if (size != 0 && (key_type != field[:key][:type] || val_type != field[:value][:type]))
           size.times do
@@ -80,7 +75,7 @@ module Thrift
         iprot.read_map_end
       when Types::LIST
         e_type, size = iprot.read_list_begin
-        validate_container_size(size)
+        raise ProtocolException.new(ProtocolException::NEGATIVE_SIZE, 'Negative size') unless size >= 0
         # Skip the list contents if the declared element type doesn't match the expected one.
         if (e_type != field[:element][:type])
           size.times do
@@ -96,7 +91,7 @@ module Thrift
         iprot.read_list_end
       when Types::SET
         e_type, size = iprot.read_set_begin
-        validate_container_size(size)
+        raise ProtocolException.new(ProtocolException::NEGATIVE_SIZE, 'Negative size') unless size >= 0
         # Skip the set contents if the declared element type doesn't match the expected one.
         if (e_type != field[:element][:type])
           size.times do

data/lib/thrift/thrift_native.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -20,5 +21,5 @@
 begin
   require "thrift_native"
 rescue LoadError
-  puts "Unable to load thrift_native extension. Defaulting to pure Ruby libraries."
+  warn "Unable to load thrift_native extension. Defaulting to pure Ruby libraries."
 end

data/lib/thrift/transport/base_server_transport.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -20,6 +21,8 @@
 
 module Thrift
   class BaseServerTransport
+    DEFAULT_CLIENT_TIMEOUT = 5
+
     def listen
       raise NotImplementedError
     end

data/lib/thrift/transport/base_transport.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -25,6 +26,8 @@ module Thrift
     ALREADY_OPEN = 2
     TIMED_OUT = 3
     END_OF_FILE = 4
+    NEGATIVE_SIZE = 5
+    SIZE_LIMIT = 6
 
     attr_reader :type
 
@@ -80,8 +83,9 @@ module Thrift
     end
 
     def read_all(size)
-      return Bytes.empty_byte_buffer if size <= 0
-      buf = read(size)
+      raise TransportException.new(TransportException::NEGATIVE_SIZE, 'Negative size') unless size >= 0
+      return Bytes.empty_byte_buffer if size == 0
+      buf = Bytes.force_binary_encoding(read(size))
       while (buf.length < size)
         chunk = read(size - buf.length)
         buf << chunk

data/lib/thrift/transport/buffered_transport.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file

data/lib/thrift/transport/framed_transport.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file

data/lib/thrift/transport/header_transport.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -73,6 +74,12 @@ module Thrift
     # Maximum frame size (~1GB)
     MAX_FRAME_SIZE = 0x3FFFFFFF
 
+    # Default decompressed-size cap for ZLIB transform (~15.6 MB, matches other Thrift bindings)
+    DEFAULT_MAX_DECOMPRESSED_SIZE = 16_384_000
+
+    # Chunk size for streaming inflate loop
+    ZLIB_INFLATE_CHUNK_SIZE = 16_384
+
     # Binary protocol version mask and version 1
     BINARY_VERSION_MASK = 0xffff0000
     BINARY_VERSION_1 = 0x80010000
@@ -112,6 +119,7 @@ module Thrift
       @sequence_id = 0
       @flags = 0
       @max_frame_size = MAX_FRAME_SIZE
+      @max_decompressed_size = DEFAULT_MAX_DECOMPRESSED_SIZE
     end
 
     def sequence_id=(sequence_id)
@@ -172,6 +180,14 @@ module Thrift
       @max_frame_size = size
     end
 
+    # Sets the maximum allowed decompressed size for ZLIB transforms
+    def set_max_decompressed_size(size)
+      if size <= 0 || size > MAX_FRAME_SIZE
+        raise ArgumentError, "max_decompressed_size must be > 0 and <= #{MAX_FRAME_SIZE}"
+      end
+      @max_decompressed_size = size
+    end
+
     def read(sz)
       # Try reading from existing buffer
       data = @read_buffer.read(sz)
@@ -369,13 +385,43 @@ module Thrift
       payload = buf.read
       transforms.each do |transform_id|
         if transform_id == HeaderTransformID::ZLIB
-          payload = Zlib::Inflate.inflate(payload)
+          payload = bounded_inflate(payload)
         end
       end
 
       StringIO.new(payload)
     end
 
+    # Inflates +compressed+ with a running byte-count check against @max_decompressed_size.
+    # Raises TransportException::SIZE_LIMIT if the decompressed output would exceed the limit.
+    def bounded_inflate(compressed)
+      inflater = Zlib::Inflate.new
+      buffer = Bytes.empty_byte_buffer
+      offset = 0
+      begin
+        while offset < compressed.bytesize
+          buffer << inflater.inflate(compressed.byteslice(offset, ZLIB_INFLATE_CHUNK_SIZE))
+          if buffer.bytesize > @max_decompressed_size
+            raise TransportException.new(
+              TransportException::SIZE_LIMIT,
+              "Decompressed size exceeds limit of #{@max_decompressed_size}"
+            )
+          end
+          offset += ZLIB_INFLATE_CHUNK_SIZE
+        end
+        buffer << inflater.finish
+        if buffer.bytesize > @max_decompressed_size
+          raise TransportException.new(
+            TransportException::SIZE_LIMIT,
+            "Decompressed size exceeds limit of #{@max_decompressed_size}"
+          )
+        end
+        buffer
+      ensure
+        inflater.close rescue nil
+      end
+    end
+
     # Flushes data in Header format
     def flush_header_format(payload)
       # Apply transforms

data/lib/thrift/transport/http_client_transport.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file

data/lib/thrift/transport/io_stream_transport.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file

data/lib/thrift/transport/memory_buffer_transport.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -70,6 +71,12 @@ module Thrift
       data
     end
 
+    def read_all(size)
+      raise TransportException.new(TransportException::NEGATIVE_SIZE, 'Negative size') unless size >= 0
+
+      read(size)
+    end
+
     def read_byte
       raise EOFError.new("Not enough bytes remain in buffer") if @index >= @buf.size
       val = Bytes.get_string_byte(@buf, @index)

data/lib/thrift/transport/server_socket.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -22,8 +23,8 @@ require 'socket'
 
 module Thrift
   class ServerSocket < BaseServerTransport
-    # call-seq: initialize(host = nil, port)
-    def initialize(host_or_port, port = nil)
+    # call-seq: initialize(host = nil, port, client_timeout: DEFAULT_CLIENT_TIMEOUT)
+    def initialize(host_or_port, port = nil, client_timeout: DEFAULT_CLIENT_TIMEOUT)
       if port
         @host = host_or_port
         @port = port
@@ -31,10 +32,11 @@ module Thrift
         @host = nil
         @port = host_or_port
       end
+      @client_timeout = client_timeout
       @handle = nil
     end
 
-    attr_reader :handle
+    attr_reader :handle, :client_timeout
 
     def listen
       @handle = TCPServer.new(@host, @port)
@@ -45,6 +47,7 @@ module Thrift
         sock = @handle.accept
         sock.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, 1)
         trans = Socket.new
+        trans.timeout = @client_timeout
         trans.handle = sock
         trans
       end

data/lib/thrift/transport/socket.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -33,39 +34,19 @@ module Thrift
     attr_accessor :handle, :timeout
 
     def open
-      for addrinfo in ::Socket::getaddrinfo(@host, @port, nil, ::Socket::SOCK_STREAM) do
-        begin
-          socket = ::Socket.new(addrinfo[4], ::Socket::SOCK_STREAM, 0)
-          socket.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, 1)
-          sockaddr = ::Socket.sockaddr_in(addrinfo[1], addrinfo[3])
-          begin
-            socket.connect_nonblock(sockaddr)
-          rescue Errno::EINPROGRESS
-            unless IO.select(nil, [ socket ], nil, @timeout)
-              next
-            end
-            begin
-              socket.connect_nonblock(sockaddr)
-            rescue Errno::EISCONN
-            end
-          end
-          return @handle = socket
-        rescue StandardError => e
-          next
-        end
-      end
-      raise TransportException.new(TransportException::NOT_OPEN, "Could not connect to #{@desc}: #{e}")
+      deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout unless @timeout.nil? || @timeout == 0
+      @handle = connect_socket(deadline)
     end
 
     def open?
-      !@handle.nil? and !@handle.closed?
+      !@handle.nil? && !@handle.closed?
     end
 
     def write(str)
       raise TransportException.new(TransportException::NOT_OPEN, "closed stream") unless open?
       str = Bytes.force_binary_encoding(str)
       begin
-        if @timeout.nil? or @timeout == 0
+        if @timeout.nil? || @timeout == 0
           @handle.write(str)
         else
           deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
@@ -87,7 +68,7 @@ module Thrift
         # pass this on
         raise e
       rescue StandardError => e
-        @handle.close
+        close_socket(@handle)
         @handle = nil
         raise TransportException.new(TransportException::NOT_OPEN, e.message)
       end
@@ -97,7 +78,7 @@ module Thrift
       raise TransportException.new(TransportException::NOT_OPEN, "closed stream") unless open?
 
       begin
-        if @timeout.nil? or @timeout == 0
+        if @timeout.nil? || @timeout == 0
           data = @handle.readpartial(sz)
         else
           deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
@@ -116,18 +97,18 @@ module Thrift
         # don't let this get caught by the StandardError handler
         raise e
       rescue StandardError => e
-        @handle.close unless @handle.closed?
+        close_socket(@handle)
         @handle = nil
         raise TransportException.new(TransportException::NOT_OPEN, e.message)
       end
-      if (data.nil? or data.length == 0)
+      if (data.nil? || data.length == 0)
         raise TransportException.new(TransportException::UNKNOWN, "Socket: Could not read #{sz} bytes from #{@desc}")
       end
       data
     end
 
     def close
-      @handle.close unless @handle.nil? or @handle.closed?
+      close_socket(@handle)
       @handle = nil
     end
 
@@ -141,6 +122,64 @@ module Thrift
 
     private
 
+    def connect_socket(deadline)
+      last_error = nil
+      connected_socket = nil
+
+      Addrinfo.foreach(@host, @port, nil, :STREAM) do |addrinfo|
+        socket = nil
+
+        begin
+          socket = if deadline
+            remaining = deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC)
+            raise TransportException.new(TransportException::TIMED_OUT, "Socket: Timed out opening connection to #{@desc}") if remaining <= 0
+
+            addrinfo.connect(timeout: remaining)
+          else
+            addrinfo.connect
+          end
+
+          socket.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, 1)
+          connected_socket = socket
+          break
+        rescue Errno::ETIMEDOUT => e
+          close_socket(socket)
+          last_error = e
+        rescue TransportException
+          close_socket(socket)
+          raise
+        rescue StandardError => e
+          close_socket(socket)
+          last_error = e
+        end
+      end
+
+      return connected_socket if connected_socket
+
+      if last_error.is_a?(Errno::ETIMEDOUT)
+        raise TransportException.new(TransportException::TIMED_OUT, "Socket: Timed out opening connection to #{@desc}")
+      end
+
+      if deadline && deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC) <= 0
+        raise TransportException.new(TransportException::TIMED_OUT, "Socket: Timed out opening connection to #{@desc}")
+      end
+
+      raise TransportException.new(TransportException::NOT_OPEN, "Could not connect to #{@desc}"), cause: last_error
+    rescue TransportException
+      raise
+    rescue StandardError
+      raise TransportException.new(TransportException::NOT_OPEN, "Could not connect to #{@desc}")
+    end
+
+    def close_socket(socket)
+      return if socket.nil?
+      return if socket.respond_to?(:closed?) && socket.closed?
+
+      socket.close
+    rescue StandardError
+      nil
+    end
+
     def wait_for(operation, deadline, sz)
       rd_ary, wr_ary = case operation
       when :read

data/lib/thrift/transport/ssl_server_socket.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -22,8 +23,8 @@ require 'socket'
 
 module Thrift
   class SSLServerSocket < ServerSocket
-    def initialize(host_or_port, port = nil, ssl_context = nil)
-      super(host_or_port, port)
+    def initialize(host_or_port, port = nil, ssl_context = nil, client_timeout: DEFAULT_CLIENT_TIMEOUT)
+      super(host_or_port, port, client_timeout: client_timeout)
       @ssl_context = ssl_context
     end
 

data/lib/thrift/transport/ssl_socket.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -17,6 +18,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'io/wait'
+
 module Thrift
   class SSLSocket < Socket
     def initialize(host = 'localhost', port = 9090, timeout = nil, ssl_context = nil)
@@ -27,20 +30,49 @@ module Thrift
     attr_accessor :ssl_context
 
     def open
-      socket = super
-      @handle = OpenSSL::SSL::SSLSocket.new(socket, @ssl_context)
+      deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout unless @timeout.nil? || @timeout == 0
+      socket = connect_socket(deadline)
+
       begin
-        @handle.connect_nonblock
+        ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, @ssl_context)
+        ssl_socket.sync_close = true
+        @handle = ssl_socket
+
+        if deadline
+          loop do
+            result = @handle.connect_nonblock(exception: false)
+
+            case result
+            when @handle
+              break
+            when :wait_readable
+              remaining = deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC)
+              if remaining <= 0 || !@handle.to_io.wait_readable(remaining)
+                raise TransportException.new(TransportException::TIMED_OUT, "SSL socket: Timed out establishing session with #{@desc}")
+              end
+            when :wait_writable
+              remaining = deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC)
+              if remaining <= 0 || !@handle.to_io.wait_writable(remaining)
+                raise TransportException.new(TransportException::TIMED_OUT, "SSL socket: Timed out establishing session with #{@desc}")
+              end
+            else
+              raise TransportException.new(TransportException::NOT_OPEN, "Could not connect to #{@desc}: unexpected SSL connect result #{result.inspect}")
+            end
+          end
+        else
+          @handle.connect
+        end
+
         @handle.post_connection_check(@host)
         @handle
-      rescue IO::WaitReadable
-        IO.select([ @handle ], nil, nil, @timeout)
-        retry
-      rescue IO::WaitWritable
-        IO.select(nil, [ @handle ], nil, @timeout)
-        retry
-      rescue StandardError => e
-        raise TransportException.new(TransportException::NOT_OPEN, "Could not connect to #{@desc}: #{e}")
+      rescue TransportException
+        close_socket(@handle)
+        @handle = nil
+        raise
+      rescue StandardError
+        close_socket(@handle || socket)
+        @handle = nil
+        raise TransportException.new(TransportException::NOT_OPEN, "Could not connect to #{@desc}")
       end
     end
 

data/lib/thrift/transport/unix_server_socket.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
@@ -22,12 +23,14 @@ require 'socket'
 
 module Thrift
   class UNIXServerSocket < BaseServerTransport
-    def initialize(path)
+    def initialize(path, client_timeout: DEFAULT_CLIENT_TIMEOUT)
       @path = path
+      @client_timeout = client_timeout
       @handle = nil
     end
 
     attr_accessor :handle
+    attr_reader :client_timeout
 
     def listen
       @handle = ::UNIXServer.new(@path)
@@ -37,6 +40,7 @@ module Thrift
       unless @handle.nil?
         sock = @handle.accept
         trans = UNIXSocket.new(nil)
+        trans.timeout = @client_timeout
         trans.handle = sock
         trans
       end

data/lib/thrift/transport/unix_socket.rb

@@ -1,4 +1,5 @@
 # encoding: ascii-8bit
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file

data/lib/thrift/types.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file