rex-socket 0.1.34 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7c47df3f39b889182acdf10979bdf50d435d605e79d9242549ed300de2298b9
-  data.tar.gz: 23844c82242b552bdea184aa95b5c499766ab70e9f77cc9baaa73b7edea81cab
+  metadata.gz: f6fc1471d9de2717bcab7b4808f6011eab4f2a0e9bf9042cec9ce83ddf976d7e
+  data.tar.gz: 43a4ce0def2c26f141fc9b7025f0b1d413b20d8a8aa8d48206813091a8173e2e
 SHA512:
-  metadata.gz: 91887057ffde34e4fd7a30b4148e4da3f3442d5e99f746e2d464515bf81ad7a459932a8c69879d83267dc06939abadad17c50fad21b42e026047f879a8869cc4
-  data.tar.gz: aed583e93601c0ac04343844aad9b4304f5a848fb9c44405ddc8bc33cdeabbc2e8470a8f4c78fded2933a154e3aaf9b53f2c652e46471180349fd83c7d3b861c
+  metadata.gz: c83bd69270a612453bafd90d508135db979f840f0b3c2aba435e680f5f71b60ee51efeafcb31063b5d91b48b2aad1503446c5c028cd8de666ec2bc10c0768fc1
+  data.tar.gz: 8f0c03d1038b03a6d32b732674622e0db1acfe47d5b031055c0ab46164908f14b23e373271007996e456d04127dd1f4b8c0ed7f68aa6ade85b633d14a53e6230

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/.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/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.34"
+    VERSION = "0.1.37"
   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:
 

data.tar.gz.sig

@@ -1 +1,3 @@
-����?t�P��r�GL �fç�wx��F�5��c������w��R����"(�ot�b�ia_��7b������P�]���ه՚f��‚�'�)�z����+ݺ8����~.G��sBr�5���&����k�����V�)=�
+�ޝg�Z;��n���6�(H���y�!�XSXV\��4އ%�@.�Z
+I����'2r�:T{�D�����U�)�
+^vΌ������;�@�����/lq�Ү

metadata

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