Skip to content
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

Update gem dependencies #18432

Merged
merged 1 commit into from
Oct 6, 2023
Merged

Update gem dependencies #18432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 31 additions & 31 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ PATH
filesize
hrr_rb_ssh-ed25519
http-cookie
irb
irb (~> 1.7.4)
jsobfu
json
metasm
Expand Down Expand Up @@ -141,13 +141,13 @@ GEM
activerecord (>= 3.1.0, < 8)
ast (2.4.2)
aws-eventstream (1.2.0)
aws-partitions (1.829.0)
aws-sdk-core (3.184.0)
aws-partitions (1.834.0)
aws-sdk-core (3.185.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-ec2 (1.409.0)
aws-sdk-ec2 (1.411.0)
aws-sdk-core (~> 3, >= 3.184.0)
aws-sigv4 (~> 1.1)
aws-sdk-ec2instanceconnect (1.34.0)
Expand Down Expand Up @@ -221,7 +221,7 @@ GEM
faye-websocket (0.11.3)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.16.2)
ffi (1.16.3)
filesize (0.2.0)
fivemat (1.3.7)
gssapi (1.3.1)
Expand Down Expand Up @@ -259,12 +259,12 @@ GEM
systemu (~> 2.6.5)
memory_profiler (1.0.1)
metasm (1.0.5)
metasploit-concern (5.0.1)
metasploit-concern (5.0.2)
activemodel (~> 7.0)
activesupport (~> 7.0)
railties (~> 7.0)
zeitwerk
metasploit-credential (6.0.5)
metasploit-credential (6.0.6)
metasploit-concern
metasploit-model
metasploit_data_models (>= 5.0.0)
Expand All @@ -274,12 +274,12 @@ GEM
rex-socket
rubyntlm
rubyzip
metasploit-model (5.0.1)
metasploit-model (5.0.2)
activemodel (~> 7.0)
activesupport (~> 7.0)
railties (~> 7.0)
metasploit-payloads (2.0.154)
metasploit_data_models (6.0.2)
metasploit_data_models (6.0.3)
activerecord (~> 7.0)
activesupport (~> 7.0)
arel-helpers
Expand All @@ -293,7 +293,7 @@ GEM
method_source (1.0.0)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0808)
mime-types-data (3.2023.1003)
mini_portile2 (2.8.4)
minitest (5.20.0)
mqtt (0.6.0)
Expand All @@ -302,7 +302,7 @@ GEM
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
nessus_rest (0.1.6)
net-imap (0.3.7)
net-imap (0.4.0)
date
net-protocol
net-ldap (0.18.0)
Expand All @@ -327,7 +327,7 @@ GEM
packetfu (2.0.0)
pcaprub (~> 0.13.1)
parallel (1.23.0)
parser (3.2.2.3)
parser (3.2.2.4)
ast (~> 2.4.1)
racc
patch_finder (1.0.2)
Expand Down Expand Up @@ -377,56 +377,56 @@ GEM
nokogiri
redcarpet (3.6.0)
regexp_parser (2.8.1)
reline (0.3.8)
reline (0.3.9)
io-console (~> 0.5)
require_all (3.0.0)
rex-arch (0.1.14)
rex-arch (0.1.15)
rex-text
rex-bin_tools (0.1.8)
rex-bin_tools (0.1.9)
metasm
rex-arch
rex-core
rex-struct2
rex-text
rex-core (0.1.31)
rex-encoder (0.1.6)
rex-encoder (0.1.7)
metasm
rex-arch
rex-text
rex-exploitation (0.1.38)
rex-exploitation (0.1.39)
jsobfu
metasm
rex-arch
rex-encoder
rex-text
rexml
rex-java (0.1.6)
rex-mime (0.1.7)
rex-java (0.1.7)
rex-mime (0.1.8)
rex-text
rex-nop (0.1.2)
rex-nop (0.1.3)
rex-arch
rex-ole (0.1.7)
rex-ole (0.1.8)
rex-text
rex-powershell (0.1.98)
rex-powershell (0.1.99)
rex-random_identifier
rex-text
ruby-rc4
rex-random_identifier (0.1.10)
rex-random_identifier (0.1.11)
rex-text
rex-registry (0.1.4)
rex-rop_builder (0.1.4)
rex-registry (0.1.5)
rex-rop_builder (0.1.5)
metasm
rex-core
rex-text
rex-socket (0.1.54)
rex-core
rex-sslscan (0.1.9)
rex-sslscan (0.1.10)
rex-core
rex-socket
rex-text
rex-struct2 (0.1.3)
rex-text (0.2.52)
rex-zip (0.1.4)
rex-struct2 (0.1.4)
rex-text (0.2.53)
rex-zip (0.1.5)
rex-text
rexml (3.2.6)
rkelly-remix (0.0.7)
Expand All @@ -453,7 +453,7 @@ GEM
rspec-rerun (1.1.0)
rspec (~> 3.0)
rspec-support (3.12.1)
rubocop (1.56.3)
rubocop (1.56.4)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
Expand Down Expand Up @@ -518,7 +518,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (2.4.2)
unicode-display_width (2.5.0)
unix-crypt (1.3.1)
uuid (2.3.9)
macaddr (~> 1.0)
Expand Down
2 changes: 1 addition & 1 deletion lib/postgres/postgres-pr/scram_sha_256.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

require 'base64'
require 'openssl'
require 'net/imap/sasl'
require 'net/imap'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fix autoloading issue

  1) Msf::Db::PostgresPR::ScramSha256#normalize returns the expected value for the test {:str=>"\u0627123", :error=>/must start.*end with RandAL/i}
     Failure/Error: expect { subject.normalize(test[:str]) }.to raise_error expected_clazz, expected_message

       expected Msf::Db::PostgresPR::ScramSha256::NormalizeError with message matching /must start.*end with RandAL/i, got #<NameError: uninitialized constant Net::IMAP::StringPrep> with backtrace:
         # ./lib/postgres/postgres-pr/scram_sha_256.rb:64:in `normalize'
         # ./spec/lib/postgres/postgres-pr/scram_sha_256_spec.rb:73:in `block (5 levels) in <top (required)>'
         # ./spec/lib/postgres/postgres-pr/scram_sha_256_spec.rb:73:in `block (4 levels) in <top (required)>'
     # ./spec/lib/postgres/postgres-pr/scram_sha_256_spec.rb:73:in `block (4 levels) in <top (required)>'


# Namespace for Metasploit branch.
module Msf
Expand Down
2 changes: 1 addition & 1 deletion metasploit-framework.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,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'
spec.add_runtime_dependency 'irb', '~> 1.7.4'
Copy link
Contributor Author

Choose a reason for hiding this comment

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

irb 1.8 pulls in psych which would cause issues right now; should be able to unpin this once we're officially on Ruby 3.1


# AWS enumeration modules
spec.add_runtime_dependency 'aws-sdk-s3'
Expand Down