Ruby: Use new features in ActionMailbox model

asgerf · asgerf · commit 1ae41484da02 · 2023-06-19T12:05:15.000+02:00
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/ActionMailbox.qll b/ruby/ql/lib/codeql/ruby/frameworks/ActionMailbox.qll
@@ -27,8 +27,8 @@ module ActionMailbox {
     Mail() {
       this =
         [
-          controller().getAnInstanceSelf().getAMethodCall("inbound_email").getAMethodCall("mail"),
-          controller().getAnInstanceSelf().getAMethodCall("mail")
+          controller().trackInstance().getReturn("inbound_email").getAMethodCall("mail"),
+          controller().trackInstance().getAMethodCall("mail")
         ]
     }
   }
@@ -40,7 +40,7 @@ module ActionMailbox {
     RemoteContent() {
       this =
         any(Mail m)
-            .(DataFlow::LocalSourceNode)
+            .track()
             .getAMethodCall([
                 "body", "to", "from", "raw_source", "subject", "from_address",
                 "recipients_addresses", "cc_addresses", "bcc_addresses", "in_reply_to",

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ module ActionMailbox {`
`27`	`27`	`Mail() {`
`28`	`28`	`this =`
`29`	`29`	`[`
`30`		`- controller().getAnInstanceSelf().getAMethodCall("inbound_email").getAMethodCall("mail"),`
`31`		`- controller().getAnInstanceSelf().getAMethodCall("mail")`
	`30`	`+ controller().trackInstance().getReturn("inbound_email").getAMethodCall("mail"),`
	`31`	`+ controller().trackInstance().getAMethodCall("mail")`
`32`	`32`	`]`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -40,7 +40,7 @@ module ActionMailbox {`
`40`	`40`	`RemoteContent() {`
`41`	`41`	`this =`
`42`	`42`	`any(Mail m)`
`43`		`- .(DataFlow::LocalSourceNode)`
	`43`	`+ .track()`
`44`	`44`	`.getAMethodCall([`
`45`	`45`	`"body", "to", "from", "raw_source", "subject", "from_address",`
`46`	`46`	`"recipients_addresses", "cc_addresses", "bcc_addresses", "in_reply_to",`