stomp 1.4.4 → 1.4.5

data/lib/connection/utf8.rb

@@ -31,17 +31,10 @@ module Stomp
       #
       valid = true
       index = -1
-      nb_hex = nil
-      ni_hex = nil
       state = "start"
-      next_byte_save = nil
       #
       bytes.each do |next_byte|
         index += 1
-        next_byte_save = next_byte
-        ni_hex = sprintf "%x", index
-        nb_hex = sprintf "%x", next_byte
-        # puts "Top: #{next_byte}(0x#{nb_hex}), index: #{index}(0x#{ni_hex})" if DEBUG
         case state
 
           # State: 'start'

data/lib/connection/utils.rb

@@ -247,7 +247,10 @@ module Stomp
       while true
         begin
           used_socket = socket()
-          return _receive(used_socket)
+
+          connread = false
+          noiosel = (@ssl || @jruby) ? true : false
+          return _receive(used_socket, connread, noiosel)
         rescue Stomp::Error::MaxReconnectAttempts
           unless slog(:on_miscerr, log_params, "Reached MaxReconnectAttempts")
             $stderr.print "Reached MaxReconnectAttempts\n"

data/lib/stomp/client.rb

@@ -57,6 +57,7 @@ module Stomp
     #     :start_timeout => 0,                # Timeout around Stomp::Client initialization
     #     :sslctx_newparm => nil,             # Param for SSLContext.new
     #     :ssl_post_conn_check => true,       # Further verify broker identity
+    #     :nto_cmd_read => true,              # No timeout on COMMAND read
     #   }
     #
     #   e.g. c = Stomp::Client.new(hash)
@@ -100,7 +101,7 @@ module Stomp
           create_connection(autoflush)
           start_listeners()
         }
-      rescue TimeoutError
+      rescue Timeout::Error
         # p [ "cldbg02" ]
         ex = Stomp::Error::StartTimeoutException.new(@start_timeout)
         raise ex
@@ -109,6 +110,9 @@ module Stomp
 
     def create_error_handler
       client_thread = Thread.current
+      if client_thread.respond_to?(:report_on_exception=)
+        client_thread.report_on_exception=false
+      end
 
       @error_listener = lambda do |error|
         exception = case error.body

data/lib/stomp/connection.rb

@@ -94,6 +94,7 @@ module Stomp
     #     :start_timeout => 0,                # Timeout around Stomp::Client initialization
     #     :sslctx_newparm => nil,             # Param for SSLContext.new
     #     :ssl_post_conn_check => true,       # Further verify broker identity
+    #     :nto_cmd_read => true,              # No timeout on COMMAND read
     #   }
     #
     #   e.g. c = Stomp::Connection.new(hash)
@@ -120,6 +121,12 @@ module Stomp
       if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
         @jruby = true
       end
+
+      ct = Thread.current
+      if ct.respond_to?(:report_on_exception=)
+        ct.report_on_exception=false
+      end
+
       if login.is_a?(Hash)
         hashed_initialize(login)
       else
@@ -148,6 +155,7 @@ module Stomp
         @start_timeout = 0 # Client only, startup timeout
         @sslctx_newparm = nil # SSLContext.new paramater
         @ssl_post_conn_check = true # Additional broker verification
+        @nto_cmd_read = true # No timeout on COMMAND read
         warn "login looks like a URL, do you have the correct parameters?" if @login =~ /:\/\//
       end
 
@@ -187,6 +195,7 @@ module Stomp
       @connread_timeout = @parameters[:connread_timeout]
       @sslctx_newparm = @parameters[:sslctx_newparm]
       @ssl_post_conn_check = @parameters[:ssl_post_conn_check]
+      @nto_cmd_read = @parameters[:nto_cmd_read]
       #
       # Try to support Ruby 1.9.x and 2.x ssl.
       unless defined?(RSpec)
@@ -257,18 +266,18 @@ module Stomp
 
       case @protocol
         when Stomp::SPL_12
-          # The ACK frame MUST include an "id" header matching the "ack" header 
+          # The ACK frame MUST include an "id" header matching the "ack" header
           # of the MESSAGE being acknowledged.
           headers[:id] = message_or_ack_id
         when Stomp::SPL_11
