@@ -11,7 +11,7 @@ private import codeql.ruby.AST
1111private import codeql.ruby.ApiGraphs
1212private import queries.modeling.internal.Util as Util
1313
14- predicate simpleParameters ( string type , string path , string value , DataFlow:: Node details ) {
14+ predicate simpleParameters ( string type , string path , string value , DataFlow:: Node node ) {
1515 exists ( DataFlow:: MethodNode methodNode , DataFlow:: ParameterNode paramNode |
1616 methodNode .getLocation ( ) .getFile ( ) instanceof Util:: RelevantFile and
1717 (
@@ -24,11 +24,11 @@ predicate simpleParameters(string type, string path, string value, DataFlow::Nod
2424 |
2525 Util:: pathToMethod ( methodNode , type , path ) and
2626 value = Util:: getArgumentPath ( paramNode ) and
27- details = paramNode
27+ node = paramNode
2828 )
2929}
3030
31- predicate blockArguments ( string type , string path , string value , DataFlow:: Node details ) {
31+ predicate blockArguments ( string type , string path , string value , DataFlow:: Node node ) {
3232 exists ( DataFlow:: MethodNode methodNode , DataFlow:: CallNode callNode |
3333 methodNode .getLocation ( ) .getFile ( ) instanceof Util:: RelevantFile and
3434 callNode = methodNode .getABlockCall ( )
@@ -38,50 +38,50 @@ predicate blockArguments(string type, string path, string value, DataFlow::Node
3838 argNode = callNode .getPositionalArgument ( i )
3939 |
4040 value = "Argument[block].Parameter[" + i + "]" and
41- details = argNode
41+ node = argNode
4242 )
4343 or
4444 exists ( DataFlow:: ExprNode argNode , string keyword |
4545 argNode = callNode .getKeywordArgument ( keyword )
4646 |
4747 value = "Argument[block].Parameter[" + keyword + ":]" and
48- details = argNode
48+ node = argNode
4949 )
5050 or
5151 value = "Argument[block]" and
52- details = callNode
52+ node = callNode
5353 ) and
5454 Util:: pathToMethod ( methodNode , type , path )
5555 )
5656}
5757
58- predicate returnValue ( string type , string path , string value , DataFlow:: Node details ) {
58+ predicate returnValue ( string type , string path , string value , DataFlow:: Node node ) {
5959 exists ( DataFlow:: MethodNode methodNode , DataFlow:: Node returnNode |
6060 methodNode .getLocation ( ) .getFile ( ) instanceof Util:: RelevantFile and
6161 returnNode = methodNode .getAReturnNode ( )
6262 |
6363 Util:: pathToMethod ( methodNode , type , path ) and
6464 value = "ReturnValue" and
65- details = returnNode
65+ node = returnNode
6666 )
6767}
6868
6969predicate inputAccessPaths (
70- string type , string path , string value , DataFlow:: Node details , string defType
70+ string type , string path , string value , DataFlow:: Node node , string defType
7171) {
72- simpleParameters ( type , path , value , details ) and defType = "parameter"
72+ simpleParameters ( type , path , value , node ) and defType = "parameter"
7373 or
74- blockArguments ( type , path , value , details ) and defType = "parameter"
74+ blockArguments ( type , path , value , node ) and defType = "parameter"
7575}
7676
7777predicate outputAccessPaths (
78- string type , string path , string value , DataFlow:: Node details , string defType
78+ string type , string path , string value , DataFlow:: Node node , string defType
7979) {
80- simpleParameters ( type , path , value , details ) and defType = "parameter"
80+ simpleParameters ( type , path , value , node ) and defType = "parameter"
8181 or
82- blockArguments ( type , path , value , details ) and defType = "parameter"
82+ blockArguments ( type , path , value , node ) and defType = "parameter"
8383 or
84- returnValue ( type , path , value , details ) and defType = "return"
84+ returnValue ( type , path , value , node ) and defType = "return"
8585}
8686
8787query predicate input = inputAccessPaths / 5 ;
0 commit comments