Merge pull request github#16753 from owen-mc/go/misc-clean-up

Go: a few small clean ups

Author: owen-mc

go/ql/lib/semmle/go/Scopes.qll

@@ -113,7 +113,9 @@ class Entity extends @object {
 
   /** Gets the qualified name of this entity, if any. */
   string getQualifiedName() {
-    exists(string pkg, string name | this.hasQualifiedName(pkg, name) | result = pkg + "." + name)
+    exists(string pkg, string name | this.hasQualifiedName(pkg, name) |
+      if pkg = "" then result = name else result = pkg + "." + name
+    )
   }
 
   /**

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

@@ -18,11 +18,13 @@ module BeegoOrm {
     DbSink() {
       exists(Method m, string methodName, int argNum |
         m.hasQualifiedName(packagePath(), "DB", methodName) and
-        methodName in [
-            "Exec", "ExecContext", "Prepare", "PrepareContext", "Query", "QueryContext", "QueryRow",
-            "QueryRowContext"
-          ] and
-        if methodName.matches("%Context") then argNum = 1 else argNum = 0
+        (
+          methodName = ["Exec", "Prepare", "Query", "QueryRow"] and
+          argNum = 0
+          or
+          methodName = ["ExecContext", "PrepareContext", "QueryContext", "QueryRowContext"] and
+          argNum = 1
+        )
       |
         this = m.getACall().getArgument(argNum)
       )

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

@@ -15,7 +15,9 @@ module Logrus {
   }
 
   bindingset[result]
-  private string getAnEntryUpdatingMethodName() { result.regexpMatch("With(Error|Fields?|Time)") }
+  private string getAnEntryUpdatingMethodName() {
+    result = ["WithError", "WithField", "WithFields", "WithTime"]
+  }
 
   private class LogFunction extends Function {
     LogFunction() {

go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll

@@ -8,12 +8,15 @@ import go
 /** Provides models of commonly used functions in the `fmt` package. */
 module Fmt {
   /**
-   * The `Sprint` or `Append` functions or one of their variants.
-   *
    * DEPRECATED: Use AppenderOrSprinterFunc instead.
+   *
+   * The `Sprint` or `Append` functions or one of their variants.
    */
   deprecated class AppenderOrSprinter extends TaintTracking::FunctionModel {
-    AppenderOrSprinter() { this.hasQualifiedName("fmt", ["Append", "Sprint"] + ["", "f", "ln"]) }
+    AppenderOrSprinter() {
+      this.hasQualifiedName("fmt",
+        ["Append", "Appendf", "Appendln", "Sprint", "Sprintf", "Sprintln"])
+    }
 
     override predicate hasTaintFlow(FunctionInput inp, FunctionOutput outp) {
       inp.isParameter(_) and outp.isResult()
@@ -23,13 +26,14 @@ module Fmt {
   /** The `Sprint` or `Append` functions or one of their variants. */
   class AppenderOrSprinterFunc extends Function {
     AppenderOrSprinterFunc() {
-      this.hasQualifiedName("fmt", ["Append", "Sprint"] + ["", "f", "ln"])
+      this.hasQualifiedName("fmt",
+        ["Append", "Appendf", "Appendln", "Sprint", "Sprintf", "Sprintln"])
     }
   }
 
   /** The `Sprint` function or one of its variants. */
   class Sprinter extends AppenderOrSprinterFunc {
-    Sprinter() { this.getName().matches("Sprint%") }
+    Sprinter() { this.getName() = ["Sprint", "Sprintf", "Sprintln"] }
   }
 
   /** The `Print` function or one of its variants. */

go/ql/lib/semmle/go/frameworks/stdlib/HtmlTemplate.qll

@@ -11,11 +11,11 @@ module HtmlTemplate {
 
     TemplateEscape() {
       exists(string fn |
-        fn.matches("HTMLEscape%") and kind = "html"
+        fn = ["HTMLEscape", "HTMLEscapeString", "HTMLEscaper"] and kind = "html"
         or
-        fn.matches("JSEscape%") and kind = "js"
+        fn = ["JSEscape", "JSEscapeString", "JSEscaper"] and kind = "js"
         or
-        fn.matches("URLQueryEscape%") and kind = "url"
+        fn = "URLQueryEscaper" and kind = "url"
       |
         this.hasQualifiedName("html/template", fn)
       )

go/ql/lib/semmle/go/frameworks/stdlib/Log.qll

@@ -11,7 +11,9 @@ module Log {
 
     LogFunction() {
       exists(string fn |
-        fn.matches(["Fatal%", "Panic%", "Print%"]) and firstPrintedArg = 0
+        fn =
+          ["Fatal", "Fatalf", "Fatalln", "Panic", "Panicf", "Panicln", "Print", "Printf", "Println"] and
+        firstPrintedArg = 0
         or
         fn = "Output" and firstPrintedArg = 1
       |
@@ -25,7 +27,7 @@ module Log {
   }
 
   private class LogFormatter extends StringOps::Formatting::Range instanceof LogFunction {
-    LogFormatter() { this.getName().matches("%f") }
+    LogFormatter() { this.getName() = ["Fatalf", "Panicf", "Printf"] }
 
     override int getFormatStringIndex() { result = 0 }
   }
@@ -42,9 +44,7 @@ module Log {
 
   /** A fatal log function, which calls `os.Exit`. */
   private class FatalLogFunction extends Function {
-    FatalLogFunction() {
-      exists(string fn | fn.matches("Fatal%") | this.hasQualifiedName("log", fn))
-    }
+    FatalLogFunction() { this.hasQualifiedName("log", ["Fatal", "Fatalf", "Fatalln"]) }
 
     override predicate mayReturnNormally() { none() }
   }