-          # ACK has two REQUIRED headers: "message-id", which MUST contain a value 
-          # matching the message-id header of the MESSAGE being acknowledged and 
-          # "subscription", which MUST be set to match the value of SUBSCRIBE's 
+          # ACK has two REQUIRED headers: "message-id", which MUST contain a value
+          # matching the message-id header of the MESSAGE being acknowledged and
+          # "subscription", which MUST be set to match the value of SUBSCRIBE's
           # id header.
           headers[:'message-id'] = message_or_ack_id
           raise Stomp::Error::SubscriptionRequiredError unless headers[:subscription]
         else # Stomp::SPL_10
-          # ACK has one required header, "message-id", which must contain a value 
+          # ACK has one required header, "message-id", which must contain a value
           # matching the message-id for the MESSAGE being acknowledged.
           headers[:'message-id'] = message_or_ack_id
       end
@@ -294,13 +303,13 @@ module Stomp
       headers = headers.symbolize_keys
       case @protocol
         when Stomp::SPL_12
-          # The NACK frame MUST include an id header matching the ack header 
+          # The NACK frame MUST include an id header matching the ack header
           # of the MESSAGE being acknowledged.
           headers[:id] = message_or_ack_id
         else # Stomp::SPL_11 only
-          # NACK has two REQUIRED headers: message-id, which MUST contain a value 
-          # matching the message-id for the MESSAGE being acknowledged and 
-          # subscription, which MUST be set to match the value of the subscription's 
+          # NACK has two REQUIRED headers: message-id, which MUST contain a value
+          # matching the message-id for the MESSAGE being acknowledged and
+          # subscription, which MUST be set to match the value of the subscription's
           # id header.
           headers[:'message-id'] = message_or_ack_id
           raise Stomp::Error::SubscriptionRequiredError unless headers[:subscription]
@@ -350,6 +359,8 @@ module Stomp
       _headerCheck(headers)
       slog(:on_subscribe, log_params, headers)
 
+      ## p [ "subId", subId ]
+      ## p [ "subscriptions", @subscriptions ]
       # Store the subscription so that we can replay if we reconnect.
       if @reliable
         subId = destination if subId.nil?
@@ -422,13 +433,13 @@ module Stomp
         end
 
         if message.headers[:retry_count] <= options[:max_redeliveries]
