rex-socket 0.1.63 → 0.1.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84edd5f35128b471782a64c9d9f3370e60a9131bad8b2237b2a3db62c32c70f6
-  data.tar.gz: dff6f79b3cf25162536f1e77d4d69154c3b7a2675d4132c2d77ae3245e342da8
+  metadata.gz: 1a33736b3aed4d8521995debf90923330d4229be27258e8b34eb275b6828b19e
+  data.tar.gz: 94fc8e11d711df827208ceba14c69b6f026203803fad52186853af063450e4ff
 SHA512:
-  metadata.gz: 001414adcefec2b4907505fba69c9fc47b1b1d61a6533a671d01bfdbd88346b4e90c21b674fe077d3a8abb4fbddd56d36aa5d54ab8fba6094b2fea9b664a6794
-  data.tar.gz: 24de54bb61eecfd5c4b26c576ae8139647d7bc36b8746886d8b6870211e59c7d5c553853c399c6041317106250dd754d9ff4eaf626a0ca84c5f42fb06d09d753
+  metadata.gz: 1f6d553fd900432c16fc72561aace0ef12a9789ffc78ef744e37636fc75913a5efcf1178e6a35064d6ebdf74ab289e73a8317a1e708cf78fcf27336f2694e3fe
+  data.tar.gz: 0caafa60b338dfdc75d104029a3480044e8eeddc92da2db84cc3b677370150e5cb550a6e14054cb1f9cc00291d14a13b13d940fef72bf49127530dda228e63d8

data/lib/rex/socket/comm/local.rb

@@ -324,8 +324,7 @@ class Rex::Socket::Comm::Local
 
       # Now extend the socket with SSL and perform the handshake
       if !param.bare? && param.ssl
-        klass = Rex::Socket::SslTcp
-        sock.extend(klass)
+        sock.extend(Rex::Socket::SslTcp)
         sock.initsock(param)
       end
     end

data/lib/rex/socket/ssl_tcp.rb

@@ -66,21 +66,19 @@ begin
     super
 
     version = params&.ssl_version || Rex::Socket::Ssl::DEFAULT_SSL_VERSION
-    # Raise an error if no selected versions are supported
-    unless Rex::Socket::SslTcp.system_ssl_methods.include? version
-      raise ArgumentError,
-        "This version of Ruby does not support the requested SSL/TLS version #{version}"
-    end
 
     # Try initializing the socket with this SSL/TLS version
     # This will throw an exception if it fails
     initsock_with_ssl_version(params, version)
-
-    # Track the SSL version
-    self.ssl_negotiated_version = version
   end
 
   def initsock_with_ssl_version(params, version)
+    # Raise an error if no selected versions are supported
+    unless Rex::Socket::SslTcp.system_ssl_methods.include? version
+      raise ArgumentError,
+        "This version of Ruby does not support the requested SSL/TLS version #{version}"
+    end
+
     # Build the SSL connection
     self.sslctx  = OpenSSL::SSL::SSLContext.new(version)
 
@@ -149,33 +147,22 @@ begin
 
     # Force a negotiation timeout
     begin
-    Timeout.timeout(params.timeout) do
-      if not allow_nonblock?
-        self.sslsock.connect
-      else
-        begin
-          self.sslsock.connect_nonblock
-        # Ruby 1.8.7 and 1.9.0/1.9.1 uses a standard Errno
-        rescue ::Errno::EAGAIN, ::Errno::EWOULDBLOCK
-            IO::select(nil, nil, nil, 0.10)
-            retry
-
-        # Ruby 1.9.2+ uses IO::WaitReadable/IO::WaitWritable
-        rescue ::Exception => e
-          if ::IO.const_defined?('WaitReadable') and e.kind_of?(::IO::WaitReadable)
+      Timeout.timeout(params.timeout) do
+        if not allow_nonblock?
+          self.sslsock.connect
+        else
+          begin
+            self.sslsock.connect_nonblock
+          rescue ::IO::WaitReadable
             IO::select( [ self.sslsock ], nil, nil, 0.10 )
             retry
-          end
 
-          if ::IO.const_defined?('WaitWritable') and e.kind_of?(::IO::WaitWritable)
+          rescue ::IO::WaitWritable
             IO::select( nil, [ self.sslsock ], nil, 0.10 )
             retry
           end
-
-          raise e
         end
       end
-    end
 
     rescue ::Timeout::Error
       raise Rex::ConnectionTimeout.new(params.peerhost, params.peerport)
@@ -215,34 +202,16 @@ begin
     rescue ::IOError, ::Errno::EPIPE
       return nil
 
-    # Ruby 1.8.7 and 1.9.0/1.9.1 uses a standard Errno
-    rescue ::Errno::EAGAIN, ::Errno::EWOULDBLOCK
-      # Sleep for a half a second, or until we can write again
-      Rex::ThreadSafe.select( nil, [ self.sslsock ], nil, retry_time )
-      # Decrement the block size to handle full sendQs better
-      block_size = 1024
-      # Try to write the data again
+    rescue ::IO::WaitReadable
+      IO::select( [ self.sslsock ], nil, nil, retry_time )
       retry
 
