-
Notifications
You must be signed in to change notification settings - Fork 100
Utility function for SSRF Assertions in test writers #1382
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.
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
Open
seran
wants to merge
11
commits into
master
Choose a base branch
from
ssrf-test-assertions
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+42
−11
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
fd7c5e7
util method
seran 8355a48
working commit
seran 514c65d
comments to method
seran 320bf8b
final updates
seran bd6048a
method rename
seran 6182b62
Merge branch 'master' into ssrf-test-assertions
seran 6451428
clean-up
seran db378aa
fixes
seran 1147c44
Merge branch 'master' into ssrf-test-assertions
seran 8a727f2
Merge branch 'master' into ssrf-test-assertions
seran f2ae275
Merge branch 'master' into ssrf-test-assertions
seran File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -643,6 +643,7 @@ class TestSuiteWriter { | |
| if (config.ssrf && solution.hasSsrfFaults()) { | ||
| httpCallbackVerifier.getActionVerifierMappings().forEach { v -> | ||
| addStatement("private static WireMockServer ${v.getVerifierName()}", lines) | ||
| addStatement("private static final String SSRF_METADATA_TAG = \"SSRF\"", lines) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -674,7 +675,9 @@ class TestSuiteWriter { | |
| if (config.ssrf && solution.hasSsrfFaults()) { | ||
| httpCallbackVerifier.getActionVerifierMappings().forEach { v -> | ||
| addStatement("private lateinit var ${v.getVerifierName()}: WireMockServer", lines) | ||
| addStatement("private const val SSRF_METADATA_TAG: String = \"SSRF\" ", lines) | ||
| } | ||
| assertionUtilFunctionForSSRF(lines, config.outputFormat) | ||
| } | ||
|
|
||
| if(config.problemType == EMConfig.ProblemType.WEBFRONTEND){ | ||
|
|
@@ -1036,6 +1039,10 @@ class TestSuiteWriter { | |
|
|
||
| initTestMethod(solution, lines, testSuiteFileName) | ||
| lines.addEmpty(2) | ||
|
|
||
| if (config.ssrf && solution.hasSsrfFaults() && format.isJava()) { | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. not used in Kotlin? |
||
| assertionUtilFunctionForSSRF(lines, config.outputFormat) | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -1144,4 +1151,36 @@ class TestSuiteWriter { | |
| .toList() | ||
| } | ||
|
|
||
| private fun assertionUtilFunctionForSSRF(lines: Lines, format: OutputFormat) { | ||
| lines.addEmpty(1) | ||
|
|
||
| when { | ||
| format.isKotlin() -> { | ||
| lines.addSingleCommentLine("To verify whether the HttpCallbackVerifier has received any requests.") | ||
| lines.add("fun verifierHasReceivedRequests(verifier: WireMockServer, actionName: String) : Boolean") | ||
| } | ||
| format.isJava() -> { | ||
| lines.startCommentBlock() | ||
| lines.addBlockCommentLine("Method to verify whether the HttpCallbackVerifier has received any requests.") | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why the comment for |
||
| lines.endCommentBlock() | ||
| lines.add("public static boolean verifierHasReceivedRequests(WireMockServer verifier, String actionName)") | ||
| } | ||
| } | ||
| lines.block { | ||
| lines.add("return verifier") | ||
| lines.indented { | ||
| if (format.isKotlin()) { | ||
| lines.add(".allServeEvents") | ||
| lines.add(".filter { it.wasMatched && it.stubMapping.metadata != null }") | ||
| lines.add(".any { it.stubMapping.metadata.getString(SSRF_METADATA_TAG) == actionName }") | ||
| } | ||
| if (format.isJava()) { | ||
| lines.add(".getAllServeEvents()") | ||
| lines.add(".stream().filter( r -> r.getWasMatched() && r.getStubMapping().getMetadata() != null)") | ||
| lines.add(".anyMatch( r -> r.getStubMapping().getMetadata().getString(SSRF_METADATA_TAG).equals(actionName));") | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if this
verifierHasReceivedRequestslabel is used more than once in the code, should be put in aval