Merge pull request #7151 from github/ruby/methodcallnode

Ruby: add `getMethodName` predicate to `DataFlow::CallNode` class

Author: alexrford

ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll

@@ -58,6 +58,9 @@ class CallNode extends LocalSourceNode {
 
   /** Gets the data-flow node corresponding to the named argument of the call corresponding to this data-flow node */
   Node getKeywordArgument(string name) { result.asExpr() = node.getKeywordArgument(name) }
+
+  /** Gets the name of the the method called by the method call (if any) corresponding to this data-flow node */
+  string getMethodName() { result = node.getExpr().(MethodCall).getMethodName() }
 }
 
 /**

ruby/ql/lib/codeql/ruby/frameworks/ActiveStorage.qll

@@ -9,7 +9,7 @@ class ActiveStorageFilenameSanitizedCall extends Path::PathSanitization::Range,
   ActiveStorageFilenameSanitizedCall() {
     this.getReceiver() =
       API::getTopLevelMember("ActiveStorage").getMember("Filename").getAnInstantiation() and
-    this.asExpr().getExpr().(MethodCall).getMethodName() = "sanitized"
+    this.getMethodName() = "sanitized"
   }
 }
 

ruby/ql/lib/codeql/ruby/frameworks/Files.qll

@@ -127,17 +127,15 @@ module IO {
       api = "IO" and
       exists(IOInstanceStrict ii |
         this.getReceiver() = ii and
-        this.asExpr().getExpr().(MethodCall).getMethodName() =
-          ioFileReaderMethodName(classMethodCall)
+        this.getMethodName() = ioFileReaderMethodName(classMethodCall)
       )
       or
       // File instance methods
       classMethodCall = false and
       api = "File" and
       exists(File::FileInstance fi |
         this.getReceiver() = fi and
-        this.asExpr().getExpr().(MethodCall).getMethodName() =
-          ioFileReaderMethodName(classMethodCall)
+        this.getMethodName() = ioFileReaderMethodName(classMethodCall)
       )
       // TODO: enumeration style methods such as `each`, `foreach`, etc.
     }
@@ -232,7 +230,7 @@ module File {
       // Instance methods
       exists(FileInstance fi |
         this.getReceiver() = fi and
-        this.asExpr().getExpr().(MethodCall).getMethodName() = ["path", "to_path"]
+        this.getMethodName() = ["path", "to_path"]
       )
     }
   }

ruby/ql/lib/codeql/ruby/frameworks/StandardLibrary.qll

@@ -26,8 +26,6 @@ class KernelMethodCall extends DataFlow::CallNode {
     )
   }
 
-  string getMethodName() { result = methodCall.getMethodName() }
-
   int getNumberOfArguments() { result = methodCall.getNumberOfArguments() }
 }