Add unsafe-deserialization support for Jabsorb #6419
Merged
Conversation
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 is partly extracted from github#5954
aschackmull
reviewed
Aug 4, 2021
| predicate looksLikeResolveClassStep(DataFlow::Node fromNode, DataFlow::Node toNode) { | ||
| exists(MethodAccess ma, Method m, Expr arg | m = ma.getMethod() and arg = ma.getAnArgument() | | ||
| m.getReturnType() instanceof JacksonTypeDescriptorType and | ||
| m.getName().toLowerCase().regexpMatch("(?i).*(resolve|load|class|type).*") and |
There was a problem hiding this comment.
Suggested change
| m.getName().toLowerCase().regexpMatch("(?i).*(resolve|load|class|type).*") and | |
| m.getName().regexpMatch("(?i).*(resolve|load|class|type).*") and |
aschackmull
reviewed
Aug 4, 2021
| @@ -77,14 +77,6 @@ class SetPolymorphicTypeValidatorSource extends DataFlow::ExprNode { | |||
| } | |||
| } | |||
|
|
|||
| /** Holds if `fromNode` to `toNode` is a dataflow step that resolves a class. */ | |||
| predicate resolveClassStep(DataFlow::Node fromNode, DataFlow::Node toNode) { | |||
| exists(ReflectiveClassIdentifierMethodAccess ma | | |||
There was a problem hiding this comment.
Did this removal make any imports superfluous in this file?
aschackmull
reviewed
Aug 4, 2021
- Remove unneeded import - Remove unnecessary `toLowerCase` call
|
@aschackmull done |
aschackmull
approved these changes
Aug 5, 2021
Marcono1234
reviewed
Aug 6, 2021
| or | ||
| ma.getMethod() instanceof JabsorbUnmarshallMethod | ||
| ) and | ||
| // Note `JacksonTypeDescriptorType` includes plain old `java.lang.Class` | ||
| arg.getType() instanceof JacksonTypeDescriptorType and |
There was a problem hiding this comment.
Should JacksonTypeDescriptorType now be refactored as well given that the predicates using it are not exclusively used for Jackson anymore?
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 is partly extracted from #5954