-
Notifications
You must be signed in to change notification settings - Fork 1.9k
C#: Taint members of types in ASP.NET user context. #21612
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
michaelnebel
wants to merge
7
commits into
github:main
Choose a base branch
from
michaelnebel:csharp/legacyasptaintedmember
base: main
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.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
3e11b2e
C#: Update remote flow sources test to also report tainted members.
michaelnebel eced198
C#: Reclassify some sources as AspNetRemoteFlowSource.
michaelnebel f859fc4
C#: Taint members of types used in ASP.NET remote flow source context.
michaelnebel cb7763a
C#: Add an ASP.NET flow source example when using the WebMethod attri…
michaelnebel a26c5d1
C#: Streamline the implementation for ASP.NET Core tainted members.
michaelnebel 2d4c18e
C#: Add change-note.
michaelnebel 0a23104
C#: Address review comments.
michaelnebel 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| --- | ||
| category: minorAnalysis | ||
| --- | ||
| * Expanded ASP and ASP.NET remote source modeling to cover additional sources, including fields of tainted parameters as well as properties and fields that become tainted transitively. |
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 |
|---|---|---|
|
|
@@ -104,7 +104,7 @@ class WcfRemoteFlowSource extends RemoteFlowSource, DataFlow::ParameterNode { | |
| } | ||
|
|
||
| /** A data flow source of remote user input (ASP.NET web service). */ | ||
| class AspNetServiceRemoteFlowSource extends RemoteFlowSource, DataFlow::ParameterNode { | ||
| class AspNetServiceRemoteFlowSource extends AspNetRemoteFlowSource, DataFlow::ParameterNode { | ||
| AspNetServiceRemoteFlowSource() { | ||
| exists(Method m | | ||
| m.getAParameter() = this.getParameter() and | ||
|
|
@@ -115,8 +115,50 @@ class AspNetServiceRemoteFlowSource extends RemoteFlowSource, DataFlow::Paramete | |
| override string getSourceType() { result = "ASP.NET web service input" } | ||
| } | ||
|
|
||
| private class CandidateMembersToTaint extends Member { | ||
| CandidateMembersToTaint() { | ||
| this.isPublic() and | ||
| not this.isStatic() and | ||
| ( | ||
| this = | ||
| any(Property p | | ||
| p.isAutoImplemented() and | ||
| p.getGetter().isPublic() and | ||
| p.getSetter().isPublic() | ||
| ) | ||
| or | ||
| this = any(Field f | f.isPublic()) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Taint members (transitively) on types used in | ||
| * 1. Action method parameters. | ||
| * 2. WebMethod parameters. | ||
| * | ||
| * Note that this also impacts uses of such types in other contexts. | ||
| */ | ||
| private class AspNetRemoteFlowSourceMember extends TaintTracking::TaintedMember, | ||
| CandidateMembersToTaint | ||
| { | ||
| AspNetRemoteFlowSourceMember() { | ||
| exists(Type t, Type t0 | t = this.getDeclaringType() | | ||
| (t = t0 or t = t0.(ArrayType).getElementType()) and | ||
|
Contributor
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. Could this be any collection type and not just arrays? |
||
| ( | ||
| t0 = any(AspNetRemoteFlowSourceMember m).getType() | ||
| or | ||
| t0 = any(ActionMethodParameter p).getType() | ||
| or | ||
| t0 = any(AspNetServiceRemoteFlowSource source).getType() | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| /** A data flow source of remote user input (ASP.NET request message). */ | ||
| class SystemNetHttpRequestMessageRemoteFlowSource extends RemoteFlowSource, DataFlow::ExprNode { | ||
| class SystemNetHttpRequestMessageRemoteFlowSource extends AspNetRemoteFlowSource, DataFlow::ExprNode | ||
| { | ||
| SystemNetHttpRequestMessageRemoteFlowSource() { | ||
| this.getType() instanceof SystemWebHttpRequestMessageClass | ||
| } | ||
|
|
@@ -166,7 +208,7 @@ class MicrosoftOwinRequestRemoteFlowSource extends RemoteFlowSource, DataFlow::E | |
| } | ||
|
|
||
| /** A parameter to an Mvc controller action method, viewed as a source of remote user input. */ | ||
| class ActionMethodParameter extends RemoteFlowSource, DataFlow::ParameterNode { | ||
| class ActionMethodParameter extends AspNetRemoteFlowSource, DataFlow::ParameterNode { | ||
| ActionMethodParameter() { | ||
| exists(Parameter p | | ||
| p = this.getParameter() and | ||
|
|
@@ -218,14 +260,18 @@ class AspNetCoreRoutingMethodParameter extends AspNetCoreRemoteFlowSource, DataF | |
| * Flow is defined from any ASP.NET Core remote source object to any of its member | ||
| * properties. | ||
| */ | ||
| private class AspNetCoreRemoteFlowSourceMember extends TaintTracking::TaintedMember, Property { | ||
| private class AspNetCoreRemoteFlowSourceMember extends TaintTracking::TaintedMember, | ||
| CandidateMembersToTaint | ||
| { | ||
| AspNetCoreRemoteFlowSourceMember() { | ||
| this.getDeclaringType() = any(AspNetCoreRemoteFlowSource source).getType() and | ||
| this.isPublic() and | ||
| not this.isStatic() and | ||
| this.isAutoImplemented() and | ||
| this.getGetter().isPublic() and | ||
| this.getSetter().isPublic() | ||
| exists(Type t, Type t0 | t = this.getDeclaringType() | | ||
| (t = t0 or t = t0.(ArrayType).getElementType()) and | ||
| ( | ||
| t0 = any(AspNetCoreRemoteFlowSourceMember m).getType() | ||
| or | ||
| t0 = any(AspNetCoreRemoteFlowSource m).getType() | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
|
|
||
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
1 change: 1 addition & 0 deletions
1
csharp/ql/test/library-tests/dataflow/flowsources/aspremote/aspRemoteFlowSource.expected
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
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
8 changes: 5 additions & 3 deletions
8
csharp/ql/test/library-tests/dataflow/flowsources/remote/remoteFlowSource.ql
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 |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| import semmle.code.csharp.security.dataflow.flowsources.Remote | ||
|
|
||
| from RemoteFlowSource source | ||
| where source.getLocation().getFile().fromSource() | ||
| select source, source.getSourceType() | ||
| query predicate remoteFlowSourceMembers(TaintTracking::TaintedMember m) { m.fromSource() } | ||
|
|
||
| query predicate remoteFlowSources(RemoteFlowSource source, string type) { | ||
| source.getLocation().getFile().fromSource() and type = source.getSourceType() | ||
| } |
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
Oops, something went wrong.
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.
nit:
CandidateMemberToTaintinstead.