rex-socket 0.1.50 → 0.1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de5e151c011ad64beefd0ed9a2ac3211bf9fe9718657781af03b4ea4d7df661c
-  data.tar.gz: 7ddaeb1f593e891ece932ebcb024b4d124eb388b50624927cb995f77045ea1ed
+  metadata.gz: 69a97cac39e77ee44665aa30e9b9d5d30fa490c1cbb0909cfeda49bce7ca1414
+  data.tar.gz: 3e76c09d2320265208f8a91c8bd93730d4d4698d1940b8a654d7ec553c008b6d
 SHA512:
-  metadata.gz: 81f854e60466971c4f6c81d6a171bb0e7b9584513b7c0ff2edcf9820c82c809effef7a5e4e42958981408f56a559e8e736b2d8ec6df0fa3be75dca2816bce22c
-  data.tar.gz: 74711958fdbbf6708e04a0a72660d7e32a8200fd2229e7a9be91c3394875510469210a104bfbd7b51d37ea8f0381ec049f8c53cf5a82fa381fff28794da95ca9
+  metadata.gz: 475846de509a2f145142566a729b7fa4bf1d67d0d993c2cff20edb2bf7418c64930136d5e34f8a05a717da610c3dc734d4b631cb66611d3725a173f53a6d3001
+  data.tar.gz: 355abe15808629534099238aad2fee65e4588573108aa4307aa6bc45b1addca4bc6422d48bb77b288945d8b33956be4503a842f74f8e14c0ecc283fcaa45ca9b

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-N�rpגQ[�����>�#����i�ʁ�'�@��e]��Z��f
-l�5�d��Gx��ˆ�Z)�Q�����I~e��g�W�e�B
�I� ��ί3���r��&�tự
+m�V1�g����T�F��s�V��"��u�a

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

@@ -212,7 +212,7 @@ class Rex::Socket::Comm::Local
             klass = Rex::Socket::SctpServer
         else
           raise Rex::BindFailed.new(param.localhost, param.localport), caller
-        end  
+        end
         sock.extend(klass)
 
         sock.initsock(param)
@@ -447,7 +447,7 @@ class Rex::Socket::Comm::Local
       end
     when 'socks4'
       supports_ipv6 = false
-      setup = [4,1,port.to_i].pack('CCn') + Socket.resolv_nbo(host, supports_ipv6) + Rex::Text.rand_text_alpha(rand(8)+1) + "\x00"
+      setup = [4,1,port.to_i].pack('CCn') + Rex::Socket.resolv_nbo(host, supports_ipv6) + Rex::Text.rand_text_alpha(rand(8)+1) + "\x00"
       size = sock.put(setup)
       if size != setup.length
         raise Rex::ConnectionProxyError.new(host, port, type, "Failed to send the entire request to the proxy"), caller
@@ -478,7 +478,7 @@ class Rex::Socket::Comm::Local
 
       if Rex::Socket.is_ipv4?(host)
         accepts_ipv6 = false
-        addr = Rex::Socket.resolv_nbo(host)
+        addr = Rex::Socket.resolv_nbo(host, accepts_ipv6)
         setup = [5,1,0,1].pack('C4') + addr + [port.to_i].pack('n')
       elsif Rex::Socket.support_ipv6? && Rex::Socket.is_ipv6?(host)
         # IPv6 stuff all untested

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.50"
+    VERSION = "0.1.52"
   end
 end

data/lib/rex/socket.rb

@@ -157,7 +157,33 @@ module Socket
     (support_ipv6? && addr =~ MATCH_IPV6) || (addr =~ MATCH_IPV4)
   end
 
-  #
+  # Checks to see if an address is an IPv6 address and if so, converts it into its
+  # square bracket format for addressing as noted in RFC 6874 which states that an IPv6
+  # address literal in a URL is always embedded between [ and ]. Please also refer to
+  # RFC5952, RFC3986, and RFC6874 for more info.
+  #
+  # RFC3986 section 3.2.2 specifically notes "A host identified by an Internet Protocol literal address, version 6
+  # [RFC3513] or later, is distinguished by enclosing the IP literal
+  # within square brackets ("[" and "]").  This is the only place where
+  # square bracket characters are allowed in the URI syntax."
+  #
+  # RFC6874 reinforces this in section 2 where it notes "In a URI, a literal IPv6 address
+  # is always embedded between '[' and ']'".
+  #
+  # @param host [String] IP address or hostname to convert to a URI authority.
+  # @param port [Integer] Port number to include within the URI authority.
+  # @return [String] Returns the URI authority string.
+  # @raise [ArgumentError] This function will raise an ArgumentError if the host parameter is not a String.
+  def self.to_authority(host, port=nil)
+    unless host.kind_of?(String)
+      raise ArgumentError.new("Expected a string for the host parameter!")
+    end
+    host = "[#{host}]" if is_ipv6?(host)
+    host += ":#{port}" if port
+    host
+  end
+
+
   # Return true if +addr+ is within the ranges specified in RFC1918, or
   # RFC5735/RFC3927
   #

data.tar.gz.sig

@@ -1,2 +1 @@
-��v��<�+C��)I�y}x����'(��O;�,��X��:Aül��yI�טO�<��C���<�-�U���V���;�Tw�	O��Ƹo��ǒ��������2��s�Т��?$ҒR�byk�U|�9i�-���x�q�
-֪��0�2Y��>��_����v貛P5�O�߹G�N9�F̝s���[<q{���E@α��Dw;`�
�s#���Y���F��|�$��4J�+����`ü- ٤]<���J\1m^e;��
++�Sl��N���ϱ`.e��	,Smt�mB��bvh����WQ�%�׆�����(y\�ԯ.��OW=�q���� �O刣�9�#�;���a%;(�����E!���dҨmZ��$�jI;0���G��|Z�$ID4��4|��s�|0�U�\5C�2 �����u�.���z���8��Q���Eڵ�_c1pjq�,%Z��vLI���ý�
N�&�����DI�������ӓ(!-���W�E��'�-�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.50
+  version: 0.1.52
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake