Ruby: replace "instance" label with a call to new

asgerf · asgerf · commit 9c17a5ce9929 · 2022-02-04T11:03:25.000+01:00
diff --git a/ruby/ql/lib/codeql/ruby/ApiGraphs.qll b/ruby/ql/lib/codeql/ruby/ApiGraphs.qll
@@ -88,7 +88,7 @@ module API {
      * This predicate may have multiple results when there are multiple constructor calls invoking this API component.
      * Consider using `getAnInstantiation()` if there is a need to distinguish between individual constructor calls.
      */
-    Node getInstance() { result = this.getASubclass().getASuccessor(Label::instance()) }
+    Node getInstance() { result = this.getASubclass().getReturn("new") }
 
     /**
      * Gets a node representing the result of calling a method on the receiver represented by this node.
@@ -307,15 +307,6 @@ module API {
         node.asExpr() = call.getReceiver() and
         name = call.getExpr().getMethodName() and
         lbl = Label::return(name) and
-        name != "new" and
-        ref.asExpr() = call
-      )
-      or
-      // Calling the `new` method on a node that is a use of `base`, which creates a new instance
-      exists(ExprNodes::MethodCallCfgNode call |
-        node.asExpr() = call.getReceiver() and
-        lbl = Label::instance() and
-        call.getExpr().getMethodName() = "new" and
         ref.asExpr() = call
       )
     }
@@ -439,9 +430,6 @@ private module Label {
   /** Gets the `member` edge label for the unknown member. */
   string unknownMember() { result = "getUnknownMember()" }
 
-  /** Gets the `instance` edge label. */
-  string instance() { result = "instance" }
-
   /** Gets the `return` edge label. */
   bindingset[m]
   bindingset[result]
diff --git a/ruby/ql/test/library-tests/dataflow/api-graphs/ApiGraphs.expected b/ruby/ql/test/library-tests/dataflow/api-graphs/ApiGraphs.expected
@@ -2,5 +2,5 @@ classMethodCalls
 | test1.rb:58:1:58:8 | Use getMember("M1").getMember("C1").getReturn("m") |
 | test1.rb:59:1:59:8 | Use getMember("M2").getMember("C3").getReturn("m") |
 instanceMethodCalls
-| test1.rb:61:1:61:12 | Use getMember("M1").getMember("C1").instance.getReturn("m") |
-| test1.rb:62:1:62:12 | Use getMember("M2").getMember("C3").instance.getReturn("m") |
+| test1.rb:61:1:61:12 | Use getMember("M1").getMember("C1").getReturn("new").getReturn("m") |
+| test1.rb:62:1:62:12 | Use getMember("M2").getMember("C3").getReturn("new").getReturn("m") |
diff --git a/ruby/ql/test/library-tests/dataflow/api-graphs/test1.rb b/ruby/ql/test/library-tests/dataflow/api-graphs/test1.rb
@@ -9,7 +9,7 @@
 rescue AttributeError => e #$ use=getMember("AttributeError")
     Kernel.print(e)  #$ use=getMember("Kernel").getReturn("print")
 end
-Unknown.new.run #$ use=getMember("Unknown").instance.getReturn("run")
+Unknown.new.run #$ use=getMember("Unknown").getReturn("new").getReturn("run")
 Foo::Bar::Baz #$ use=getMember("Foo").getMember("Bar").getMember("Baz")
 
 Const = [1, 2, 3] #$ use=getMember("Array").getReturn("[]")
