Allow a specific service to be used#197
Merged
adfoster-r7 merged 1 commit intorapid7:masterfrom Apr 10, 2026
Merged
Conversation
6 tasks
There was a problem hiding this comment.
Pull request overview
This PR updates the credential origin creation flow to allow callers to explicitly bind a credential origin to an existing Mdm::Service (or a :service_id), improving how service-associated creds surface in creds output by ensuring origins are Metasploit::Credential::Origin::Service.
Changes:
- Extend
create_credential_origin_serviceto accept:service(and:service_id) to reuse an existing service instead of always creating one. - Prefer
:service_id(or:service.id) when creatingMetasploit::Credential::Origin::Service, falling back tocreate_credential_serviceonly when needed. - Update method documentation to mention the new
:serviceoption.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
301cd2d to
36c27a6
Compare
adfoster-r7
approved these changes
Apr 10, 2026
This file contains hidden or 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
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.
This allows credentials to be reported with explicit services. In order to show up in Metasploit's
credscommand output, the origin must be aMetasploit::Credential::Origin::ServiceorMetasploit::Credential::Origin::Sessioninstance, anMdm::Servicecan't be used. I think this is because it needs to be associated with a module too which is fine, mo info mo betta. This does however complicate the pattern where a module has a service that it has reported, then it's obtained a credential from that service such as a certificate from MS-ICPR or AD CS Web Enrollment. In that case, the Mdm::Service object could be passed as the origin but then the information is omitted from thecredscommand. This allows a caller to pass theMdm::Serviceas the:serviceargument, and when it is it's used instead of taking theoptsto create a new service instance.If a
:service_idis specified, it takes precedence. Ultimately, it's the ID that's used to create theMetasploit::Credential::Origin::Serviceinstance.