Skip to content

Commit a5fd433

Browse files
committed
C#: Convert sink capture test to inline expectation.
1 parent 26f9297 commit a5fd433

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
| Sinks;NewSinks;false;WrapFieldResponseWriteFile;();;Argument[this];html-injection;df-generated |
2-
| Sinks;NewSinks;false;WrapPropResponseWriteFile;();;Argument[this];html-injection;df-generated |
3-
| Sinks;NewSinks;false;WrapResponseWrite;(System.Object);;Argument[0];html-injection;df-generated |
4-
| Sinks;NewSinks;false;WrapResponseWriteFile;(System.String);;Argument[0];html-injection;df-generated |
1+
unexpectedModel
2+
expectedModel
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import csharp
2+
import utils.modelgenerator.internal.CaptureModels
3+
import TestUtilities.InlineMadTest
4+
5+
module InlineMadTestConfig implements InlineMadTestConfigSig {
6+
string getCapturedModel(Callable c) { result = captureSink(c) }
7+
8+
string getKind() { result = "sink" }
9+
}
10+
11+
import InlineMadTest<InlineMadTestConfig>

csharp/ql/test/utils/modelgenerator/dataflow/CaptureSinkModels.qlref

Lines changed: 0 additions & 1 deletion
This file was deleted.

csharp/ql/test/utils/modelgenerator/dataflow/Sinks.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class NewSinks
1313
public string PrivateSetTaintedProp { get; private set; }
1414

1515
// New sink
16+
// sink=Sinks;NewSinks;false;WrapResponseWrite;(System.Object);;Argument[0];html-injection;df-generated
1617
public void WrapResponseWrite(object o)
1718
{
1819
var response = new HttpResponse();
@@ -27,13 +28,15 @@ private void PrivateWrapResponseWrite(object o)
2728
}
2829

2930
// New sink
31+
// sink=Sinks;NewSinks;false;WrapResponseWriteFile;(System.String);;Argument[0];html-injection;df-generated
3032
public void WrapResponseWriteFile(string s)
3133
{
3234
var response = new HttpResponse();
3335
response.WriteFile(s);
3436
}
3537

3638
// New sink
39+
// sink=Sinks;NewSinks;false;WrapFieldResponseWriteFile;();;Argument[this];html-injection;df-generated
3740
public void WrapFieldResponseWriteFile()
3841
{
3942
var response = new HttpResponse();
@@ -48,6 +51,7 @@ public void WrapPrivateFieldResponseWriteFile()
4851
}
4952

5053
// New sink
54+
// sink=Sinks;NewSinks;false;WrapPropResponseWriteFile;();;Argument[this];html-injection;df-generated
5155
public void WrapPropResponseWriteFile()
5256
{
5357
var response = new HttpResponse();
@@ -67,4 +71,4 @@ public void WrapPropPrivateSetResponseWriteFile()
6771
var response = new HttpResponse();
6872
response.WriteFile(PrivateSetTaintedProp);
6973
}
70-
}
74+
}

0 commit comments

Comments
 (0)