thrift 0.22.0 → 0.24.0

data/lib/thrift/protocol/json_protocol.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
-# 
+# frozen_string_literal: true
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -7,18 +8,16 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
-
-require 'base64'
+#
 
 module Thrift
   class LookaheadReader
@@ -181,6 +180,8 @@ module Thrift
         "set"
       when Types::LIST
         "lst"
+      when Types::UUID
+        "uid"
       else
         raise NotImplementedError
       end
@@ -209,6 +210,8 @@ module Thrift
         result = Types::SET
       elsif (name == "lst")
         result = Types::LIST
+      elsif (name == "uid")
+        result = Types::UUID
       else
         result = Types::STOP
       end
@@ -255,7 +258,7 @@ module Thrift
       if (ch_value.kind_of? String)
         ch_value = ch.bytes.first
       end
-      trans.write(ch_value.to_s(16).rjust(4,'0'))
+      trans.write(ch_value.to_s(16).rjust(4, '0'))
     end
 
     # Write the character ch as part of a JSON string, escaping as appropriate.
@@ -266,9 +269,9 @@ module Thrift
       # <other> : escape using "\<other>" notation
       kJSONCharTable = [
           # 0 1 2 3 4 5 6 7 8 9 A B C D E F
-          0, 0, 0, 0, 0, 0, 0, 0,'b','t','n', 0,'f','r', 0, 0, # 0
+          0, 0, 0, 0, 0, 0, 0, 0, 'b', 't', 'n', 0, 'f', 'r', 0, 0, # 0
           0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # 1
-          1, 1,'"', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, # 2
+          1, 1, '"', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, # 2
       ]
 
       ch_value = ch[0]
@@ -311,7 +314,7 @@ module Thrift
     def write_json_base64(str)
       @context.write(trans)
       trans.write(@@kJSONStringDelimiter)
-      trans.write(Base64.strict_encode64(str))
+      trans.write([str].pack('m0'))
       trans.write(@@kJSONStringDelimiter)
     end
 
@@ -477,6 +480,11 @@ module Thrift
       write_json_base64(str)
     end
 
+    def write_uuid(uuid)
+      UUID.validate_uuid!(uuid)
+      write_json_string(uuid.downcase)
+    end
+
     ##
     # Reading functions
     ##
@@ -493,15 +501,11 @@ module Thrift
     # characters above the BMP are encoded as two escape sequences (surrogate pairs),
     # which is not yet implemented
     def read_json_escape_char
-      str = @reader.read
-      str += @reader.read
-      str += @reader.read
-      str += @reader.read
-      if RUBY_VERSION >= '1.9'
-        str.hex.chr(Encoding::UTF_8)
-      else
-        str.hex.chr
-      end
+      str = +@reader.read
+      str << @reader.read
+      str << @reader.read
+      str << @reader.read
+      str.hex.chr(Encoding::UTF_8)
     end
 
     # Decodes a JSON string, including unescaping, and returns the string via str
@@ -521,8 +525,7 @@ module Thrift
         @context.read(@reader)
       end
       read_json_syntax_char(@@kJSONStringDelimiter)
-      ch = ""
-      str = ""
+      str = +''
       while (true)
         ch = @reader.read
         if (ch == @@kJSONStringDelimiter)
@@ -540,7 +543,7 @@ module Thrift
             ch = escape_char_vals[pos]
           end
         end
-        str += ch
+        str << ch
       end
       return str
     end
@@ -555,20 +558,20 @@ module Thrift
           str += '='
         end
       end
-      Base64.strict_decode64(str)
+      str.unpack1('m0')
     end
 
     # Reads a sequence of characters, stopping at the first one that is not
     # a valid JSON numeric character.
     def read_json_numeric_chars
-      str = ""
+      str = String.new(encoding: Encoding::UTF_8)
       while (true)
         ch = @reader.peek
         if (!is_json_numeric(ch))
           break;
         end
         ch = @reader.read
