rex-socket 0.1.33 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a97221671cad2ce1a9169e9b469a6e4d997f081ee3624a6a849c538310c3da0
-  data.tar.gz: 688b6872080a0ba1db00590ec33866863864a61e265cefcc2e41d416039cf9c7
+  metadata.gz: 5c8406c7c6de56b14dfb52d691b52e04bfa41c3c4d3dfec6604864e104371e13
+  data.tar.gz: 5b5346a4646a8d1c69a616df64120d5f099c0506f97a3dca5c27b40b4c253d9a
 SHA512:
-  metadata.gz: badf3199ee38910229eccb31a6f03deebfed5eb91774fcf25e96ef8d4ab137a7d4fd09cdfbc1ceaec4c7efc96b3900e97a74142f72f8c1828fa965e50b13f45f
-  data.tar.gz: 2c600b3c7ea3cc45549512d7525a5f17e164a5c11daf18ab006060927bda060a019c13c0a0ca76b2b571494e63eecef75181734b3995e504a4d8a82cc942b90b
+  metadata.gz: 1285905a72192b26a171872a76fd2272c51a3d93a78aed5648ad857c356b43bd2d2c7fa7e75ebf742c38a207fc65a7d1e6fb4641c9f5af19af4b53f8151e233f
+  data.tar.gz: 73bd96efa3758be73faafa8543343b959e17f4d16f49206be05dc5e65fd44be834756aa6166b2e651b4feababfb6aaa4708f7b40dc2fe39aa70873663d60e12a

data/.github/workflows/verify.yml

@@ -17,10 +17,10 @@ jobs:
       fail-fast: true
       matrix:
         ruby:
-          - 2.5
           - 2.6
           - 2.7
           - 3.0
+          - 3.1
         test_cmd:
           - bundle exec rspec
 

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/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.33"
+    VERSION = "0.1.36"
   end
 end

data/lib/rex/socket.rb

@@ -184,6 +184,8 @@ module Socket
   # @param hostname [String] A hostname or ASCII IP address
   # @return [Array<String>]
   def self.getaddresses(hostname, accept_ipv6 = true)
+    raise ::SocketError, 'getaddrinfo: nodename nor servname provided, or not known' if hostname.nil?
+
     if hostname =~ MATCH_IPV4 || (accept_ipv6 && hostname =~ MATCH_IPV6)
       return [hostname]
     end
@@ -704,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
@@ -783,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
@@ -807,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:
 
@@ -821,4 +828,3 @@ end
 SHUT_RDWR = ::Socket::SHUT_RDWR
 SHUT_RD   = ::Socket::SHUT_RD
 SHUT_WR   = ::Socket::SHUT_WR
-

metadata

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