hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 10:15:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17219 from michaelnebel/shared/neutralsourcesink

Browse Source 
C#/Java: Fix source- and sink callable provenance overlap.
This commit is contained in:
Michael Nebel
2024-08-15 11:02:18 +02:00
committed by GitHub
parent b16dc20bbd eaf4f5eeab
commit 4b3cc5bd0e
7 changed files with 53 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
View File

@@ -613,32 +613,6 @@ private class SummarizedCallableAdapter extends SummarizedCallable {
}
}
/**
* A callable where there exists a MaD sink model that applies to it.
*/
private class SinkModelCallableAdapter extends SinkModelCallable {
private Provenance provenance;
SinkModelCallableAdapter() {
SourceSinkInterpretationInput::sinkElement(this, _, _, provenance, _)
}
override predicate hasProvenance(Provenance p) { provenance = p }
}
final class SourceCallable = SourceModelCallable;
final class SinkCallable = SinkModelCallable;
/**
* A callable where there exists a MaD source model that applies to it.
*/
private class SourceModelCallableAdapter extends SourceModelCallable {
private Provenance provenance;
SourceModelCallableAdapter() {
SourceSinkInterpretationInput::sourceElement(this, _, _, provenance, _)
}
override predicate hasProvenance(Provenance p) { provenance = p }
}
final class SourceCallable = SourceModelCallable;

7
csharp/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.ext.yml
View File

@@ -6,6 +6,13 @@ extensions:
- [ "Sinks", "NewSinks", False, "Sink", "(System.Object)", "", "Argument[0]", "test-sink", "manual"]
- [ "Sinks", "NewSinks", False, "Sink2", "(System.Object)", "", "Argument[0]", "test-sink2", "manual"]
- [ "Sinks", "NewSinks", False, "ManualSinkAlreadyDefined", "(System.Object)", "", "Argument[0]", "test-sink", "manual"]
- [ "Sinks", "NewSinks", False, "SaveAndGet", "(System.Object)", "", "Argument[0]", "test-sink", "df-generated"]
- addsTo:
pack: codeql/csharp-all
extensible: sourceModel
data:
- [ "Sinks", "NewSinks", False, "SaveAndGet", "(System.Object)", "", "ReturnValue", "test-source", "manual"]
- addsTo:
pack: codeql/csharp-all

9
csharp/ql/test/utils/modelgenerator/dataflow/Sinks.cs
View File

@@ -24,6 +24,15 @@ public class NewSinks
// neutral=Sinks;NewSinks;NoSink;(System.Object);summary;df-generated
public static void NoSink(object o) => throw null;
// Sink and Source defined in the extensible file next to the sink test.
// sink=Sinks;NewSinks;false;SaveAndGet;(System.Object);;Argument[0];test-sink;df-generated
// neutral=Sinks;NewSinks;SaveAndGet;(System.Object);summary;df-generated
public static object SaveAndGet(object o)
{
Sink(o);
return null;
}
// New sink
// sink=Sinks;NewSinks;false;WrapResponseWrite;(System.Object);;Argument[0];html-injection;df-generated
// neutral=Sinks;NewSinks;WrapResponseWrite;(System.Object);summary;df-generated