-        str += ch
+        str << ch
       end
       return str
     end
@@ -709,6 +712,7 @@ module Thrift
       key_type = get_type_id_for_type_name(read_json_string)
       val_type = get_type_id_for_type_name(read_json_string)
       size = read_json_integer
+      validate_container_size(size)
       read_json_object_start
       [key_type, val_type, size]
     end
@@ -720,7 +724,10 @@ module Thrift
 
     def read_list_begin
       read_json_array_start
-      [get_type_id_for_type_name(read_json_string), read_json_integer]
+      type = get_type_id_for_type_name(read_json_string)
+      size = read_json_integer
+      validate_container_size(size)
+      [type, size]
     end
 
     def read_list_end
@@ -729,7 +736,10 @@ module Thrift
 
     def read_set_begin
       read_json_array_start
-      [get_type_id_for_type_name(read_json_string), read_json_integer]
+      type = get_type_id_for_type_name(read_json_string)
+      size = read_json_integer
+      validate_container_size(size)
+      [type, size]
     end
 
     def read_set_end
@@ -769,6 +779,13 @@ module Thrift
       read_json_base64
     end
 
+    def read_uuid
+      uuid = read_json_string
+      raise EOFError.new if uuid.length < 36
+      UUID.validate_uuid!(uuid)
+      uuid.tap(&:downcase!)
+    end
+
     def to_s
       "json(#{super.to_s})"
     end

data/lib/thrift/protocol/multiplexed_protocol.rb

@@ -1,4 +1,5 @@
-# 
+# frozen_string_literal: true
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -34,9 +35,9 @@ module Thrift
         @protocol.write_message_begin("#{@service_name}:#{name}", type, seqid)
       else
         @protocol.write_message_begin(name, type, seqid)
-      end 
+      end
     end
-    
+
     def to_s
       "multiplexed(#{@service_name=@protocol.to_s})"
     end

data/lib/thrift/protocol/protocol_decorator.rb

@@ -1,4 +1,5 @@
-# 
+# frozen_string_literal: true
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -111,6 +112,10 @@ module Thrift
       @protocol.write_binary(buf)
     end
 
+    def write_uuid(uuid)
+      @protocol.write_uuid(uuid)
+    end
+
     def read_message_begin
       @protocol.read_message_begin
     end
@@ -190,5 +195,9 @@ module Thrift
     def read_binary
       @protocol.read_binary
     end
+
+    def read_uuid
+      @protocol.read_uuid
+    end
   end
-end
+end

data/lib/thrift/serializer/deserializer.rb

@@ -1,4 +1,5 @@
-# 
+# frozen_string_literal: true
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,16 +7,16 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
+#
 
 module Thrift
   class Deserializer
@@ -30,4 +31,4 @@ module Thrift
       base
     end
   end
-end
+end

data/lib/thrift/serializer/serializer.rb

@@ -1,4 +1,5 @@
-# 
+# frozen_string_literal: true
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,16 +7,16 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
+#
 
 module Thrift
   class Serializer
@@ -31,4 +32,3 @@ module Thrift
     end
   end
 end
-

data/lib/thrift/server/base_server.rb

@@ -1,4 +1,5 @@
-# 
+# frozen_string_literal: true
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,7 +20,7 @@
 
 module Thrift
   class BaseServer
-    def initialize(processor, server_transport, transport_factory=nil, protocol_factory=nil)
+    def initialize(processor, server_transport, transport_factory = nil, protocol_factory = nil)
       @processor = processor
       @server_transport = server_transport
       @transport_factory = transport_factory ? transport_factory : Thrift::BaseTransportFactory.new

data/lib/thrift/server/mongrel_http_server.rb

@@ -1,4 +1,5 @@
-# 
+# frozen_string_literal: true
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,16 +7,16 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
+#
 
 require 'mongrel'
 
