add support for the Subclass token

erik-krogh · erik-krogh · commit 46acce0ad42f · 2022-05-02T12:45:21.000+02:00
diff --git a/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsSpecific.qll b/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsSpecific.qll
@@ -57,6 +57,9 @@ API::Node getExtraSuccessorFromNode(API::Node node, AccessPathToken token) {
   or
   token.getName() = "Awaited" and
   result = node.getAwaited()
+  or
+  token.getName() = "Subclass" and
+  result = node.getASubclass*()
   // Some features don't have MaD tokens yet, they would need to be added to API-graphs first.
   // - decorators ("DecoratedClass", "DecoratedMember", "DecoratedParameter")
   // - Array/Map elements ("ArrayElement", "Element", "MapKey", "MapValue")
diff --git a/python/ql/test/library-tests/frameworks/data/test.expected b/python/ql/test/library-tests/frameworks/data/test.expected
@@ -40,6 +40,7 @@ isSource
 | test.py:25:34:25:39 | ControlFlowNode for second | test-source |
 | test.py:39:11:39:20 | ControlFlowNode for Await | test-source |
 | test.py:41:8:41:27 | ControlFlowNode for Attribute() | test-source |
+| test.py:46:7:46:16 | ControlFlowNode for SubClass() | test-source |
 syntaxErrors
 | Member[foo |
 | Member[foo] .Member[bar] |
diff --git a/python/ql/test/library-tests/frameworks/data/test.py b/python/ql/test/library-tests/frameworks/data/test.py
@@ -38,4 +38,9 @@ async def async_func():
     prom = CommonTokens.makePromise(1);
     val = await prom
 
-inst = CommonTokens.Class()
+inst = CommonTokens.Class()
+
+class SubClass (CommonTokens.Super):
+    pass
+
+sub = SubClass()
diff --git a/python/ql/test/library-tests/frameworks/data/test.ql b/python/ql/test/library-tests/frameworks/data/test.ql
@@ -54,6 +54,7 @@ class Sinks extends ModelInput::SinkModelCsv {
 }
 
 // TODO: Commonly used tokens
+// TODO: Should `instance()` be shorthand for `subClass*().getReturn()`?
 // TODO: Uniform tokens for fields
 // TODO: Non-positional arguments (including Named parameters)
 // TODO: Any argument
@@ -74,6 +75,7 @@ class Sources extends ModelInput::SourceModelCsv {
         // Common tokens.
         "testlib;;Member[CommonTokens].Member[makePromise].ReturnValue.Awaited;test-source", //
         "testlib;;Member[CommonTokens].Member[Class].Instance;test-source", //
+        "testlib;;Member[CommonTokens].Member[Super].Subclass.Instance;test-source", //
       ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ class Sinks extends ModelInput::SinkModelCsv {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// TODO: Commonly used tokens`
	`57`	+// TODO: Should `instance()` be shorthand for `subClass*().getReturn()`?
`57`	`58`	`// TODO: Uniform tokens for fields`
`58`	`59`	`// TODO: Non-positional arguments (including Named parameters)`
`59`	`60`	`// TODO: Any argument`
`@@ -74,6 +75,7 @@ class Sources extends ModelInput::SourceModelCsv {`
`74`	`75`	`// Common tokens.`
`75`	`76`	`"testlib;;Member[CommonTokens].Member[makePromise].ReturnValue.Awaited;test-source", //`
`76`	`77`	`"testlib;;Member[CommonTokens].Member[Class].Instance;test-source", //`
	`78`	`+ "testlib;;Member[CommonTokens].Member[Super].Subclass.Instance;test-source", //`
`77`	`79`	`]`
`78`	`80`	`}`
`79`	`81`	`}`