Ruby: modgen - deduplicate getAnyParameter logic

Author: alexrford

ruby/ql/src/queries/modeling/internal/Summaries.qll

@@ -14,29 +14,21 @@ module Summaries {
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) {
       exists(DataFlow::MethodNode methodNode | methodNode.isPublic() |
-        getAnyParameterNode(methodNode).asSource() = source
+        Util::getAnyParameter(methodNode) = source
       )
     }
 
     predicate isSink(DataFlow::Node sink) { sink = any(DataFlow::MethodNode m).getAReturnNode() }
   }
 
-  private API::Node getAnyParameterNode(DataFlow::MethodNode methodNode) {
-    result.asSource() =
-      [
-        methodNode.getParameter(_), methodNode.getKeywordParameter(_),
-        methodNode.getBlockParameter(), methodNode.getSelfParameter()
-      ]
-  }
-
   private module ValueFlow {
     import DataFlow::Global<Config>
 
     predicate summaryModel(string type, string path, string input, string output) {
       exists(DataFlow::MethodNode methodNode, API::Node paramNode |
         methodNode.getLocation().getFile() instanceof Util::RelevantFile and
         flow(paramNode.asSource(), methodNode.getAReturnNode()) and
-        paramNode = getAnyParameterNode(methodNode)
+        paramNode.asSource() = Util::getAnyParameter(methodNode)
       |
         Util::pathToMethod(methodNode, type, path) and
         input = Util::getArgumentPath(paramNode.asSource()) and
@@ -53,7 +45,7 @@ module Summaries {
       exists(DataFlow::MethodNode methodNode, API::Node paramNode |
         methodNode.getLocation().getFile() instanceof Util::RelevantFile and
         flow(paramNode.asSource(), methodNode.getAReturnNode()) and
-        paramNode = getAnyParameterNode(methodNode)
+        paramNode.asSource() = Util::getAnyParameter(methodNode)
       |
         Util::pathToMethod(methodNode, type, path) and
         input = Util::getArgumentPath(paramNode.asSource()) and

ruby/ql/src/queries/modeling/internal/Util.qll

@@ -58,9 +58,16 @@ predicate pathToMethod(DataFlow::MethodNode method, string type, string path) {
   )
 }
 
-/** Gets any parameter to `method`. This may be a positional, keyword, or block parameter. */
-private DataFlow::ParameterNode getAnyParameter(DataFlow::MethodNode method) {
-  result = [method.getParameter(_), method.getKeywordParameter(_), method.getBlockParameter()]
+/**
+ * Gets any parameter to `methodNode`. This may be a positional, keyword,
+ * block, or self parameter.
+ */
+DataFlow::ParameterNode getAnyParameter(DataFlow::MethodNode methodNode) {
+  result =
+    [
+      methodNode.getParameter(_), methodNode.getKeywordParameter(_), methodNode.getBlockParameter(),
+      methodNode.getSelfParameter()
+    ]
 }
 
 private predicate pathToNodeBase(API::Node node, string type, string path, boolean isOutput) {