-          self.publish(message.headers[:destination], message.body, 
+          self.publish(message.headers[:destination], message.body,
             message.headers.merge(:transaction => transaction_id))
         else
           # Poison ack, sending the message to the DLQ
-          self.publish(options[:dead_letter_queue], message.body, 
-            message.headers.merge(:transaction => transaction_id, 
-            :original_destination => message.headers[:destination], 
+          self.publish(options[:dead_letter_queue], message.body,
+            message.headers.merge(:transaction => transaction_id,
+            :original_destination => message.headers[:destination],
             :persistent => true))
         end
         self.commit transaction_id
@@ -444,7 +455,7 @@ module Stomp
       !headers.nil? && headers[:ack] == "client"
     end
 
-    # disconnect closes this connection.  If requested, a disconnect RECEIPT 
+    # disconnect closes this connection.  If requested, a disconnect RECEIPT
     # will be received.
     def disconnect(headers = {})
       raise Stomp::Error::NoCurrentConnection if @closed_check && closed?
@@ -574,4 +585,3 @@ module Stomp
   end # class
 
 end # module
-

data/lib/stomp/constants.rb

@@ -21,6 +21,10 @@ module Stomp
   CMD_RECEIPT   = "RECEIPT"
   CMD_ERROR     = "ERROR"
 
+  # Server Frames
+  SERVER_FRAMES = {CMD_CONNECTED => true, CMD_MESSAGE => true,
+    CMD_RECEIPT => true, CMD_ERROR => true}
+
   # Protocols
   SPL_10 = "1.0"
   SPL_11 = "1.1"
@@ -175,6 +179,111 @@ module Stomp
     ["SRP-RSA-AES-256-CBC-SHA","TLSv1/SSLv3",256,256],
   ]
 
+  #
+# SSL cipher lists used can be in several different formats.  One format
+# is a simple Array of strings listing the cipher names.
+# That format is used here.
+#
+# This list was generated using the 'openssl ciphers' command.
+# The openssl version was: OpenSSL 1.0.2g  1 Mar 2016
+#
+# The specific command used to generate this list was:
+#
+# openssl ciphers -v 'DEFAULT:!RC4:!SSLv2:HIGH:@STRENGTH' | cut -d" " -f1 | sed 's/^/\t"/;s/$/",/'
+#
+CIPHERS_OPENSSL = [
+  "ECDHE-RSA-AES256-GCM-SHA384",
+  "ECDHE-ECDSA-AES256-GCM-SHA384",
+  "ECDHE-RSA-AES256-SHA384",
+  "ECDHE-ECDSA-AES256-SHA384",
+  "ECDHE-RSA-AES256-SHA",
+  "ECDHE-ECDSA-AES256-SHA",
+  "SRP-DSS-AES-256-CBC-SHA",
+  "SRP-RSA-AES-256-CBC-SHA",
+  "SRP-AES-256-CBC-SHA",
+  "DH-DSS-AES256-GCM-SHA384",
+  "DHE-DSS-AES256-GCM-SHA384",
+  "DH-RSA-AES256-GCM-SHA384",
+  "DHE-RSA-AES256-GCM-SHA384",
+  "DHE-RSA-AES256-SHA256",
+  "DHE-DSS-AES256-SHA256",
+  "DH-RSA-AES256-SHA256",
+  "DH-DSS-AES256-SHA256",
+  "DHE-RSA-AES256-SHA",
+  "DHE-DSS-AES256-SHA",
+  "DH-RSA-AES256-SHA",
+  "DH-DSS-AES256-SHA",
+  "DHE-RSA-CAMELLIA256-SHA",
+  "DHE-DSS-CAMELLIA256-SHA",
+  "DH-RSA-CAMELLIA256-SHA",
+  "DH-DSS-CAMELLIA256-SHA",
+  "ECDH-RSA-AES256-GCM-SHA384",
+  "ECDH-ECDSA-AES256-GCM-SHA384",
+  "ECDH-RSA-AES256-SHA384",
+  "ECDH-ECDSA-AES256-SHA384",
+  "ECDH-RSA-AES256-SHA",
+  "ECDH-ECDSA-AES256-SHA",
+  "AES256-GCM-SHA384",
+  "AES256-SHA256",
+  "AES256-SHA",
+  "CAMELLIA256-SHA",
+  "PSK-AES256-CBC-SHA",
+  "ECDHE-RSA-AES128-GCM-SHA256",
+  "ECDHE-ECDSA-AES128-GCM-SHA256",
+  "ECDHE-RSA-AES128-SHA256",
+  "ECDHE-ECDSA-AES128-SHA256",
+  "ECDHE-RSA-AES128-SHA",
+  "ECDHE-ECDSA-AES128-SHA",
+  "SRP-DSS-AES-128-CBC-SHA",
+  "SRP-RSA-AES-128-CBC-SHA",
+  "SRP-AES-128-CBC-SHA",
+  "DH-DSS-AES128-GCM-SHA256",
+  "DHE-DSS-AES128-GCM-SHA256",
+  "DH-RSA-AES128-GCM-SHA256",
+  "DHE-RSA-AES128-GCM-SHA256",
+  "DHE-RSA-AES128-SHA256",
+  "DHE-DSS-AES128-SHA256",
+  "DH-RSA-AES128-SHA256",
+  "DH-DSS-AES128-SHA256",
+  "DHE-RSA-AES128-SHA",
+  "DHE-DSS-AES128-SHA",
+  "DH-RSA-AES128-SHA",
+  "DH-DSS-AES128-SHA",
+  "DHE-RSA-SEED-SHA",
+  "DHE-DSS-SEED-SHA",
+  "DH-RSA-SEED-SHA",
+  "DH-DSS-SEED-SHA",
+  "DHE-RSA-CAMELLIA128-SHA",
+  "DHE-DSS-CAMELLIA128-SHA",
+  "DH-RSA-CAMELLIA128-SHA",
+  "DH-DSS-CAMELLIA128-SHA",
+  "ECDH-RSA-AES128-GCM-SHA256",
+  "ECDH-ECDSA-AES128-GCM-SHA256",
+  "ECDH-RSA-AES128-SHA256",
+  "ECDH-ECDSA-AES128-SHA256",
+  "ECDH-RSA-AES128-SHA",
+  "ECDH-ECDSA-AES128-SHA",
+  "AES128-GCM-SHA256",
+  "AES128-SHA256",
+  "AES128-SHA",
+  "SEED-SHA",
+  "CAMELLIA128-SHA",
+  "PSK-AES128-CBC-SHA",
+  "ECDHE-RSA-DES-CBC3-SHA",
+  "ECDHE-ECDSA-DES-CBC3-SHA",
+  "SRP-DSS-3DES-EDE-CBC-SHA",
+  "SRP-RSA-3DES-EDE-CBC-SHA",
+  "SRP-3DES-EDE-CBC-SHA",
+  "EDH-RSA-DES-CBC3-SHA",
+  "EDH-DSS-DES-CBC3-SHA",
+  "DH-RSA-DES-CBC3-SHA",
+  "DH-DSS-DES-CBC3-SHA",
+  "ECDH-RSA-DES-CBC3-SHA",
+  "ECDH-ECDSA-DES-CBC3-SHA",
+  "DES-CBC3-SHA",
+  "PSK-3DES-EDE-CBC-SHA",
+]
+
   HAND_SHAKE_DATA = "\x15\x03\x03\x00\x02\x02\n"
 
   original_verbose, $VERBOSE = $VERBOSE, nil # try to shut off warnings

data/lib/stomp/errors.rb

@@ -184,6 +184,17 @@ module Stomp
       end
     end
 
+    # ServerFrameNameError is raised if:
+    # * Invalid frame is received from the Stomp server.
+    class ServerFrameNameError < RuntimeError
+      def initialize(bf)
+        @bf = bf
+      end
+      def message
+        "Connected, server frame name error: #{@bf.inspect}"
+      end
+    end
+
     # SSLNoKeyFileError is raised if:
     # * A supplied key file does not exist.
     class SSLNoKeyFileError < RuntimeError

data/lib/stomp/sslparams.rb

@@ -64,17 +64,17 @@ module Stomp
    #
    if opts[:fsck]
     if @cert_file
-     raise Stomp::Error::SSLNoCertFileError if !File::exists?(@cert_file)
+     raise Stomp::Error::SSLNoCertFileError if !File::exist?(@cert_file)
      raise Stomp::Error::SSLUnreadableCertFileError if !File::readable?(@cert_file)
     end
     if @key_file
-     raise Stomp::Error::SSLNoKeyFileError if !File::exists?(@key_file)
+     raise Stomp::Error::SSLNoKeyFileError if !File::exist?(@key_file)
      raise Stomp::Error::SSLUnreadableKeyFileError if !File::readable?(@key_file)
     end
     if @ts_files
      tsa = @ts_files.split(",")
      tsa.each do |fn|
-      raise Stomp::Error::SSLNoTruststoreFileError if !File::exists?(fn)
+      raise Stomp::Error::SSLNoTruststoreFileError if !File::exist?(fn)
       raise Stomp::Error::SSLUnreadableTruststoreFileError if !File::readable?(fn)
      end
     end
@@ -86,4 +86,3 @@ module Stomp
  end # of class SSLParams
 
 end # of module Stomp
-

data/lib/stomp/version.rb

@@ -6,8 +6,8 @@ module Stomp
   module Version  #:nodoc: all
     MAJOR = 1
     MINOR = 4
-    PATCH = 4
-    # PATCH = "4.plvl.001"
+    PATCH = 5
+    # PATCH = "5.plvl.001"
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/stomp.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: stomp 1.4.4 ruby lib
+# stub: stomp 1.4.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "stomp".freeze
-  s.version = "1.4.4"
+  s.version = "1.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Brian McCallister".freeze, "Marius Mathiesen".freeze, "Thiago Morello".freeze, "Guy M. Allard".freeze]
-  s.date = "2017-06-11"
+  s.date = "2018-10-27"
   s.description = "Ruby client for the Stomp messaging protocol.  Note that this gem is no longer supported on rubyforge.".freeze
   s.email = ["brianm@apache.org".freeze, "marius@stones.com".freeze, "morellon@gmail.com".freeze, "allard.guy.m@gmail.com".freeze]
   s.executables = ["catstomp".freeze, "stompcat".freeze]
@@ -35,45 +35,39 @@ Gem::Specification.new do |s|
     "adhoc/stomp_adhoc_common.rb",
     "bin/catstomp",
     "bin/stompcat",
+    "examples/EXAMPLES.md",
     "examples/amqdurasub.rb",
-    "examples/artemis/artlogger.rb",
     "examples/artemis/cliwaiter_not_reliable.rb",
-    "examples/artemis/cliwaiter_reliable.rb",
-    "examples/client11_ex1.rb",
-    "examples/client11_putget1.rb",
-    "examples/conn11_ex1.rb",
-    "examples/conn11_ex2.rb",
-    "examples/conn11_hb1.rb",
-    "examples/consume_file.rb",
-    "examples/consumer.rb",
+    "examples/artemis/cliwaiter_reliable_hb.rb",
+    "examples/client_conndisc.rb",
+    "examples/client_putget.rb",
+    "examples/conn_conndisc.rb",
+    "examples/conn_putget.rb",
     "examples/contrib.sh",
     "examples/contributors.rb",
     "examples/examplogger.rb",
-    "examples/get11conn_ex1.rb",
-    "examples/get11conn_ex2.rb",
-    "examples/lflogger.rb",
+    "examples/historical/consumer.rb",
+    "examples/historical/publisher.rb",
+    "examples/historical/topic_consumer.rb",
+    "examples/historical/topic_publisher.rb",
     "examples/logexamp.rb",
-    "examples/logexamp_ssl.rb",
-    "examples/publish_file.rb",
-    "examples/publish_file_conn.rb",
-    "examples/publisher.rb",
-    "examples/put11conn_ex1.rb",
-    "examples/putget11_rh1.rb",
-    "examples/ssl_common.rb",
-    "examples/ssl_ctxoptions.rb",
-    "examples/ssl_newparm.rb",
-    "examples/ssl_uc1.rb",
-    "examples/ssl_uc1_ciphers.rb",
-    "examples/ssl_uc2.rb",
-    "examples/ssl_uc2_ciphers.rb",
-    "examples/ssl_uc3.rb",
-    "examples/ssl_uc3_ciphers.rb",
-    "examples/ssl_uc4.rb",
-    "examples/ssl_uc4_ciphers.rb",
-    "examples/ssl_ucx_default_ciphers.rb",
-    "examples/stomp11_common.rb",
-    "examples/topic_consumer.rb",
-    "examples/topic_publisher.rb",
+    "examples/putget_file.rb",
+    "examples/putget_rephdrs.rb",
+    "examples/ssl/SSL.md",
+    "examples/ssl/misc/ssl_ctxoptions.rb",
+    "examples/ssl/misc/ssl_newparm.rb",
+    "examples/ssl/misc/ssl_ucx_default_ciphers.rb",
+    "examples/ssl/ssl_common.rb",
+    "examples/ssl/sslexall.sh",
+    "examples/ssl/uc1/ssl_uc1.rb",
+    "examples/ssl/uc1/ssl_uc1_ciphers.rb",
+    "examples/ssl/uc2/ssl_uc2.rb",
+    "examples/ssl/uc2/ssl_uc2_ciphers.rb",
+    "examples/ssl/uc3/ssl_uc3.rb",
+    "examples/ssl/uc3/ssl_uc3_ciphers.rb",
+    "examples/ssl/uc4/ssl_uc4.rb",
+    "examples/ssl/uc4/ssl_uc4_ciphers.rb",
+    "examples/stomp_common.rb",
     "lib/client/utils.rb",
     "lib/connection/heartbeats.rb",
     "lib/connection/netio.rb",
@@ -115,7 +109,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/stompgem/stomp".freeze
   s.licenses = ["Apache-2.0".freeze]
-  s.rubygems_version = "2.6.11".freeze
+  s.rubygems_version = "2.7.6".freeze
   s.summary = "Ruby client for the Stomp messaging protocol".freeze
 
   if s.respond_to? :specification_version then