Compile with Ruby 3.2.5 (#219)

* Compile with Ruby 3.2.5

* Remove fiddle for windows

* Test windows artifacts

Author: adfoster-r7

Diff for: .github/workflows/verify.yml

@@ -295,7 +295,7 @@ jobs:
         os:
           - macos-13
         ruby:
-          - 3.0.6
+          - 3.2.5
 
     name: ${{ matrix.os }}
     steps:
@@ -368,9 +368,9 @@ jobs:
         os:
           - windows-2022
         ruby:
-          - 3.0.6
+          - 3.2.5
 
-    name: ${{ matrix.os }}
+    name: ${{ matrix.os }} compilation
     steps:
       # https://github.com/actions/runner-images/issues/5143
       # https://github.com/actions/runner-images/issues/9701
@@ -393,6 +393,12 @@ jobs:
           submodules: true
           path: metasploit-omnibus
 
+      - name: Update bundler version
+        # Github actions with Ruby requires Bundler 2.2.18+
+        # https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows
+        run: |
+          (Get-Content metasploit-omnibus\Gemfile.lock).Replace('   2.2.33', '   2.5.10') | Set-Content metasploit-omnibus\Gemfile.lock
+
       - name: Setup Ruby
         env:
           BUNDLE_FORCE_RUBY_PLATFORM: true
@@ -404,7 +410,7 @@ jobs:
           working-directory: metasploit-omnibus
           # Github actions with Ruby requires Bundler 2.2.18+
           # https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows
-          bundler: 2.2.33
+          bundler: 2.5.10
 
       # If you need to build a custom version of pcaprub:
       # - name: Checkout pcaprub
@@ -445,41 +451,6 @@ jobs:
           rem and the ridk.cmd Ruby installer will forcibly kill the msys2 process before attempting to install ruby
           ruby bin/omnibus build metasploit-framework
 
-      # Currently hangs on Github actions - but passes locally, potential cause within the debug.log file:
-      #
-      #     Info 1603.The file C:\Windows\system32\vcruntime140_1.dll is being held in use.  Close that application and retry.
-      #
-      # - name: Test artifact
-      #   shell: pwsh
-      #   run: |
-      #     Set-PSDebug -Trace 1
-      #     echo "Testing artifact"
-
-      #     Remove-Item c:\metasploit-framework -Recurse -ErrorAction Ignore
-
-      #     dir metasploit-omnibus\pkg
-
-      #     echo '' > debug.log
-      #     $artifact = (Get-ChildItem -Path "metasploit-omnibus/pkg/*.msi")[0].Name
-      #     $install_process = Start-Process msiexec.exe -ArgumentList "/i metasploit-omnibus\pkg\$artifact /quiet /qn /l*v debug.log" -NoNewWindow -PassThru
-      #     $log_process = Start-Process "powershell" "Get-Content -Path debug.log -Wait" -NoNewWindow -PassThru
-      #     $install_process.WaitForExit()
-      #     $log_process.Kill()
-      #     echo "finished install"
-
-      #     c:\metasploit-framework\bin\msfconsole -qx 'setg variable test; version; exit'
-      #     c:\metasploit-framework\bin\msfvenom -p windows/meterpreter/reverse_tcp -f exe -o test.exe
-      #     c:\metasploit-framework\bin\msfd -h
-      #     c:\metasploit-framework\bin\msfrpc -h
-      #     c:\metasploit-framework\bin\msfrpcd -h
-      #     c:\metasploit-framework\bin\msfdb -h
-      #     c:\metasploit-framework\bin\msfbinscan -h
-      #     c:\metasploit-framework\bin\msfrop -h
-      #     c:\metasploit-framework\bin\msfelfscan -h
-      #     c:\metasploit-framework\bin\msfmachscan -h
-      #     c:\metasploit-framework\bin\msfpescan -h
-      #     c:\metasploit-framework\bin\msfupdate
-
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
@@ -490,3 +461,91 @@ jobs:
             metasploit-omnibus/pkg/*.msi
             metasploit-omnibus/pkg/*.deb
           retention-days: 1
+
+  # Ensure we can install the Windows installer on a fresh environment without any pre-existing dependencies.
+  # Additionally, running on the previous windows builder is not currently possible, as it currently hangs on
+  # on Github actions - but passes locally. The potential cause is logged to the debug.log file:
+  #
+  #     Info 1603.The file C:\Windows\system32\vcruntime140_1.dll is being held in use.  Close that application and retry.
+  #
+  windows_testing:
+    needs: windows
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 180
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - windows-2022
+
+    name: ${{ matrix.os }} testing
+    steps:
+
+      - uses: actions/download-artifact@v4
+        name: Download Windows arifacts
+        id: download_windows_artifacts
+        with:
+          name: metasploit-windows-installers
+          path: metasploit-omnibus
+
+      - name: Install artifact
+        shell: pwsh
+        run: |
+          Set-PSDebug -Trace 1
+          echo "Testing artifact"
+
+          echo '' > debug.log
+          $artifact = (Get-ChildItem -Path "metasploit-omnibus/*.msi")[0].Name
+          $install_process = Start-Process msiexec.exe -ArgumentList "/i metasploit-omnibus\$artifact /quiet /qn /l*v debug.log" -NoNewWindow -PassThru
+          $install_process_handle = $install_process.Handle # cache proc.Handle - https://stackoverflow.com/questions/10262231/obtaining-exitcode-using-start-process-and-waitforexit-instead-of-wait
+          $log_process = Start-Process "powershell" "Get-Content -Path debug.log -Wait" -NoNewWindow -PassThru
+          $install_process.WaitForExit()
+          $log_process.Kill()
+          echo "finished install"
+          Exit $install_process.ExitCode
+
+      - shell: pwsh
+        run: |
+          d:\metasploit-framework\bin\msfvenom -p windows/meterpreter/reverse_tcp -f exe -o test.exe
+          Exit $LASTEXITCODE
+      - shell: pwsh
+        run: |
+          d:\metasploit-framework\bin\msfd -h
+          Exit $LASTEXITCODE
+      - shell: pwsh
+        run: |
+          d:\metasploit-framework\bin\msfrpc -h
+          Exit $LASTEXITCODE
+      - shell: pwsh
+        run: |
+          d:\metasploit-framework\bin\msfrpcd -h
+          Exit $LASTEXITCODE
+      - shell: pwsh
+        run: |
+          d:\metasploit-framework\bin\msfdb -h
+          Exit $LASTEXITCODE
+      - shell: pwsh
+        run: |
+          d:\metasploit-framework\bin\msfbinscan -h
+          Exit $LASTEXITCODE
+      - shell: pwsh
+        run: |
+          d:\metasploit-framework\bin\msfrop -h
+          Exit $LASTEXITCODE
+      - shell: pwsh
+        run: |
+          d:\metasploit-framework\bin\msfelfscan -h
+          Exit $LASTEXITCODE
+      - shell: pwsh
+        run: |
+          d:\metasploit-framework\bin\msfmachscan -h
+          Exit $LASTEXITCODE
+      - shell: pwsh
+        run: |
+          d:\metasploit-framework\bin\msfpescan -h
+          Exit $LASTEXITCODE
+      - shell: pwsh
+        run: |
+          d:\metasploit-framework\bin\msfconsole -qx 'setg variable test; version; exit'
+          Exit $LASTEXITCODE

Diff for: Gemfile.lock

@@ -21,66 +21,66 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     awesome_print (1.9.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.916.0)
-    aws-sdk-core (3.192.1)
+    aws-partitions (1.1017.0)
+    aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.79.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sigv4 (~> 1.1)
+    aws-sdk-kms (1.96.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.116.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.8.0)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     byebug (11.1.3)
     chef-cleanroom (1.0.5)
-    chef-config (18.4.12)
+    chef-config (18.5.0)
       addressable
-      chef-utils (= 18.4.12)
+      chef-utils (= 18.5.0)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-utils (18.4.12)
+    chef-utils (18.5.0)
       concurrent-ruby
     citrus (3.0.2)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     contracts (0.16.1)
-    ffi (1.16.3)
+    ffi (1.17.0)
     ffi-yajl (2.6.0)
       libyajl2 (>= 1.2)
     fuzzyurl (0.9.0)
-    iostruct (0.0.5)
+    iostruct (0.2.0)
     ipaddress (0.8.3)
     jmespath (1.6.2)
-    json (2.7.2)
+    json (2.9.0)
     libyajl2 (2.1.0)
-    license_scout (1.3.7)
+    license_scout (1.3.15)
       ffi-yajl (~> 2.2)
       mixlib-shellout (>= 2.2, < 4.0)
       toml-rb (>= 1, < 3)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
       tomlrb
     mixlib-log (3.0.9)
-    mixlib-shellout (3.2.7)
+    mixlib-shellout (3.3.4)
       chef-utils
     mixlib-versioning (1.2.12)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
-    net-ssh (7.2.3)
-    ohai (18.1.3)
+    net-ssh (7.3.0)
+    ohai (18.1.18)
       chef-config (>= 14.12, < 19)
       chef-utils (>= 16.0, < 19)
       ffi (~> 1.9)
@@ -93,7 +93,7 @@ GEM
       plist (~> 3.1)
       train-core
       wmi-lite (~> 1.0)
-    pedump (0.6.7)
+    pedump (0.6.10)
       awesome_print
       iostruct (>= 0.0.4)
       multipart-post (>= 2.0.0)
@@ -106,23 +106,23 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    public_suffix (5.0.5)
+    public_suffix (6.0.1)
     rainbow (3.1.1)
     rexml (3.3.9)
     ruby-progressbar (1.13.0)
-    thor (1.3.1)
+    thor (1.3.2)
     toml-rb (2.2.0)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)
-    train-core (3.12.3)
+    train-core (3.12.7)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 5.0)
       net-ssh (>= 2.9, < 8.0)
     wmi-lite (1.0.7)
-    zhexdump (0.1.0)
+    zhexdump (0.2.0)
 
 PLATFORMS
   ruby

Diff for: config/patches/metasploit-framework/windows.patch

@@ -0,0 +1,69 @@
+diff --git a/Gemfile.lock b/Gemfile.lock
+index a05bbfbdc7e..1a3cff9acc7 100644
+--- Gemfile.lock       2024-05-17 12:32:16
++++ Gemfile.lock       2024-05-17 12:32:59
+@@ -32,8 +32,6 @@ PATH
+       faraday (= 2.7.11)
+       faraday-retry
+       faye-websocket
+-      ffi (< 1.17.0)
+-      fiddle
+       filesize
+       getoptlong
+       hrr_rb_ssh-ed25519
+@@ -66,7 +64,6 @@ PATH
+       ostruct
+       packetfu
+       patch_finder
+-      pcaprub
+       pdf-reader
+       pg
+       puma
+@@ -262,8 +259,6 @@ GEM
+     faye-websocket (0.11.3)
+       eventmachine (>= 0.12.0)
+       websocket-driver (>= 0.5.1)
+-    ffi (1.16.3)
+-    fiddle (1.1.6)
+     filesize (0.2.0)
+     fivemat (1.3.7)
+     forwardable (1.3.3)
+@@ -375,14 +370,11 @@ GEM
+     openssl-cmac (2.0.2)
+     openvas-omp (0.0.4)
+     ostruct (0.6.1)
+-    packetfu (2.0.0)
+-      pcaprub (~> 0.13.1)
+     parallel (1.26.3)
+     parser (3.3.7.1)
+       ast (~> 2.4.1)
+       racc
+     patch_finder (1.0.2)
+-    pcaprub (0.13.3)
+     pdf-reader (2.14.1)
+       Ascii85 (>= 1.0, < 3.0, != 2.0.0)
+       afm (~> 0.2.1)
+diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
+index 8c620476dbc..959eb1284f8 100644
+--- metasploit-framework.gemspec       2024-05-17 12:32:16
++++ metasploit-framework.gemspec       2024-05-17 12:32:59
+@@ -87,9 +87,9 @@ Gem::Specification.new do |spec|
+   # Needed by for XML parsing
+   spec.add_runtime_dependency 'nokogiri'
+   # Needed by db.rb and Msf::Exploit::Capture
+-  spec.add_runtime_dependency 'packetfu'
++  #spec.add_runtime_dependency 'packetfu'
+   # For sniffer and raw socket modules
+-  spec.add_runtime_dependency 'pcaprub'
++  #spec.add_runtime_dependency 'pcaprub'
+   # Used by the Metasploit data model, etc.
+   # bound to 0.2x for Activerecord 4.2.8 deprecation warnings:
+   # https://github.com/ged/ruby-pg/commit/c90ac644e861857ae75638eb6954b1cb49617090
+@@ -266,7 +266,6 @@ Gem::Specification.new do |spec|
+     bigdecimal
+     csv
+     drb
+-    fiddle
+     getoptlong
+     mutex_m
+     ostruct

Diff for: config/software/metasploit-framework.rb

@@ -51,6 +51,8 @@ def has_windows_metasploit_framework_repo?
 
 build do
   patch_env = with_standard_compiler_flags(with_embedded_path)
+  # Remove problematic dependencies for Windows; Fiddle will need to be re-added in a future build for Ruby 3.3 support
+  patch source: "windows.patch", plevel: 0, env: patch_env if windows?
   copy "#{project_dir}", "#{install_dir}/embedded/framework"
 
   major, minor, patch = Omnibus::BuildVersion.semver.split('.')