rex-socket 0.1.58 → 0.1.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb38ba9938df81a01bc5fbfffe8055b10d09a8bbb3d19e3955904d70e6577e1b
-  data.tar.gz: f26d820ced28fc1d88120e3d60f4a3ad08440f69f12973754e3fa4d93bcaceec
+  metadata.gz: a61eea97f22de5fbf53bd8b10afdc2a49affa0d3ced6a6457dbc78c7c13f88c4
+  data.tar.gz: 0b43ec7143f9dca80b8bc38105e6873252eda7b19b023e393432580169002620
 SHA512:
-  metadata.gz: e5b90f41b5ae712f69c467202d72d211e1e35b4b4a86dc49b80a2e369e716f002bb85189edf0e3e4618579af681fe69d8f98e638854694e0a4ad6e3ca582b685
-  data.tar.gz: e2b28c496f4c3cc30eb8d235aa2657084c338d6f782f1e22eb5a040c4b4285bd709f274fae3c2bb366923f1d619471ecd54cccf4518f33c198b8ddb2825c5ed0
+  metadata.gz: c055962142f5fcadf24016b0274d065dafe53b47bff9a290fed250fe8a99a11a4a6a29b414b6d9656ce3304903ae4c620c03601235b6008f047e2ad171f2e375
+  data.tar.gz: 37943cfd24524c9a8474132c1d7cb3051a221173ad493ed7a3ad103e1223163bd1bc7da1639b21fa6c36add59c3777012aee7acdd6484e0c1f45230722d34c56

data/.github/workflows/verify.yml

@@ -25,42 +25,5 @@ on:
       - '*'
 
 jobs:
-  test:
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 40
-
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby:
-          - '2.7'
-          - '3.0'
-          - '3.1'
-          - '3.2'
-          - '3.3'
-        os:
-          - ubuntu-20.04
-          - windows-2019
-          - macos-13
-          - ubuntu-latest
-        exclude:
-          - { os: ubuntu-latest, ruby: '2.7' }
-          - { os: ubuntu-latest, ruby: '3.0' }
-
-    env:
-      RAILS_ENV: test
-
-    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - name: rspec
-        run: |
-          bundle exec rspec
+  build:
+    uses: rapid7/metasploit-framework/.github/workflows/shared_gem_verify_rails.yml@master

data/cortex.yaml

@@ -10,6 +10,8 @@ info:
   x-cortex-type: service
   x-cortex-domain-parents:
   - tag: metasploit
+  x-cortex-groups:
+  - exposure:external-ship
 openapi: 3.0.1
 servers:
 - url: "/"

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'
 
 ###
@@ -261,7 +262,7 @@ class Rex::Socket::Comm::Local
         end
 
         ip6_scope_idx = 0
-        ip   = param.peerhost
+        ip   = Rex::Socket.getaddress(param.peerhost)
         port = param.peerport
 
         if param.proxies
@@ -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.60"
   end
 end

metadata

@@ -1,40 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.58
+  version: 0.1.60
 platform: ruby
 authors:
 - Metasploit Hackers
-autorequire: 
+autorequire:
 bindir: exe
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIERDCCAqygAwIBAgIBATANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBttc2Zk
-  ZXYvREM9bWV0YXNwbG9pdC9EQz1jb20wHhcNMjMxMDMwMTYwNDI1WhcNMjUxMDI5
-  MTYwNDI1WjAmMSQwIgYDVQQDDBttc2ZkZXYvREM9bWV0YXNwbG9pdC9EQz1jb20w
-  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDZN/EKv+yVjwiKWvjAVhjF
-  aWNYI0E9bJ5d1qKd29omRYX9a+OOKBCu5+394fyF5RjwU4mYGr2iopX9ixRJrWXH
-  ojs70tEvV1CmvP9rhz7JKzQQoJOkinrz4d+StIylxVxVdgm7DeiB3ruTwvl7qKUv
-  piWzhrBFiVU6XIEAwq6wNEmnv2D+Omyf4h0Tf99hc6G0QmBnU3XydqvnZ+AzUbBV
-  24RH3+NQoigLbvK4M5aOeYhk19di58hznebOw6twHzNczshrBeMFQp985ScNgsvF
-  rL+7HNNwpcpngERwZfzDNn7iYN5X3cyvTcykShtsuPMa5zXsYo42LZrsTF87DW38
-  D8sxL6Dgdqu25Mltdw9m+iD4rHSfb1KJYEoNO+WwBJLO2Y4d6G1CR66tVeWsZspb
-  zneOVC+sDuil7hOm+6a7Y2yrrRyT6IfL/07DywjPAIRUp5+Jn8ZrkWRNo2AOwWBG
-  k5gz7SfJPHuyVnPlxoMA0MTFCUnnnbyHu882TGoJGgMCAwEAAaN9MHswCQYDVR0T
-  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFIQfNa4E889ZE334cwU7eNu2hScH
-  MCAGA1UdEQQZMBeBFW1zZmRldkBtZXRhc3Bsb2l0LmNvbTAgBgNVHRIEGTAXgRVt
-  c2ZkZXZAbWV0YXNwbG9pdC5jb20wDQYJKoZIhvcNAQELBQADggGBAMfzvKcV27p7
-  pctmpW2JmIXLMrjNLyGJAxELH/t9pJueXdga7uj2fJkYQDbwGw5x4MGyFqhqJLH4
-  l/qsUF3PyAXDTSWLVaqXQVWO+IIHxecG0XjPXTNudzMU0hzqbqiBKvsW7/a3V5BP
-  SWlFzrFkoXWlPouFpoakyYMJjpW4SGdPzRv7pM4OhXtkXpHiRvx5985FrHgHlI89
-  NSIuIUbp8zqk4hP1i9MV0Lc/vTf2gOmo+RHnjqG1NiYfMCYyY/Mcd4W36kGOl468
-  I8VDTwgCufkAzFu7BJ5yCOueqtDcuq+d3YhAyU7NI4+Ja8EwazOnB+07sWhKpg7z
-  yuQ1mWYPmZfVQpoSVv1CvXsoqJYXVPBBLOacKKSj8ArVG6pPn9Bej7IOQdblaFjl
-  DgscAao7wB3xW2BWEp1KnaDWkf1x9ttgoBEYyuYwU7uatB67kBQG1PKvLt79wHvz
-  Dxs+KOjGbBRfMnPgVGYkORKVrZIwlaboHbDKxcVW5xv+oZc7KYXWGg==
-  -----END CERTIFICATE-----
-date: 2024-11-22 00:00:00.000000000 Z
+cert_chain: []
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -118,6 +92,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
@@ -136,7 +111,7 @@ files:
 homepage: https://github.com/rapid7/rex-socket
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: The Ruby Exploitation (Rex) Socket Abstraction Library.
 test_files: []