Update for compatibility with the new Layered Services data model#196
Merged
cgranleese-r7 merged 1 commit intorapid7:masterfrom Feb 9, 2026
Merged
Conversation
cgranleese-r7
approved these changes
Feb 9, 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 PR updates the service lookup in
#create_credential_serviceto also include the service name. This change is needed since now the service name defines a unique service. Services with the samehost,portandprotobut with different names a now considered separate services. Note that this also applies to the newresourcefield. I haven't added theresourcein the lookup since it doesn't seem to be necessary for now. Please, let me know if you think otherwise.Some considerations:
namefield isnil) and the same rule applies. Two services with the samehost,portandproto, but one with a name and the other without, will be considered as two separate services.{}and the same rule applies. Two services with the samehost,port,protoandname, but one with a specific resource and the other without (empty JSON), will be considered as two separate services.This PR also update the
pwdumpfile to import in specs. The format was not parsed correctly by thepwdumpparser and caused unexpected service creations. I tried to keep it consistent with the original regex: