rex-socket 0.1.58 → 0.1.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb38ba9938df81a01bc5fbfffe8055b10d09a8bbb3d19e3955904d70e6577e1b
-  data.tar.gz: f26d820ced28fc1d88120e3d60f4a3ad08440f69f12973754e3fa4d93bcaceec
+  metadata.gz: e949497936b6f26c1c6da1830a2673f8708706e89598765b26ddf05179dceee0
+  data.tar.gz: 49e42e30d773df6f4b52539d360748fe77e51dd49bb1f1e2782a35217839eef3
 SHA512:
-  metadata.gz: e5b90f41b5ae712f69c467202d72d211e1e35b4b4a86dc49b80a2e369e716f002bb85189edf0e3e4618579af681fe69d8f98e638854694e0a4ad6e3ca582b685
-  data.tar.gz: e2b28c496f4c3cc30eb8d235aa2657084c338d6f782f1e22eb5a040c4b4285bd709f274fae3c2bb366923f1d619471ecd54cccf4518f33c198b8ddb2825c5ed0
+  metadata.gz: c8ea54f52f4f10c8050e181980de4caf16bc5443657c55cf0ce5ef1d20b1a5bca84448515ab502ab79c4bc3eef66b1a199ada9e095304a42c25150ee9d3062fe
+  data.tar.gz: aec32cadf5c60108aba67155731cf5eba9da3dba310f37fa6f6941f04a9e167762bae8953c05b5dfa7c6b096c8fdc44616b42a3f80e910a4cbc2b2e8c438308f

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

@@ -9,6 +9,7 @@ require 'rex/socket/udp'
 require 'rex/socket/sctp'
 require 'rex/socket/sctp_server'
 require 'rex/socket/ip'
+require 'rex/socket/proxies'
 require 'timeout'
 
 ###
@@ -353,7 +354,7 @@ class Rex::Socket::Comm::Local
 
   def self.proxy(sock, type, host, port)
     case type.downcase
-    when 'sapni'
+    when Rex::Socket::Proxies::ProxyType::SAPNI
       packet_type = 'NI_ROUTE'
       route_info_version = 2
       ni_version = 39
@@ -422,7 +423,7 @@ class Rex::Socket::Comm::Local
         raise Rex::ConnectionProxyError.new(host, port, type, "Connection to #{host}:#{port} failed (Unknown fail)")
       end
 
-    when 'http'
+    when Rex::Socket::Proxies::ProxyType::HTTP
       setup = "CONNECT #{host}:#{port} HTTP/1.0\r\n\r\n"
       size = sock.put(setup)
       if size != setup.length
@@ -445,7 +446,7 @@ class Rex::Socket::Comm::Local
       if resp.code != 200
         raise Rex::ConnectionProxyError.new(host, port, type, "The proxy returned a non-OK response"), caller
       end
-    when 'socks4'
+    when Rex::Socket::Proxies::ProxyType::SOCKS4
       supports_ipv6 = false
       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)
@@ -465,7 +466,7 @@ class Rex::Socket::Comm::Local
       if ret[1,1] != "\x5a"
         raise Rex::ConnectionProxyError.new(host, port, type, "Proxy responded with error code #{ret[0,1].unpack("C")[0]}"), caller
       end
-    when 'socks5'
+    when Rex::Socket::Proxies::ProxyType::SOCKS5
       auth_methods = [5,1,0].pack('CCC')
       size = sock.put(auth_methods)
       if size != auth_methods.length

data/lib/rex/socket/parameters.rb

@@ -1,5 +1,6 @@
 # -*- coding: binary -*-
 require 'rex/socket'
+require 'rex/socket/proxies'
 
 ###
 #
@@ -163,7 +164,7 @@ class Rex::Socket::Parameters
     end
 
     if hash['Proxies']
-      self.proxies = hash['Proxies'].split(',').map{|a| a.strip}.map{|a| a.split(':').map{|b| b.strip}}
+      self.proxies = Rex::Socket::Proxies.parse(hash['Proxies'])
     end
 
     # The protocol this socket will be using

data/lib/rex/socket/proxies.rb

@@ -0,0 +1,24 @@
+# -*- coding: binary -*-
+
+module Rex
+  module Socket
+    module Proxies
+      module ProxyType
+        SAPNI = 'sapni'
+        HTTP = 'http'
+        SOCKS4 = 'socks4'
+        SOCKS5 = 'socks5'
+      end
+
+      # @param [String,nil] value A proxy chain of format {type:host:port[,type:host:port][...]}
+      # @return [Array] The array of proxies, i.e. {[['type', 'host', 'port']]}
+      def self.parse(value)
+        value.to_s.strip.split(',').map { |a| a.strip }.map { |a| a.split(':').map { |b| b.strip } }
+      end
+
+      def self.supported_types
+        ProxyType.constants.map { |c| ProxyType.const_get(c) }
+      end
+    end
+  end
+end

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.58"
+    VERSION = "0.1.59"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.58
+  version: 0.1.59
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -34,7 +34,7 @@ cert_chain:
   DgscAao7wB3xW2BWEp1KnaDWkf1x9ttgoBEYyuYwU7uatB67kBQG1PKvLt79wHvz
   Dxs+KOjGbBRfMnPgVGYkORKVrZIwlaboHbDKxcVW5xv+oZc7KYXWGg==
   -----END CERTIFICATE-----
-date: 2024-11-22 00:00:00.000000000 Z
+date: 2024-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,6 +118,7 @@ files:
 - lib/rex/socket/comm/local.rb
 - lib/rex/socket/ip.rb
 - lib/rex/socket/parameters.rb
+- lib/rex/socket/proxies.rb
 - lib/rex/socket/range_walker.rb
 - lib/rex/socket/sctp.rb
 - lib/rex/socket/sctp_server.rb
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: The Ruby Exploitation (Rex) Socket Abstraction Library.