add support for named parameters

erik-krogh · erik-krogh · commit 413d182bcfdf · 2022-05-02T12:56:44.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
@@ -65,8 +65,14 @@ API::Node getExtraSuccessorFromNode(API::Node node, AccessPathToken token) {
   result = node.getMember(token.getAnArgument()).getReturn()
   or
   token.getName() = ["Argument", "Parameter"] and
-  token.getAnArgument() = "self" and
-  result = node.getSelfParameter()
+  (
+    token.getAnArgument() = "self" and
+    result = node.getSelfParameter()
+    or
+    exists(string name | token.getAnArgument() = name + ":" |
+      result = node.getKeywordParameter(name)
+    )
+  )
   // 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.py b/python/ql/test/library-tests/frameworks/data/test.py
@@ -57,5 +57,8 @@ class Sub2Class (CommonTokens.Class):
 val = ArgPos.selfThing(arg, named=2)
 
 class SubClass (ArgPos.MyClass):
-    def foo(self, arg, named=2):
-        pass
+    def foo(self, arg, named=2, otherName=3):
+        pass
+
+    def secondAndAfter(self, arg1, arg2, arg3, arg4, arg5): 
+        pass
diff --git a/python/ql/test/library-tests/frameworks/data/test.ql b/python/ql/test/library-tests/frameworks/data/test.ql
@@ -55,7 +55,6 @@ class Sinks extends ModelInput::SinkModelCsv {
   }
 }
 
-// TODO: Non-positional arguments (including Named parameters)
 // TODO: Any argument
 // TODO: Test taint steps.
 // TODO: // There are no API-graph edges for: ArrayElement, Element, MapKey, MapValue (remove from valid tokens list)
@@ -78,6 +77,8 @@ class Sources extends ModelInput::SourceModelCsv {
         "testlib;;Member[CommonTokens].Member[Class].Instance.Method[foo];test-source", //
         // testing non-positional arguments
         "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[foo].Parameter[self];test-source", //
+        "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[foo].Parameter[named:];test-source", //
+        "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[secondAndAfter].Parameter[1..];test-source", //
       ]
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ class Sinks extends ModelInput::SinkModelCsv {`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`-// TODO: Non-positional arguments (including Named parameters)`
`59`	`58`	`// TODO: Any argument`
`60`	`59`	`// TODO: Test taint steps.`
`61`	`60`	`// TODO: // There are no API-graph edges for: ArrayElement, Element, MapKey, MapValue (remove from valid tokens list)`
`@@ -78,6 +77,8 @@ class Sources extends ModelInput::SourceModelCsv {`
`78`	`77`	`"testlib;;Member[CommonTokens].Member[Class].Instance.Method[foo];test-source", //`
`79`	`78`	`// testing non-positional arguments`
`80`	`79`	`"testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[foo].Parameter[self];test-source", //`
	`80`	`+ "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[foo].Parameter[named:];test-source", //`
	`81`	`+ "testlib;;Member[ArgPos].Member[MyClass].Subclass.Member[secondAndAfter].Parameter[1..];test-source", //`
`81`	`82`	`]`
`82`	`83`	`}`
`83`	`84`	`}`