Merge pull request #198 from dwelch-r7/rails-8.0-upgrade

Upgrade gem to be rails 8.0 compatible

Author: adfoster-r7

.github/workflows/verify.yml

@@ -28,6 +28,7 @@ jobs:
   build:
     uses: rapid7/metasploit-framework/.github/workflows/shared_gem_verify_rails.yml@master
     with:
+      additional_rails_versions: '["~> 8.0.0"]'
       dependencies: '["libpcap-dev", "graphviz"]'
       test_commands: |
         cp spec/dummy/config/database.yml.github_actions spec/dummy/config/database.yml

Gemfile

@@ -38,7 +38,8 @@ group :development, :test do
   # code coverage of tests
   gem 'simplecov', :require => false
   # dummy app
-  gem 'rails', '7.0.8'
+  # Allow Rails 7.0 through 8.0 for upgrade compatibility
+  gem 'rails', '>= 7.0', '< 8.1'
   # running documentation generation tasks and rspec tasks
   gem 'rake'
   # unit testing framework with rails integration

app/models/metasploit/credential/krb_enc_key.rb

@@ -73,7 +73,7 @@ class Metasploit::Credential::KrbEncKey < Metasploit::Credential::PasswordHash
   # Callbacks
   #
 
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :data, coder: Metasploit::Credential::CaseInsensitiveSerializer
   else
     serialize :data, Metasploit::Credential::CaseInsensitiveSerializer

app/models/metasploit/credential/ntlm_hash.rb

@@ -43,7 +43,7 @@ class Metasploit::Credential::NTLMHash < Metasploit::Credential::ReplayableHash
 
   # Hash results are always downcased when stored in the database
   # This serializer allows for ORM to search in a case-insensitive
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :data, coder: Metasploit::Credential::CaseInsensitiveSerializer
   else
     serialize :data, Metasploit::Credential::CaseInsensitiveSerializer

app/models/metasploit/credential/postgres_md5.rb

@@ -13,7 +13,7 @@ class Metasploit::Credential::PostgresMD5 < Metasploit::Credential::ReplayableHa
   # Callbacks
   #
 
-  if ActiveRecord::VERSION::MAJOR >= 7 && ActiveRecord::VERSION::MINOR >= 1
+  if ActiveRecord::VERSION::MAJOR > 7 || (ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1)
     serialize :data, coder: Metasploit::Credential::CaseInsensitiveSerializer
   else
     serialize :data, Metasploit::Credential::CaseInsensitiveSerializer

spec/dummy/config/application.rb

@@ -55,8 +55,6 @@ class Application < Rails::Application
     # like if you have constraints or database-specific column types
     config.active_record.schema_format = :sql
 
-    config.autoloader = :zeitwerk
-
     if ActiveRecord.respond_to?(:legacy_connection_handling)
       ActiveRecord.legacy_connection_handling = false
     end

spec/dummy/db/structure.sql

@@ -1,7 +1,11 @@
+\restrict mBrhviFaGapJnTy1Ng5G4Nmfldi6cVCqDsnBZBhvNpaMCYyEUttPQyvzrS3RhNF
+
+-- Dumped from database version 14.22 (Homebrew)
+-- Dumped by pg_dump version 14.22 (Homebrew)
+
 SET statement_timeout = 0;
 SET lock_timeout = 0;
 SET idle_in_transaction_session_timeout = 0;
-SET transaction_timeout = 0;
 SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
@@ -4004,6 +4008,8 @@ CREATE UNIQUE INDEX unique_realmless_metasploit_credential_cores ON public.metas
 -- PostgreSQL database dump complete
 --
 
+\unrestrict mBrhviFaGapJnTy1Ng5G4Nmfldi6cVCqDsnBZBhvNpaMCYyEUttPQyvzrS3RhNF
+
 SET search_path TO "$user", public;
 
 INSERT INTO "schema_migrations" (version) VALUES