rex-socket 0.1.30 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 647d60dcc0fb176246243a7eaed1ca68a35c596c7034cf4de863ca233d08d9f0
-  data.tar.gz: 80fcd4c8fe671a6da97a5e262700331dfa5fe0292c679952b510abdc7af13cfa
+  metadata.gz: b7c47df3f39b889182acdf10979bdf50d435d605e79d9242549ed300de2298b9
+  data.tar.gz: 23844c82242b552bdea184aa95b5c499766ab70e9f77cc9baaa73b7edea81cab
 SHA512:
-  metadata.gz: a5c001e83da2f988ff40eefcd5175bdf0684b22c5529820be68c9eda4b6d862a6f88bbd39a950941a30bcccc5b9a21479a44982e56a4e351b353c0ce480bc9a9
-  data.tar.gz: bdc211d907a45d1a0701fbc34721712fec81dea7e9417d1b3e94259916e13779a1e91e1742fd2b9526aaf4c8839c62373e58183c3ac7ad7dea64c3b8fd5d093d
+  metadata.gz: 91887057ffde34e4fd7a30b4148e4da3f3442d5e99f746e2d464515bf81ad7a459932a8c69879d83267dc06939abadad17c50fad21b42e026047f879a8869cc4
+  data.tar.gz: aed583e93601c0ac04343844aad9b4304f5a848fb9c44405ddc8bc33cdeabbc2e8470a8f4c78fded2933a154e3aaf9b53f2c652e46471180349fd83c7d3b861c

checksums.yaml.gz.sig

@@ -1,3 +1,4 @@
-a)\�1}����������m8��R�ECFˤ�\+i捤
-���͸xl����|.�݋[�k5���G�[	Goe��OO_C	}������r:���*�m�C��#��;��lMJ������"�I�Z0S7��<ɓ�����_������]k�J�itm�:���+9O�y#X��	{n���
-���Q �Seb�0�j��dO�,g���@���wj�
+H���!��Ò����]}萌d�:}x
+5"�4��5(.����S��GuM –-4����0���
��2�]��3w��?dF�Ԯ
+�{�ߟG;��#��
+��|�-�:���*+��s��K�[D��:u^l�H�����m#��y�ERNDנ��W��MRE�eU��\��\�?�i]8��

data/.github/workflows/verify.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
     timeout-minutes: 40
 
     strategy:
@@ -32,23 +32,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - uses: actions/setup-ruby@v1
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
-      - name: Setup bundler
-        run: |
-          gem install bundler
-      - uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-      - name: Bundle install
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
       - name: ${{ matrix.test_cmd }}
         run: |
           echo "${CMD}"

data/lib/rex/socket/parameters.rb

@@ -192,7 +192,15 @@ class Rex::Socket::Parameters
     end
 
     # Whether to force IPv6 addressing
-    self.v6        = hash['IPv6']
+    if hash['IPv6'].nil?
+      # if IPv6 isn't specified and at least one host is an IPv6 address and the
+      # other is either nil, a hostname or an IPv6 address, then use IPv6
+      self.v6 = (Rex::Socket.is_ipv6?(self.localhost) || Rex::Socket.is_ipv6?(self.peerhost)) && \
+        (self.localhost.nil? || !Rex::Socket.is_ipv4?(self.localhost)) && \
+        (self.peerhost.nil? || !Rex::Socket.is_ipv4?(self.peerhost))
+    else
+      self.v6 = hash['IPv6']
+    end
   end
 
   def merge(other)
@@ -294,7 +302,13 @@ class Rex::Socket::Parameters
   # @return [String]
   attr_writer :localhost
   def localhost
-    @localhost || '0.0.0.0'
+    return @localhost if @localhost
+
+    if @v6 || (@peerhost && Rex::Socket.is_ipv6?(@peerhost))
+      '::'
+    else
+      '0.0.0.0'
+    end
   end
 
   # The local port.  Equivalent to the LocalPort parameter hash key.

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.30"
+    VERSION = "0.1.34"
   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
@@ -730,7 +732,7 @@ module Socket
   # Wrapper around getsockname that stores the local address and local port values.
   #
   def getlocalname
-    if self.localhost.nil? && self.localport.nil?
+    if [nil, '0.0.0.0', '::'].include?(self.localhost) && [nil, 0].include?(self.localport)
       _, self.localhost, self.localport = getsockname
     end
 
@@ -821,4 +823,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.30
+  version: 0.1.34
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.sig

@@ -1 +1 @@
-�D~�[8Yo�:�a�㎊� �<�|�iq����tp�I>��|@W��:�y'�x����/��1���(�%M��B��P\0?���f����O��K�W+�O�l,�y�����AdR�/��U��xe�_�3ʊqX�,Z���O��80)�����i�Rp;��+a/F��d�Y��']N��%)���r\�1=YJK�_�H�i6~����2�i4�**�ͭ�XY.�")5eފ"k�Wŋ����k	s
+	|o����&�	2��a�fcѨ��֎|�R�O��|	�)�&	>-'s/����Agu9ck��	�����X
����1�Yΐ�~7���P?��-�_s�?P�:��	ԛ�e1s��jl�:��\�J