rex-socket 0.1.35 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1517a6b3b1b5f2e63572e2721c55364746b819c63cf539e34031df7bf41a68e
-  data.tar.gz: 168fc65032c5c98b1dfdc54525f4267e4f6e1f4c568572e85d879370274ec474
+  metadata.gz: 519832366ed76568c895e37e610c482576910f7b26dabf2bec2dbbe8c423f6b2
+  data.tar.gz: 0715e1a90fdb015fbcaa93787c5e29a4d764a81eeabe8f7aafa0995064e6e776
 SHA512:
-  metadata.gz: 6ae63e9bab2bf9e22dacbc9c18144e68a1a355a253d3a2ff650020a7258c1b1c7eef5a0e19acd013c80edf71f839c8f8adcd2e4dcbe6a5e5edbd410846b53b4c
-  data.tar.gz: e8687039de9392d0fbb99956119a3c7828c06a3d07b4e72840be18992ca2c9cc70c5f4a7e3768bf31f43f3a055a3b3e9231761240c88d1939fc795acdc1fecd5
+  metadata.gz: ed02cf31575b674a5615fbf88d612fe633a060c23d6edd86e38abecdb1aa940f25889001fe258cbaa50f373cf47fc48f8894de20d38fe0cb85284236d73d8009
+  data.tar.gz: b7231990271831b6151f8ca0abd4b735ebca9b37fdad9578a194d2c4376c1c6d498420b7f9aa91e298f7f932c1a4f946db5fdf70bc53f6b0f927cb3bd5afa27d

data/.gitignore

@@ -8,4 +8,6 @@
 /spec/reports/
 /tmp/
 /.ruby-version
-/.ruby-gemset
+/.ruby-gemset
+# Rubymine project directory
+.idea

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

@@ -1,5 +1,6 @@
 # -*- coding: binary -*-
 require 'singleton'
+require 'rex/compat'
 require 'rex/socket'
 require 'rex/socket/tcp'
 require 'rex/socket/ssl_tcp'

data/lib/rex/socket/parameters.rb

@@ -49,6 +49,7 @@ class Rex::Socket::Parameters
   # keys can be specified.
   #
   # @option hash [String] 'PeerHost' The remote host to connect to
+  # @option hash [String] 'PeerHostname' The unresolved remote hostname, used to specify Server Name Indication (SNI)
   # @option hash [String] 'PeerAddr' (alias for 'PeerHost')
   # @option hash [Fixnum] 'PeerPort' The remote port to connect to
   # @option hash [String] 'LocalHost' The local host to communicate from, if any
@@ -84,6 +85,10 @@ class Rex::Socket::Parameters
       self.peerhost = hash['PeerAddr']
     end
 
+    if (hash['PeerHostname'])
+      self.peerhostname = hash['PeerHostname']
+    end
+
     if (hash['LocalHost'])
       self.localhost = hash['LocalHost']
     elsif (hash['LocalAddr'])
@@ -291,6 +296,11 @@ class Rex::Socket::Parameters
   # @return [String]
   attr_accessor :peerhost
 
+  # The remote hostname information, equivalent to the PeerHostname parameter hash
+  # key.
+  # @return [String]
+  attr_accessor :peerhostname
+
   # The remote port.  Equivalent to the PeerPort parameter hash key.
   # @return [Fixnum]
   attr_writer :peerport

data/lib/rex/socket/range_walker.rb

@@ -81,6 +81,8 @@ class RangeWalker
 
     ranges = []
     parseme.split(', ').map{ |a| a.split(' ') }.flatten.each do |arg|
+      # Remove trailing commas that may be unneeded, i.e. '1.1.1.1,'
+      arg = arg.sub(/,+$/, '')
 
       # Handle IPv6 CIDR first
       if arg.include?(':') && arg.include?('/')

data/lib/rex/socket/ssl_tcp.rb

@@ -123,10 +123,14 @@ begin
     # Tie the context to a socket
     self.sslsock = OpenSSL::SSL::SSLSocket.new(self, self.sslctx)
 
-    # If peerhost looks like a hostname, set the undocumented 'hostname'
+    # If peerhostname is set, or if hostname looks like a hostname, set the undocumented 'hostname'
     # attribute on sslsock, which enables the Server Name Indication (SNI)
     # extension
-    self.sslsock.hostname = self.peerhost if !Rex::Socket.dotted_ip?(self.peerhost)
+    if self.peerhostname
+      self.sslsock.hostname = self.peerhostname
+    else !Rex::Socket.dotted_ip?(self.peerhost)
+      self.sslsock.hostname = self.peerhost
+    end
 
     # Force a negotiation timeout
     begin

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.35"
+    VERSION = "0.1.38"
   end
 end

data/lib/rex/socket.rb

@@ -706,6 +706,7 @@ module Socket
   def initsock(params = nil)
     if (params)
       self.peerhost  = params.peerhost
+      self.peerhostname = params.peerhostname
       self.peerport  = params.peerport
       self.localhost = params.localhost
       self.localport = params.localport
@@ -785,6 +786,10 @@ module Socket
   #
   attr_reader :peerhost
   #
+  # The peer hostname of the connected socket.
+  #
+  attr_reader :peerhostname
+  #
   # The peer port of the connected socket.
   #
   attr_reader :peerport
@@ -809,7 +814,7 @@ module Socket
 
 protected
 
-  attr_writer :peerhost, :peerport, :localhost, :localport # :nodoc:
+  attr_writer :peerhost, :peerhostname, :peerport, :localhost, :localport # :nodoc:
   attr_writer :context # :nodoc:
   attr_writer :ipv # :nodoc:
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.38
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake