Ensure identify hashes helper is accessible to modules #17872
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adfoster-r7
force-pushed
the
ensure-identify-hashes-helper-is-accessible-to-modules
branch
from
dff1640
to
8e2169e
Compare
adfoster-r7
commented
Apr 12, 2023
| @@ -212,7 +210,7 @@ def pillage(ldif, base_dn) | |||
| ltype.gsub!(/ /, '_') | |||
| ltype.gsub!(/,/, '.') | |||
| ltype.gsub!(/(ou=|fn=|cn=|o=|dc=|c=)/i, '') | |||
| ltype.gsub!(/[^a-z0-9._\-]+/i, '') | |||
| ltype.gsub!(/[^a-z0-9._-]+/i, '') | |||
There was a problem hiding this comment.
Unrelated automated rubocop change
== modules/auxiliary/gather/ldap_hashdump.rb ==
C:213: 28: [Correctable] Style/RedundantRegexpEscape: Redundant escape inside regexp literal
1 file inspected, 1 offense detected, 1 offense autocorrectable
modules/auxiliary/gather/ldap_hashdump.rb - [ERROR] Rubocop failed. Please run rubocop -a modules/auxiliary/gather/ldap_hashdump.rb and verify all issues are resolved
adfoster-r7
commented
Apr 12, 2023
| @@ -333,3 +333,6 @@ def finalize_loader(loader) | |||
| autoload :RubySMB, 'ruby_smb' | |||
|
|
|||
| require 'rexml/document' | |||
|
|
|||
| # XXX: Should be removed once the `lib/metasploit` folder is loaded by Zeitwerk | |||
| require 'metasploit/framework/hashes' | |||
There was a problem hiding this comment.
This will probably look something like:
diff --git a/lib/msf_autoload.rb b/lib/msf_autoload.rb
index 7bb1da35af..0b697e6ae0 100644
--- a/lib/msf_autoload.rb
+++ b/lib/msf_autoload.rb
@@ -298,6 +298,7 @@ class MsfAutoload
[
{ path: "#{__dir__}/msf/", namespace: Msf },
{ path: "#{__dir__}/rex/", namespace: Rex },
+ { path: "#{__dir__}/metasploit/", namespace: Metasploit }
]
endBut it would require more testing/fixing than the cycles currently available
|
Fixed my issue with certifried will land |
Release NotesFixes a crash when modules relied on a hash identifying method that wasn't always available. This method is now available as expected and modules will no longer crash. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes a crash when modules relied on a hash identifying method that wasn't always available. This method is now available as expected and modules will no longer crash.
Spotted as part of #17353 (comment)
Verification
Ensure the hashes helper is available from within Metasploit console: