Add support for Ruby 3.3

rapid7 · May 16, 2024 · 964c1b4 · 964c1b4
1 parent 5af4e4b
commit 964c1b4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -67,7 +67,7 @@ jobs:
           - '3.0'
           - '3.1'
           - '3.2'
-          - '3.3.0-preview3'
+          - '3.3'
         os:
           - ubuntu-20.04
           - ubuntu-latest

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -45,7 +45,7 @@ PATH
       net-ssh
       network_interface
       nexpose
-      nokogiri (~> 1.14.0)
+      nokogiri
       octokit (~> 4.0)
       openssl-ccm
       openvas-omp
@@ -574,4 +574,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.2.3
+   2.2.33
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
@@ -83,8 +83,7 @@ Gem::Specification.new do |spec|
   # NTLM authentication
   spec.add_runtime_dependency 'rubyntlm'
   # Needed by anemone crawler
-  # Locked until build env can handle newer version due to native compile issue in 1.15.x
-  spec.add_runtime_dependency 'nokogiri', '~> 1.14.0'
+  spec.add_runtime_dependency 'nokogiri'
   # Needed by db.rb and Msf::Exploit::Capture
   spec.add_runtime_dependency 'packetfu'
   # For sniffer and raw socket modules

diff --git a/modules/payloads/singles/linux/mipsbe/exec.rb b/modules/payloads/singles/linux/mipsbe/exec.rb
@@ -1,3 +1,5 @@
+# -*- coding: binary -*-
+
 ##
 # This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
@@ -70,7 +72,9 @@ def generate(_opts = {})
     shellcode = shellcode + command_string + "\x00"
 
     # we need to align our shellcode to 4 bytes
-    (shellcode = shellcode + "\x00") while shellcode.length%4 != 0
+    while shellcode.bytesize%4 != 0
+      shellcode = shellcode + "\x00"
+    end
 
     return super + shellcode
 

diff --git a/modules/payloads/singles/linux/mipsle/exec.rb b/modules/payloads/singles/linux/mipsle/exec.rb
@@ -1,3 +1,5 @@
+# -*- coding: binary -*-
+
 ##
 # This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
@@ -71,7 +73,9 @@ def generate(_opts = {})
     shellcode = shellcode + command_string + "\x00"
 
     # we need to align our shellcode to 4 bytes
-    (shellcode = shellcode + "\x00") while shellcode.length%4 != 0
+    while shellcode.bytesize%4 != 0
+      shellcode = shellcode + "\x00"
+    end
 
     return super + shellcode
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ jobs: @@
               - '3.0'
               - '3.1'
               - '3.2'
-              - '3.3.0-preview3'
+              - '3.3'
             os:
               - ubuntu-20.04
               - ubuntu-latest
@@ Expand Down @@