@@ -38,12 +39,12 @@ module Thrift
             @processor.process protocol, protocol
           end
         else
-          response.start(404) { }
+          response.start(404) {}
         end
       end
     end
 
-    def initialize(processor, opts={})
+    def initialize(processor, opts = {})
       Kernel.warn "[DEPRECATION WARNING] `Thrift::MongrelHTTPServer` is deprecated.  Please use `Thrift::ThinHTTPServer` instead."
       port = opts[:port] || 80
       ip = opts[:ip] || "0.0.0.0"

data/lib/thrift/server/nonblocking_server.rb

@@ -1,4 +1,5 @@
-# 
+# frozen_string_literal: true
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,16 +7,16 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
+#
 
 require 'logger'
 require 'thread'
@@ -23,7 +24,7 @@ require 'thread'
 module Thrift
   # this class expects to always use a FramedTransport for reading messages
   class NonblockingServer < BaseServer
-    def initialize(processor, server_transport, transport_factory=nil, protocol_factory=nil, num=20, logger=nil)
+    def initialize(processor, server_transport, transport_factory = nil, protocol_factory = nil, num = 20, logger = nil)
       super(processor, server_transport, transport_factory, protocol_factory)
       @num_threads = num
       if logger.nil?
@@ -97,7 +98,7 @@ module Thrift
 
     class IOManager # :nodoc:
       DEFAULT_BUFFER = 2**20
-      
+
       def initialize(processor, server_transport, transport_factory, protocol_factory, num, logger)
         @processor = processor
         @server_transport = server_transport
@@ -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,11 +139,16 @@ 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
-      
+
       def run
         spin_worker_threads
 
@@ -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,4 +1,5 @@
-# 
+# frozen_string_literal: true
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -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
@@ -39,7 +47,7 @@ module Thrift
         @server_transport.close
       end
     end
-    
+
     def to_s
       "simple(#{super.to_s})"
     end

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
@@ -32,7 +33,7 @@ module Thrift
     # * :ip
     # * :path
     # * :protocol_factory
-    def initialize(processor, options={})
+    def initialize(processor, options = {})
       port = options[:port] || 80
       ip = options[:ip] || "0.0.0.0"
       path = options[:path] || "/"
@@ -60,9 +61,9 @@ module Thrift
             run lambda { |env|
               request = Rack::Request.new(env)
               if RackApplication.valid_thrift_request?(request)
-                RackApplication.successful_request(request, processor, protocol_factory)
+                RackApplication.successful_request(request, processor, protocol_factory).finish
               else
-                RackApplication.failed_request
+                RackApplication.failed_request.finish
               end
             }
           end

data/lib/thrift/server/thread_pool_server.rb

@@ -1,4 +1,5 @@
-# 
+# frozen_string_literal: true
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,22 +7,22 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied. See the License for the
 # specific language governing permissions and limitations
 # under the License.
-# 
+#
 
 require 'thread'
 
 module Thrift
   class ThreadPoolServer < BaseServer
-    def initialize(processor, server_transport, transport_factory=nil, protocol_factory=nil, num=20)
+    def initialize(processor, server_transport, transport_factory = nil, protocol_factory = nil, num = 20)
       super(processor, server_transport, transport_factory, protocol_factory)
       @thread_q = SizedQueue.new(num)
       @exception_q = Queue.new
@@ -71,7 +72,7 @@ module Thrift
         @server_transport.close
       end
     end
-    
+
     def to_s
       "threadpool(#{super.to_s})"
     end

data/lib/thrift/server/threaded_server.rb

@@ -1,4 +1,5 @@
-# 
+# frozen_string_literal: true
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements. See the NOTICE file
 # distributed with this work for additional information
@@ -6,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License. You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -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|
@@ -43,7 +51,7 @@ module Thrift
         @server_transport.close
       end
     end
-    
+
     def to_s
       "threaded(#{super.to_s})"
     end