rex-socket 0.1.59 → 0.1.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e949497936b6f26c1c6da1830a2673f8708706e89598765b26ddf05179dceee0
-  data.tar.gz: 49e42e30d773df6f4b52539d360748fe77e51dd49bb1f1e2782a35217839eef3
+  metadata.gz: 768cf09e183ef82a282e1173e076723617fa5d1d3ef6d159930c5f080e62267c
+  data.tar.gz: 9cfe878cd33e159f58803d2012150d20f2d9a934222e71e674618b553ef3f4ed
 SHA512:
-  metadata.gz: c8ea54f52f4f10c8050e181980de4caf16bc5443657c55cf0ce5ef1d20b1a5bca84448515ab502ab79c4bc3eef66b1a199ada9e095304a42c25150ee9d3062fe
-  data.tar.gz: aec32cadf5c60108aba67155731cf5eba9da3dba310f37fa6f6941f04a9e167762bae8953c05b5dfa7c6b096c8fdc44616b42a3f80e910a4cbc2b2e8c438308f
+  metadata.gz: 3135f51b48c61967266a771006fd0b432061f2c2717025695f9843cde59b40d7abf60c4bd7d92f957b9f574700cce4cdc0997e9707b5f2026eab1afd8a879696
+  data.tar.gz: c2874c8b85019ae4af581bd1d00e046b46d9c82b34b8032c13cc88547966706cde53775f80c856e5f4658ed186adc3aa836bf626f7c530e208ee1e46cc7c2493

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

@@ -262,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

data/lib/rex/socket/parameters.rb

@@ -51,6 +51,8 @@ class Rex::Socket::Parameters
   #
   # @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] 'SSLKeyLogFile' The SSL key log file path, used for network capture
+  #   decryption which is useful to decrypt TLS traffic in wireshark
   # @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
@@ -116,6 +118,10 @@ class Rex::Socket::Parameters
       self.sslctx = hash['SSLContext']
     end
 
+    if (hash['SSLKeyLogFile'])
+      self.sslkeylogfile = hash['SSLKeyLogFile']
+    end
+
     self.ssl_version = hash.fetch('SSLVersion', nil)
 
     supported_ssl_verifiers = %W{CLIENT_ONCE FAIL_IF_NO_PEER_CERT NONE PEER}
@@ -302,6 +308,11 @@ class Rex::Socket::Parameters
   # @return [String]
   attr_accessor :peerhostname
 
+  # The SSL key log file path, equivalent to the sslkeylogfile parameter hash
+  # key.
+  # @return [String]
+  attr_accessor :sslkeylogfile
+
   # The remote port.  Equivalent to the PeerPort parameter hash key.
   # @return [Fixnum]
   attr_writer :peerport

data/lib/rex/socket/ssl_tcp.rb

@@ -84,6 +84,20 @@ begin
     # Build the SSL connection
     self.sslctx  = OpenSSL::SSL::SSLContext.new(version)
 
+    # writing to the sslkeylogfile is required, it adds support for network capture decryption which is useful to
+    # decrypt TLS traffic in wireshark
+    if sslkeylogfile
+      unless self.sslctx.respond_to?(:keylog_cb)
+        raise 'Unable to create sslkeylogfile - Ruby 3.2 or above required for this functionality'
+      end
+
+      self.sslctx.keylog_cb = proc do |_sock, line|
+        File.open(sslkeylogfile, 'ab') do |file|
+          file.write("#{line}\n")
+        end
+      end
+    end
+
     # Configure client certificate
     if params and params.ssl_client_cert
       self.sslctx.cert = OpenSSL::X509::Certificate.new(params.ssl_client_cert)

data/lib/rex/socket/version.rb

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

data/lib/rex/socket.rb

@@ -805,6 +805,7 @@ module Socket
     if (params)
       self.peerhost  = params.peerhost
       self.peerhostname = params.peerhostname
+      self.sslkeylogfile = params.sslkeylogfile
       self.peerport  = params.peerport
       self.localhost = params.localhost
       self.localport = params.localport
@@ -888,6 +889,10 @@ module Socket
   #
   attr_reader :peerhostname
   #
+  # The SSL key log file path.
+  #
+  attr_reader :sslkeylogfile
+  #
   # The peer port of the connected socket.
   #
   attr_reader :peerport
@@ -912,7 +917,7 @@ module Socket
 
 protected
 
-  attr_writer :peerhost, :peerhostname, :peerport, :localhost, :localport # :nodoc:
+  attr_writer :peerhost, :peerhostname, :sslkeylogfile, :peerport, :localhost, :localport # :nodoc:
   attr_writer :context # :nodoc:
   attr_writer :ipv # :nodoc:
 

metadata

@@ -1,40 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.59
+  version: 0.1.61
 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-12-05 00:00:00.000000000 Z
+cert_chain: []
+date: 2025-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -137,7 +111,7 @@ files:
 homepage: https://github.com/rapid7/rex-socket
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,8 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: The Ruby Exploitation (Rex) Socket Abstraction Library.
 test_files: []

data.tar.gz.sig

@@ -1 +0,0 @@
-\��I�ζ��t{:����S����:�=�|ϋH��Aw�xMVP|8�_���Q�R�G�/>�����t�n	� �6Ϋn2�⃋9�>S�,�^Nf���\ד���9͗�_�t^�b�HQ��H؋��᭬á*�b����
+�?t�j�V��!�RJ�{��X?!���