hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-21 11:16:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

add support for the any argument tokens

Browse Source
This commit is contained in:
Erik Krogh Kristensen
2022-05-02 12:58:15 +02:00
parent 413d182bcf
commit b1fa7f86a8
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsSpecific.qll
View File

@@ -72,6 +72,12 @@ API::Node getExtraSuccessorFromNode(API::Node node, AccessPathToken token) {
exists(string name | token.getAnArgument() = name + ":" |
result = node.getKeywordParameter(name)
)
or
token.getAnArgument() = "any" and
result = [node.getParameter(_), node.getKeywordParameter(_)]
or
token.getAnArgument() = "any-named" and
result = node.getKeywordParameter(_)
)
// Some features don't have MaD tokens yet, they would need to be added to API-graphs first.
// - decorators ("DecoratedClass", "DecoratedMember", "DecoratedParameter")
@@ -182,7 +188,7 @@ predicate isExtraValidTokenArgumentInIdentifyingAccessPath(string name, string a
or
name = ["Argument", "Parameter"] and
(
argument = "self"
argument = ["self", "any", "any-named"]
or
argument.regexpMatch("\\w+:") // keyword argument
)

9
python/ql/test/library-tests/frameworks/data/test.expected
View File

@@ -24,6 +24,10 @@ isSink
| test.py:33:27:33:29 | ControlFlowNode for two | test-source |
| test.py:33:32:33:36 | ControlFlowNode for three | test-source |
| test.py:57:7:57:12 | ControlFlowNode for ArgPos | test-source |
| test.py:66:17:66:20 | ControlFlowNode for arg1 | test-source |
| test.py:66:23:66:26 | ControlFlowNode for arg2 | test-source |
| test.py:66:34:66:43 | ControlFlowNode for namedThing | test-source |
| test.py:67:34:67:44 | ControlFlowNode for secondNamed | test-source |
isSource
| test.py:3:5:3:15 | ControlFlowNode for getSource() | test-source |
| test.py:9:8:9:14 | ControlFlowNode for alias() | test-source |
@@ -45,6 +49,11 @@ isSource
| test.py:51:8:51:18 | ControlFlowNode for Sub2Class() | test-source |
| test.py:53:7:53:16 | ControlFlowNode for Attribute() | test-source |
| test.py:60:13:60:16 | ControlFlowNode for self | test-source |
| test.py:60:24:60:28 | ControlFlowNode for named | test-source |
| test.py:63:36:63:39 | ControlFlowNode for arg2 | test-source |
| test.py:63:42:63:45 | ControlFlowNode for arg3 | test-source |
| test.py:63:48:63:51 | ControlFlowNode for arg4 | test-source |
| test.py:63:54:63:57 | ControlFlowNode for arg5 | test-source |
syntaxErrors
| Member[foo |
| Member[foo] .Member[bar] |

3
python/ql/test/library-tests/frameworks/data/test.py
View File

@@ -62,3 +62,6 @@ class SubClass (ArgPos.MyClass):
def secondAndAfter(self, arg1, arg2, arg3, arg4, arg5):
pass
ArgPos.anyParam(arg1, arg2, name=namedThing)
ArgPos.anyNamed(arg4, arg5, name=secondNamed)

3
python/ql/test/library-tests/frameworks/data/test.ql
View File

@@ -51,6 +51,9 @@ class Sinks extends ModelInput::SinkModelCsv {
"testlib;;Member[CallFilter].Member[twoOrMore].WithArity[2..].Argument[0..];test-source", //
// testing non-positional arguments
"testlib;;Member[ArgPos].Member[selfThing].Argument[self];test-source", //
// any argument
"testlib;;Member[ArgPos].Member[anyParam].Argument[any];test-source", //
"testlib;;Member[ArgPos].Member[anyNamed].Argument[any-named];test-source", //
]
}
}