Python taint-tracking: update test results.

markshannon · markshannon · commit 1addfaac1a63 · 2019-08-29T10:31:50.000+01:00
diff --git a/python/ql/src/semmle/python/security/TaintTracking.qll b/python/ql/src/semmle/python/security/TaintTracking.qll
@@ -700,6 +700,15 @@ module DataFlow {
 
         abstract Location getLocation();
 
+        AstNode asAstNode() {
+            result = this.asCfgNode().getNode()
+        }
+
+        /** For backwards compatibility -- Use asAstNode() instead */
+        deprecated AstNode getNode() {
+            result = this.asAstNode()
+        }
+
     }
 
     class CfgNode extends Node, TCfgNode {
diff --git a/python/ql/test/library-tests/taint/config/TaintLib.qll b/python/ql/test/library-tests/taint/config/TaintLib.qll
@@ -10,7 +10,14 @@ class SimpleTest extends TaintKind {
 
 }
 
-class SimpleConfig extends TaintTracking::Configuration {
+abstract class TestConfig extends TaintTracking::Configuration {
+
+    bindingset[this]
+    TestConfig() { any() }
+
+}
+
+class SimpleConfig extends TestConfig {
 
     SimpleConfig() { this = "Simple config" }
 
@@ -49,7 +56,7 @@ class BasicCustomTaint extends TaintKind {
 }
 
 
-class BasicCustomConfig extends TaintTracking::Configuration {
+class BasicCustomConfig extends TestConfig {
 
     BasicCustomConfig() { this = "Basic custom config" }
 
@@ -99,7 +106,7 @@ class Scissors extends TaintKind {
 
 }
 
-class RockPaperScissorConfig extends TaintTracking::Configuration {
+class RockPaperScissorConfig extends TestConfig {
 
     RockPaperScissorConfig() { this = "Rock-paper-scissors config" }
 
@@ -145,7 +152,7 @@ class TaintCarrier extends TaintKind {
 
 }
 
-class TaintCarrierConfig extends  TaintTracking::Configuration {
+class TaintCarrierConfig extends TestConfig {
 
     TaintCarrierConfig() { this = "Taint carrier config" }
 
@@ -327,5 +334,3 @@ class TaintIterableSource extends TaintSource {
 
 }
 
-
-
diff --git a/python/ql/test/library-tests/taint/config/TaintedArgument.ql b/python/ql/test/library-tests/taint/config/TaintedArgument.ql
@@ -9,5 +9,6 @@ import semmle.python.dataflow.Implementation
 
 from TaintTrackingImplementation config, TaintTrackingNode src, CallNode call, 
      TaintTrackingContext caller, CallableValue pyfunc, int arg, AttributePath path, TaintKind kind
-where config.callWithTaintedArgument(src, call, caller, pyfunc, arg, path, kind)
+where config instanceof TestConfig and
+config.callWithTaintedArgument(src, call, caller, pyfunc, arg, path, kind)
 select config, src, call, caller, pyfunc, arg, path, kind
diff --git a/python/ql/test/library-tests/taint/config/TestNode.ql b/python/ql/test/library-tests/taint/config/TestNode.ql
@@ -5,5 +5,6 @@ import TaintLib
 
 
 from TaintTrackingNode n
+where n.getConfiguration() instanceof TestConfig
 select n.getTaintKind(), n.getLocation().toString(), n.getNode().toString(), n.getPath().toString(), n.getContext().toString()
 
diff --git a/python/ql/test/library-tests/taint/config/TestSink.ql b/python/ql/test/library-tests/taint/config/TestSink.ql
@@ -2,7 +2,7 @@ import python
 import semmle.python.security.TaintTracking
 import TaintLib
 
-from TaintTracking::Configuration config, DataFlow::Node sink, TaintKind kind
+from TestConfig config, DataFlow::Node sink, TaintKind kind
 
 where config.isSink(sink, kind)
 select config, sink.getLocation().toString(), sink.getLocation().getStartLine(), sink.toString(), kind
diff --git a/python/ql/test/library-tests/taint/config/TestSource.ql b/python/ql/test/library-tests/taint/config/TestSource.ql
@@ -2,7 +2,7 @@ import python
 import semmle.python.security.TaintTracking
 import TaintLib
 
-from TaintTracking::Configuration config, DataFlow::Node source, TaintKind kind
+from TestConfig config, DataFlow::Node source, TaintKind kind
 
 where config.isSource(source, kind)
 select config, source.getLocation().toString(), source.getLocation().getStartLine(), source.toString(), kind
diff --git a/python/ql/test/library-tests/taint/config/TestStep.ql b/python/ql/test/library-tests/taint/config/TestStep.ql
@@ -4,7 +4,7 @@ import TaintLib
 import semmle.python.dataflow.Implementation
 
 
-from TaintTrackingNode n, TaintTrackingNode s, TaintTracking::Configuration config
+from TaintTrackingNode n, TaintTrackingNode s, TestConfig config
 where s = n.getASuccessor() and config = n.getConfiguration()
 select 
     config + ":", 
diff --git a/python/ql/test/library-tests/taint/dataflow/TestNode.expected b/python/ql/test/library-tests/taint/dataflow/TestNode.expected
@@ -1,2 +1 @@
-ERROR: getNode() cannot be resolved for type Node (TestNode.ql:5,69-76)
-ERROR: getTrackedValue() cannot be resolved for type TaintedNode (TestNode.ql:5,10-25)
+WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:5,77-84)
diff --git a/python/ql/test/library-tests/taint/dataflow/TestNode.ql b/python/ql/test/library-tests/taint/dataflow/TestNode.ql
@@ -2,4 +2,4 @@ import python
 import Config
 
 from TaintedNode n
-select n.getTrackedValue(), n.getLocation().toString(), n.getNode().getNode().toString(), n.getContext()
+select "Taint " + n.getTaintKind(), n.getLocation().toString(), n.getNode().getNode().toString(), n.getContext()
diff --git a/python/ql/test/library-tests/taint/exception_traceback/TestNode.expected b/python/ql/test/library-tests/taint/exception_traceback/TestNode.expected
@@ -1,3 +1,4 @@
+WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:8,43-50)
 | test.py:10:11:10:47 | test.py:10 | MyException() | exception.kind |
 | test.py:15:25:15:25 | test.py:15 | e | exception.kind |
 | test.py:16:13:16:34 | test.py:16 | Attribute() | exception.info |
diff --git a/python/ql/test/library-tests/taint/exception_traceback/TestStep.expected b/python/ql/test/library-tests/taint/exception_traceback/TestStep.expected
@@ -1,3 +1,5 @@
+WARNING: Predicate getNode has been deprecated and may be removed in future (TestStep.ql:12,74-81)
+WARNING: Predicate getNode has been deprecated and may be removed in future (TestStep.ql:14,74-81)
 | Taint [exception.info] | test.py:19 | Attribute() |  |  -->  | Taint [exception.info] | test.py:21 | t |  |
 | Taint [exception.info] | test.py:19 | Attribute() |  |  -->  | Taint [exception.info] | test.py:27 | t |  |
 | Taint [exception.info] | test.py:20 | Attribute() |  |  -->  | Taint [exception.info] | test.py:27 | u |  |
diff --git a/python/ql/test/library-tests/taint/exception_traceback/TestStep.ql b/python/ql/test/library-tests/taint/exception_traceback/TestStep.ql
@@ -9,6 +9,6 @@ where
     not n.getLocation().getFile().inStdlib() and
     not s.getLocation().getFile().inStdlib()
 select 
-    n.getTrackedValue(), n.getLocation().toString(), n.getNode().getNode().toString(), n.getContext(),
+    "Taint " + n.getTaintKind(), n.getLocation().toString(), n.getNode().getNode().toString(), n.getContext(),
     " --> ",
-    s.getTrackedValue(), s.getLocation().toString(), s.getNode().getNode().toString(), s.getContext()
+    "Taint " + n.getTaintKind(), s.getLocation().toString(), s.getNode().getNode().toString(), s.getContext()
diff --git a/python/ql/test/library-tests/web/bottle/Taint.expected b/python/ql/test/library-tests/web/bottle/Taint.expected
@@ -1,3 +1,4 @@
+WARNING: Predicate getNode has been deprecated and may be removed in future (/home/mark/repos/ql/python/ql/test/library-tests/web/turbogears/Taint.ql:12,54-61)
 | ../../../query-tests/Security/lib/bottle.py:64 | LocalRequest() | bottle.request |
 | ../../../query-tests/Security/lib/bottle.py:64 | request | bottle.request |
 | ../../../query-tests/Security/lib/bottle.py:68 | url | externally controlled string |
diff --git a/python/ql/test/library-tests/web/falcon/Sinks.expected b/python/ql/test/library-tests/web/falcon/Sinks.expected
@@ -1 +0,0 @@
-| test.py:17 | Attribute() | externally controlled string |
diff --git a/python/ql/test/library-tests/web/falcon/Taint.expected b/python/ql/test/library-tests/web/falcon/Taint.expected
@@ -1,3 +1,4 @@
+WARNING: Predicate getNode has been deprecated and may be removed in future (Taint.ql:12,54-61)
 | test.py:9 | req | falcon.request |
 | test.py:9 | resp | falcon.response |
 | test.py:10 | Attribute | file[externally controlled string] |
@@ -8,7 +9,6 @@
 | test.py:12 | resp | falcon.response |
 | test.py:13 | Dict | {json[externally controlled string]} |
 | test.py:15 | result | json[externally controlled string] |
-| test.py:17 | resp | falcon.response |
 | test.py:17 | result | {json[externally controlled string]} |
 | test.py:19 | req | falcon.request |
 | test.py:19 | resp | falcon.response |
diff --git a/python/ql/test/library-tests/web/turbogears/Taint.expected b/python/ql/test/library-tests/web/turbogears/Taint.expected
@@ -1,3 +1,4 @@
+WARNING: Predicate getNode has been deprecated and may be removed in future (Taint.ql:12,54-61)
 | test.py:18 | b | externally controlled string |
 | test.py:19 | BinaryExpr | [externally controlled string] |
 | test.py:19 | BinaryExpr | externally controlled string |

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,14 @@ class SimpleTest extends TaintKind {`
`10`	`10`
`11`	`11`	`}`
`12`	`12`
`13`		`-class SimpleConfig extends TaintTracking::Configuration {`
	`13`	`+abstract class TestConfig extends TaintTracking::Configuration {`
	`14`	`+`
	`15`	`+ bindingset[this]`
	`16`	`+ TestConfig() { any() }`
	`17`	`+`
	`18`	`+}`
	`19`	`+`
	`20`	`+class SimpleConfig extends TestConfig {`
`14`	`21`
`15`	`22`	`SimpleConfig() { this = "Simple config" }`
`16`	`23`
`@@ -49,7 +56,7 @@ class BasicCustomTaint extends TaintKind {`
`49`	`56`	`}`
`50`	`57`
`51`	`58`
`52`		`-class BasicCustomConfig extends TaintTracking::Configuration {`
	`59`	`+class BasicCustomConfig extends TestConfig {`
`53`	`60`
`54`	`61`	`BasicCustomConfig() { this = "Basic custom config" }`
`55`	`62`
`@@ -99,7 +106,7 @@ class Scissors extends TaintKind {`
`99`	`106`
`100`	`107`	`}`
`101`	`108`
`102`		`-class RockPaperScissorConfig extends TaintTracking::Configuration {`
	`109`	`+class RockPaperScissorConfig extends TestConfig {`
`103`	`110`
`104`	`111`	`RockPaperScissorConfig() { this = "Rock-paper-scissors config" }`
`105`	`112`
`@@ -145,7 +152,7 @@ class TaintCarrier extends TaintKind {`
`145`	`152`
`146`	`153`	`}`
`147`	`154`
`148`		`-class TaintCarrierConfig extends TaintTracking::Configuration {`
	`155`	`+class TaintCarrierConfig extends TestConfig {`
`149`	`156`
`150`	`157`	`TaintCarrierConfig() { this = "Taint carrier config" }`
`151`	`158`
`@@ -327,5 +334,3 @@ class TaintIterableSource extends TaintSource {`
`327`	`334`
`328`	`335`	`}`
`329`	`336`
`330`		`-`
`331`		`-`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@ import TaintLib`
`5`	`5`
`6`	`6`
`7`	`7`	`from TaintTrackingNode n`
	`8`	`+where n.getConfiguration() instanceof TestConfig`
`8`	`9`	`select n.getTaintKind(), n.getLocation().toString(), n.getNode().toString(), n.getPath().toString(), n.getContext().toString()`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-ERROR: getNode() cannot be resolved for type Node (TestNode.ql:5,69-76)`
`2`		`-ERROR: getTrackedValue() cannot be resolved for type TaintedNode (TestNode.ql:5,10-25)`
	`1`	`+WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:5,77-84)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+WARNING: Predicate getNode has been deprecated and may be removed in future (TestNode.ql:8,43-50)`
`1`	`2`	`\| test.py:10:11:10:47 \| test.py:10 \| MyException() \| exception.kind \|`
`2`	`3`	`\| test.py:15:25:15:25 \| test.py:15 \| e \| exception.kind \|`
`3`	`4`	`\| test.py:16:13:16:34 \| test.py:16 \| Attribute() \| exception.info \|`