Skip to content

Bump rails version to 7.2 #20109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adfoster-r7 merged 5 commits into from
Jun 17, 2025
Merged

Bump rails version to 7.2 #20109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b87ef99
Bump rails version to 7.2
dwelch-r7 Apr 28, 2025
640d992
Add rpc debugging
dwelch-r7 May 19, 2025
62f3572
Minor bug fixes
dwelch-r7 May 22, 2025
4c2eeee
Remove debug output
dwelch-r7 May 27, 2025
39356d5
Fix migration date issues when running tests
dwelch-r7 Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 55 additions & 36 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ PATH
metasploit-framework (6.4.70)
aarch64
abbrev
actionpack (~> 7.1.0)
activerecord (~> 7.1.0)
activesupport (~> 7.1.0)
actionpack (~> 7.2.0)
activerecord (~> 7.2.0)
activesupport (~> 7.2.0)
aws-sdk-ec2
aws-sdk-ec2instanceconnect
aws-sdk-iam
Expand All @@ -20,7 +20,6 @@ PATH
bootsnap
bson
chunky_png
concurrent-ruby (= 1.3.4)
csv
dnsruby
drb
Expand All @@ -38,7 +37,7 @@ PATH
getoptlong
hrr_rb_ssh-ed25519
http-cookie
irb (~> 1.7.4)
irb
jsobfu
json
metasm
Expand Down Expand Up @@ -123,41 +122,41 @@ GEM
aarch64 (2.1.0)
racc (~> 1.6)
abbrev (0.1.2)
actionpack (7.1.5.1)
actionview (= 7.1.5.1)
activesupport (= 7.1.5.1)
actionpack (7.2.2.1)
actionview (= 7.2.2.1)
activesupport (= 7.2.2.1)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack (>= 2.2.4, < 3.2)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actionview (7.1.5.1)
activesupport (= 7.1.5.1)
useragent (~> 0.16)
actionview (7.2.2.1)
activesupport (= 7.2.2.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activemodel (7.1.5.1)
activesupport (= 7.1.5.1)
activerecord (7.1.5.1)
activemodel (= 7.1.5.1)
activesupport (= 7.1.5.1)
activemodel (7.2.2.1)
activesupport (= 7.2.2.1)
activerecord (7.2.2.1)
activemodel (= 7.2.2.1)
activesupport (= 7.2.2.1)
timeout (>= 0.4.0)
activesupport (7.1.5.1)
activesupport (7.2.2.1)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
securerandom (>= 0.3)
tzinfo (~> 2.0)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
afm (0.2.2)
Expand Down Expand Up @@ -220,9 +219,9 @@ GEM
csv (3.3.2)
daemons (1.4.1)
date (3.4.1)
debug (1.8.0)
irb (>= 1.5.0)
reline (>= 0.3.1)
debug (1.10.0)
irb (~> 1.10)
reline (>= 0.3.8)
diff-lcs (1.6.0)
dnsruby (1.72.4)
base64 (~> 0.2.0)
Expand All @@ -243,6 +242,7 @@ GEM
em-socksify (0.3.3)
base64
eventmachine (>= 1.0.0.beta.4)
erb (5.0.1)
erubi (1.13.1)
eventmachine (1.2.7)
factory_bot (6.5.1)
Expand Down Expand Up @@ -287,8 +287,10 @@ GEM
concurrent-ruby (~> 1.0)
io-console (0.8.0)
ipaddr (1.2.7)
irb (1.7.4)
reline (>= 0.3.6)
irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jmespath (1.6.2)
jsobfu (0.4.2)
rkelly-remix
Expand All @@ -305,9 +307,11 @@ GEM
nokogiri (>= 1.12.0)
memory_profiler (1.1.0)
metasm (1.0.5)
metasploit-concern (5.0.4)
metasploit-concern (5.0.5)
activemodel (~> 7.0)
activesupport (~> 7.0)
drb
mutex_m
railties (~> 7.0)
zeitwerk
metasploit-credential (6.0.16)
Expand All @@ -324,9 +328,12 @@ GEM
rex-socket
rubyntlm
rubyzip
metasploit-model (5.0.3)
metasploit-model (5.0.4)
activemodel (~> 7.0)
activesupport (~> 7.0)
bigdecimal
drb
mutex_m
railties (~> 7.0)
metasploit-payloads (2.0.221)
metasploit_data_models (6.0.9)
Expand Down Expand Up @@ -395,13 +402,19 @@ GEM
ruby-rc4
ttfunk
pg (1.5.9)
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
prism (1.4.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
psych (5.2.6)
date
stringio
public_suffix (6.0.1)
puma (6.6.0)
nio4r (~> 2.0)
Expand All @@ -424,10 +437,10 @@ GEM
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
railties (7.1.5.1)
actionpack (= 7.1.5.1)
activesupport (= 7.1.5.1)
irb
railties (7.2.2.1)
actionpack (= 7.2.2.1)
activesupport (= 7.2.2.1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
Expand All @@ -437,6 +450,9 @@ GEM
rasn1 (0.14.0)
strptime (~> 0.2.5)
rb-readline (0.5.5)
rdoc (6.14.0)
erb
psych (>= 4.0.0)
recog (3.1.14)
nokogiri
redcarpet (3.6.1)
Expand Down Expand Up @@ -513,10 +529,10 @@ GEM
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (7.1.1)
actionpack (>= 7.0)
activesupport (>= 7.0)
railties (>= 7.0)
rspec-rails (8.0.0)
actionpack (>= 7.2)
activesupport (>= 7.2)
railties (>= 7.2)
rspec-core (~> 3.13)
rspec-expectations (~> 3.13)
rspec-mocks (~> 3.13)
Expand All @@ -540,7 +556,8 @@ GEM
prism (~> 1.4)
ruby-macho (4.1.0)
ruby-mysql (4.2.0)
ruby-prof (1.7.1)
ruby-prof (1.7.2)
base64
ruby-progressbar (1.13.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
Expand Down Expand Up @@ -570,6 +587,7 @@ GEM
sqlite3 (1.7.3)
mini_portile2 (~> 2.8.0)
sshkey (3.0.0)
stringio (3.1.7)
strptime (0.2.5)
swagger-blocks (3.0.0)
test-prof (1.4.4)
Expand All @@ -591,6 +609,7 @@ GEM
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
unix-crypt (1.3.1)
useragent (0.16.11)
warden (1.2.9)
rack (>= 2.0.9)
webrick (1.9.1)
Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions db/schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -803,5 +803,4 @@
t.boolean "limit_to_network", default: false, null: false
t.boolean "import_fingerprint", default: false
end

end
2 changes: 1 addition & 1 deletion lib/metasploit/framework/rails_version_constraint.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Metasploit
module Framework
module RailsVersionConstraint
RAILS_VERSION = '~> 7.1.0'
RAILS_VERSION = '~> 7.2.0'
end
end
end
2 changes: 1 addition & 1 deletion lib/msf/core/db_manager/cred.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Contributor

@adfoster-r7 adfoster-r7 Jun 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixing a type coercion, where opts[:type] was a real Ruby object when it was expecting a string or primitive value - which broke Rails. Forcing .to_s ensures the string value is used

end

if opts[:jtr_format].present?
Expand Down
2 changes: 1 addition & 1 deletion lib/msf/core/exploit/remote/mysql.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 1 addition & 5 deletions metasploit-framework.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ Gem::Specification.new do |spec|
# SSH server library with ed25519
spec.add_runtime_dependency 'hrr_rb_ssh-ed25519'
# Needed for irb internal command
spec.add_runtime_dependency 'irb', '~> 1.7.4'
spec.add_runtime_dependency 'irb'

# AWS enumeration modules
spec.add_runtime_dependency 'aws-sdk-s3'
Expand Down Expand Up @@ -248,10 +248,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'

Expand Down
2 changes: 1 addition & 1 deletion modules/post/windows/gather/win_privs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion modules/post/windows/manage/make_token.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
]
}
Expand Down
0 ...grate/99999999999999_test_db_migration.rb → ...grate/20250612131915_test_db_migration.rb
View file
Open in desktop
File renamed without changes.
Loading
Loading