use CallNode.getSyntacticArgument

Author: owen-mc

go/ql/lib/semmle/go/StringOps.qll

@@ -219,7 +219,7 @@ module StringOps {
        * replaced.
        */
       DataFlow::Node getAReplacedArgument() {
-        exists(int n | n % 2 = 0 and result = this.getArgument(n))
+        exists(int n | n % 2 = 0 and result = this.getSyntacticArgument(n))
       }
     }
 

go/ql/lib/semmle/go/frameworks/Beego.qll

@@ -253,21 +253,21 @@ module Beego {
       this.getTarget().hasQualifiedName([packagePath(), logsPackagePath()], getALogFunctionName())
     }
 
-    override DataFlow::Node getAMessageComponent() { result = this.getAnArgument() }
+    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
   }
 
   private class BeegoLoggerMethods extends LoggerCall::Range, DataFlow::MethodCallNode {
     BeegoLoggerMethods() {
       this.getTarget().hasQualifiedName(logsPackagePath(), "BeeLogger", getALogFunctionName())
     }
 
-    override DataFlow::Node getAMessageComponent() { result = this.getAnArgument() }
+    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
   }
 
   private class UtilLoggers extends LoggerCall::Range, DataFlow::CallNode {
     UtilLoggers() { this.getTarget().hasQualifiedName(utilsPackagePath(), "Display") }
 
-    override DataFlow::Node getAMessageComponent() { result = this.getAnArgument() }
+    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
   }
 
   private class HtmlQuoteSanitizer extends SharedXss::Sanitizer {

go/ql/lib/semmle/go/frameworks/BeegoOrm.qll

@@ -33,7 +33,7 @@ module BeegoOrm {
     // Note this class doesn't do any escaping, unlike the true ORM part of the package
     QueryBuilderSink() {
       exists(Method impl | impl.implements(packagePath(), "QueryBuilder", _) |
-        this = impl.getACall().getAnArgument()
+        this = impl.getACall().getASyntacticArgument()
       ) and
       this.getType().getUnderlyingType() instanceof StringType
     }

go/ql/lib/semmle/go/frameworks/ElazarlGoproxy.qll

@@ -90,7 +90,7 @@ module ElazarlGoproxy {
         onreqcall.getTarget().hasQualifiedName(packagePath(), "ProxyHttpServer", "OnRequest")
       |
         handlerReg.getReceiver() = onreqcall.getASuccessor*() and
-        check = onreqcall.getArgument(0)
+        check = onreqcall.getSyntacticArgument(0)
       )
     }
   }
@@ -119,6 +119,6 @@ module ElazarlGoproxy {
   private class ProxyLog extends LoggerCall::Range, DataFlow::MethodCallNode {
     ProxyLog() { this.getTarget() instanceof ProxyLogFunction }
 
-    override DataFlow::Node getAMessageComponent() { result = this.getAnArgument() }
+    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
   }
 }

go/ql/lib/semmle/go/frameworks/Email.qll

@@ -56,13 +56,13 @@ module EmailData {
       // func NewV3MailInit(from *Email, subject string, to *Email, content ...*Content) *SGMailV3
       exists(Function newv3MailInit |
         newv3MailInit.hasQualifiedName(sendgridMail(), "NewV3MailInit") and
-        this = newv3MailInit.getACall().getArgument(any(int i | i = 1 or i >= 3))
+        this = newv3MailInit.getACall().getSyntacticArgument(any(int i | i = 1 or i >= 3))
       )
       or
       // func (s *SGMailV3) AddContent(c ...*Content) *SGMailV3
       exists(Method addContent |
         addContent.hasQualifiedName(sendgridMail(), "SGMailV3", "AddContent") and
-        this = addContent.getACall().getAnArgument()
+        this = addContent.getACall().getASyntacticArgument()
       )
     }
   }

go/ql/lib/semmle/go/frameworks/Glog.qll

@@ -49,7 +49,7 @@ module Glog {
     GlogCall() { this = callee.getACall() }
 
     override DataFlow::Node getAMessageComponent() {
-      result = this.getArgument(any(int i | i >= callee.getFirstPrintedArg()))
+      result = this.getSyntacticArgument(any(int i | i >= callee.getFirstPrintedArg()))
     }
   }
 }

go/ql/lib/semmle/go/frameworks/Logrus.qll

@@ -31,7 +31,7 @@ module Logrus {
   private class LogCall extends LoggerCall::Range, DataFlow::CallNode {
     LogCall() { this = any(LogFunction f).getACall() }
 
-    override DataFlow::Node getAMessageComponent() { result = this.getAnArgument() }
+    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
   }
 
   private class StringFormatters extends StringOps::Formatting::Range instanceof LogFunction {

go/ql/lib/semmle/go/frameworks/Revel.qll

@@ -124,7 +124,7 @@ module Revel {
         or
         methodName = "RenderText" and
         contentType = "text/plain" and
-        this = methodCall.getAnArgument()
+        this = methodCall.getSyntacticArgument(_)
       )
     }
 
@@ -201,7 +201,7 @@ module Revel {
         )
         or
         // a revel controller.Render(arg) will set controller.ViewArgs["arg"] = arg
-        exists(Variable arg | arg.getARead() = render.(ControllerRender).getAnArgument() |
+        exists(Variable arg | arg.getARead() = render.(ControllerRender).getASyntacticArgument() |
           var.getBaseVariable() = arg and
           var.getQualifiedName() = read.getFieldName()
         )

go/ql/lib/semmle/go/frameworks/SQL.qll

@@ -225,7 +225,7 @@ module SQL {
     GormSink() {
       exists(Method meth, string package, string name |
         meth.hasQualifiedName(package, "DB", name) and
-        this = meth.getACall().getArgument(0) and
+        this = meth.getACall().getSyntacticArgument(0) and
         package = Gorm::packagePath() and
         name in [
             "Where", "Raw", "Order", "Not", "Or", "Select", "Table", "Group", "Having", "Joins",
@@ -272,7 +272,7 @@ module Xorm {
     XormSink() {
       exists(Method meth, string type, string name, int n |
         meth.hasQualifiedName(Xorm::packagePath(), type, name) and
-        this = meth.getACall().getArgument(n) and
+        this = meth.getACall().getSyntacticArgument(n) and
         type = ["Engine", "Session"]
       |
         name =

go/ql/lib/semmle/go/frameworks/Spew.qll

@@ -41,7 +41,7 @@ module Spew {
     SpewCall() { this = target.getACall() }
 
     override DataFlow::Node getAMessageComponent() {
-      result = this.getArgument(any(int i | i >= target.getFirstPrintedArg()))
+      result = this.getSyntacticArgument(any(int i | i >= target.getFirstPrintedArg()))
     }
   }