rex-socket 0.1.47 → 0.1.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee17c01e1a4f7063f35a53e7bd069d772eb16499c796e566e59172c862ebe2f0
-  data.tar.gz: 95cec06b282479a208a793e572b312fdec938733c31ac39c11a35d4093ab6647
+  metadata.gz: 3094879e49eec452993a7285a7423c92f80750e21482c93f1161a9863bc63b35
+  data.tar.gz: 8948da7edd9356d433f41661b25edab5e4af5a86c7156f5f8f9c198c1edccd0a
 SHA512:
-  metadata.gz: 194008d3f56ce2ed0a2f3472a2de73cc5f3d297ef8ff183ce1e9a380319356752c882171112b20b9edb75e44e52b644651e0bad3faabddfb158911175cd38d32
-  data.tar.gz: 766bf3d2c08fcf411aa8cc0a8137e4a140066bf730d606ba154d2e22c7da01b149b91f0365eb5c6dbc3b557b80e52661d4bb0b3888510a1877d04c2693cba34c
+  metadata.gz: 6bc286aac40859d28d7b3c96544c0cc8794df9763c485533bd9f28174c872db0d3919a632a7fd9ae71a97178b2e2a8a8d660467a3833384f820dc8b81ef1d0ec
+  data.tar.gz: aa991acb7049aa46d2d57fcaf8ee17a42f4a8fd2fee04e485e732a3451dd54c1d36a17fbe74c794d4903b61fd55a30b4de558e88a72b6a55ed72cf7f92b8a2cd

data/lib/rex/socket/range_walker.rb

@@ -540,8 +540,11 @@ end
 class Host < Range
   attr_accessor :hostname
 
-  def initialize(address, hostname=nil, options=nil)
-    address = Rex::Socket.addr_atoi(address) if address.is_a? String
+  def initialize(address, hostname=nil, options={})
+    if address.is_a? String
+      options.merge!({ ipv6: Rex::Socket.is_ipv6?(address) }) if options[:ipv6].nil?
+      address = Rex::Socket.addr_atoi(address)
+    end
 
     super(address, address, options)
     @hostname = hostname

data/lib/rex/socket/ssl_tcp.rb

@@ -234,6 +234,29 @@ begin
     total_sent
   end
 
+  #
+  # Polls the stream to see if there is any read data available.  Returns
+  # true if data is available for reading, otherwise false is returned.
+  #
+  def has_read_data?(timeout = nil)
+    return true if self.sslsock.pending > 0
+
+    # Allow a timeout of "0" that waits almost indefinitely for input, this
+    # mimics the behavior of Rex::ThreadSafe.select() and fixes some corner
+    # cases of unintentional no-wait timeouts.
+    timeout = 3600 if (timeout and timeout == 0)
+
+    begin
+      s = Rex::ThreadSafe.select( [ self.sslsock ], nil, nil, timeout )
+      return !( s == nil || s[0] == nil )
+    rescue ::Errno::EBADF, ::Errno::ENOTSOCK
+      raise ::EOFError
+    rescue StreamClosedError, ::IOError, ::EOFError, ::Errno::EPIPE
+      #  Return false if the socket is dead
+      return false
+    end
+  end
+
   #
   # Reads data from the SSL socket.
   #

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.47"
+    VERSION = "0.1.49"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.47
+  version: 0.1.49
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2023-02-06 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake