Merge pull request #20420 from dwelch-r7/rails-7.2-upgrade

Bump rails to 7.2

Author: adfoster-r7

Gemfile.lock

@@ -41,7 +41,7 @@ class Application < Rails::Application
       config.paths['config/database'] = [Metasploit::Framework::Database.configurations_pathname.try(:to_path)]
       config.autoloader = :zeitwerk
 
-      config.load_defaults 7.1
+      config.load_defaults 7.2
 
       config.eager_load = false
     end

config/application.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2025_02_04_172657) do
+ActiveRecord::Schema[7.2].define(version: 2025_02_04_172657) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -803,5 +803,4 @@
     t.boolean "limit_to_network", default: false, null: false
     t.boolean "import_fingerprint", default: false
   end
-
 end

db/schema.rb

@@ -3,7 +3,7 @@
 module Metasploit
   module Framework
     module RailsVersionConstraint
-      RAILS_VERSION = '~> 7.1.0'
+      RAILS_VERSION = '~> 7.2.0'
     end
   end
 end

lib/metasploit/framework/rails_version_constraint.rb

@@ -16,7 +16,7 @@ def creds(opts)
       query = query.includes(logins: [ :service, { service: :host } ])
 
       if opts[:type].present?
-        query = query.where('"metasploit_credential_privates"."type" = ?', opts[:type])
+        query = query.where('"metasploit_credential_privates"."type" = ?', opts[:type].to_s)
       end
 
       if opts[:jtr_format].present?

lib/msf/core/db_manager/cred.rb

@@ -43,7 +43,7 @@ def mysql_login(user='root', pass='', db=nil)
     begin
       self.mysql_conn = ::Rex::Proto::MySQL::Client.connect(rhost, user, pass, db, rport, io: self.sock)
       # Deprecating this in favor off `mysql_conn`
-      @mysql_handle = ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, :mysql_conn, :@mysql_handle, ActiveSupport::Deprecation.new)
+      @mysql_handle = ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, :mysql_conn, :@mysql_handle, deprecator: ActiveSupport::Deprecation.new)
 
     rescue Errno::ECONNREFUSED
       print_error("Connection refused")

lib/msf/core/exploit/remote/mysql.rb

@@ -249,10 +249,6 @@ Gem::Specification.new do |spec|
   # to generate PNG files, not to parse untrusted PNG files.
   spec.add_runtime_dependency 'chunky_png'
 
-  # Temporary, remove once the Rails 7.1 update is complete
-  # see: https://stackoverflow.com/questions/79360526/uninitialized-constant-activesupportloggerthreadsafelevellogger-nameerror
-  spec.add_runtime_dependency 'concurrent-ruby', '1.3.4'
-
   # Needed for multiline REPL support for interactive SQL sessions
   spec.add_runtime_dependency 'reline'
 

metasploit-framework.gemspec

@@ -54,7 +54,7 @@ def run
 
     usr_tbl << [
       is_admin?.to_s.capitalize,
-      system?.to_s.capitalize,
+      is_system?.to_s.capitalize,
       is_in_admin_group?.to_s.capitalize,
       is_uac_enabled?.to_s.capitalize,
       fid,

modules/post/windows/gather/win_privs.rb

@@ -35,7 +35,7 @@ def initialize(info = {})
           'Meterpreter' => {
             'Commands' => %w[
               stdapi_railgun_api
-              stdapi_sys_config_revert_to_self
+              stdapi_sys_config_rev2self
               stdapi_sys_config_update_token
             ]
           }