-    # Ruby 1.9.2+ uses IO::WaitReadable/IO::WaitWritable
-    rescue ::Exception => e
-      if ::IO.const_defined?('WaitReadable') and e.kind_of?(::IO::WaitReadable)
-        IO::select( [ self.sslsock ], nil, nil, retry_time )
-        retry
-      end
-
-      if ::IO.const_defined?('WaitWritable') and e.kind_of?(::IO::WaitWritable)
-        IO::select( nil, [ self.sslsock ], nil, retry_time )
-        retry
-      end
-
-      # Another form of SSL error, this is always fatal
-      if e.kind_of?(::OpenSSL::SSL::SSLError)
-        return nil
-      end
+    rescue ::IO::WaitWritable
+      IO::select( nil, [ self.sslsock ], nil, retry_time )
+      retry
 
-      # Bubble the event up to the caller otherwise
-      raise e
+    rescue ::OpenSSL::SSL::SSLError
+      return nil
     end
 
     total_sent
@@ -298,33 +267,16 @@ begin
     rescue ::IOError, ::Errno::EPIPE
       return nil
 
-    # Ruby 1.8.7 and 1.9.0/1.9.1 uses a standard Errno
-    rescue ::Errno::EAGAIN, ::Errno::EWOULDBLOCK
-      # Sleep for a tenth a second, or until we can read again
-      Rex::ThreadSafe.select( [ self.sslsock ], nil, nil, 0.10 )
-      # Decrement the block size to handle full sendQs better
-      block_size = 1024
-      # Try to write the data again
+    rescue ::IO::WaitReadable
+      IO::select( [ self.sslsock ], nil, nil, 0.10 )
       retry
 
-    # Ruby 1.9.2+ uses IO::WaitReadable/IO::WaitWritable
-    rescue ::Exception => e
-      if ::IO.const_defined?('WaitReadable') and e.kind_of?(::IO::WaitReadable)
-        IO::select( [ self.sslsock ], nil, nil, 0.5 )
-        retry
-      end
-
-      if ::IO.const_defined?('WaitWritable') and e.kind_of?(::IO::WaitWritable)
-        IO::select( nil, [ self.sslsock ], nil, 0.5 )
-        retry
-      end
-
-      # Another form of SSL error, this is always fatal
-      if e.kind_of?(::OpenSSL::SSL::SSLError)
-        return nil
-      end
+    rescue ::IO::WaitWritable
+      IO::select( nil, [ self.sslsock ], nil, 0.10 )
+      retry
 
-      raise e
+    rescue ::OpenSSL::SSL::SSLError
+      return nil
     end
 
   end
@@ -409,7 +361,6 @@ begin
   end
 
   attr_reader :peer_verified # :nodoc:
-  attr_reader :ssl_negotiated_version # :nodoc:
   attr_accessor :sslsock, :sslctx, :sslhash # :nodoc:
 
   def type?
@@ -419,8 +370,6 @@ begin
 protected
 
   attr_writer :peer_verified # :nodoc:
-  attr_writer :ssl_negotiated_version # :nodoc:
-
 
 rescue LoadError
 end

data/lib/rex/socket/ssl_tcp_server.rb

@@ -71,24 +71,13 @@ module Rex::Socket::SslTcpServer
         begin
           ssl.accept_nonblock
 
-        # Ruby 1.8.7 and 1.9.0/1.9.1 uses a standard Errno
-        rescue ::Errno::EAGAIN, ::Errno::EWOULDBLOCK
-            IO::select(nil, nil, nil, 0.10)
-            retry
-
-        # Ruby 1.9.2+ uses IO::WaitReadable/IO::WaitWritable
-        rescue ::Exception => e
-          if ::IO.const_defined?('WaitReadable') and e.kind_of?(::IO::WaitReadable)
-            IO::select( [ ssl ], nil, nil, 0.10 )
-            retry
-          end
-
-          if ::IO.const_defined?('WaitWritable') and e.kind_of?(::IO::WaitWritable)
-            IO::select( nil, [ ssl ], nil, 0.10 )
-            retry
-          end
-
-          raise e
+        rescue ::IO::WaitReadable
+          IO::select( [ self.sslsock ], nil, nil, 0.10 )
+          retry
+
+        rescue ::IO::WaitWritable
+          IO::select( nil, [ self.sslsock ], nil, 0.10 )
+          retry
         end
       end
 

data/lib/rex/socket/tcp.rb

@@ -58,4 +58,12 @@ module Rex::Socket::Tcp
     return 'tcp'
   end
 
+  def starttls(param)
+    param = Rex::Socket::Parameters.from_hash(param) if param.is_a? Hash
+
+    param.ssl = true
+    extend(Rex::Socket::SslTcp)
+    initsock_with_ssl_version(param, (param.ssl_version || Rex::Socket::Ssl::DEFAULT_SSL_VERSION))
+    nil
+  end
 end

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.63"
+    VERSION = "0.1.64"
   end
 end

data/lib/rex/socket.rb

@@ -760,6 +760,9 @@ module Socket
       raise "Thread #{i} - error #{e} - last child error: #{last_child_error}"
     end
 
+    lsock.extend(Rex::Socket::Tcp)
+    rsock.extend(Rex::Socket::Tcp)
+
     return [lsock, rsock]
   end
 
@@ -779,6 +782,9 @@ module Socket
 
     lsock.connect( *rsock.addr.values_at(3,1) )
 
+    lsock.extend(Rex::Socket::Udp)
+    rsock.extend(Rex::Socket::Udp)
+
     return [lsock, rsock]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.63
+  version: 0.1.64
 platform: ruby
 authors:
 - Metasploit Hackers
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-16 00:00:00.000000000 Z
+date: 2025-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake