Swift: Model getVaList, correct NSLogv sink for swift/cleartext-logging.

Author: geoffw0

swift/ql/lib/codeql/swift/frameworks/StandardLibrary/CInterop.qll

@@ -0,0 +1,12 @@
+/**
+ * Provides models for Swift "C Interoperability" functions.
+ */
+
+import swift
+private import codeql.swift.dataflow.ExternalFlow
+
+private class CInteropSummaries extends SummaryModelCsv {
+  override predicate row(string row) {
+    row = ";;false;getVaList(_:);;;Argument[0].ArrayElement;ReturnValue;value"
+  }
+}

swift/ql/lib/codeql/swift/frameworks/StandardLibrary/StandardLibrary.qll

@@ -3,6 +3,7 @@
  */
 
 private import Array
+private import CInterop
 private import Collection
 private import CustomUrlSchemes
 private import Data

swift/ql/lib/codeql/swift/security/CleartextLoggingExtensions.qll

@@ -94,7 +94,7 @@ private class LoggingSinks extends SinkModelCsv {
         ";;false;NSLog(_:_:);;;Argument[0];log-injection",
         ";;false;NSLog(_:_:);;;Argument[1].ArrayElement;log-injection",
         ";;false;NSLogv(_:_:);;;Argument[0];log-injection",
-        ";;false;NSLogv(_:_:);;;Argument[1].ArrayElement;log-injection",
+        ";;false;NSLogv(_:_:);;;Argument[1];log-injection",
         ";;false;vfprintf(_:_:_:);;;Agument[1..2];log-injection",
         ";Logger;true;log(_:);;;Argument[0];log-injection",
         ";Logger;true;log(level:_:);;;Argument[1];log-injection",

swift/ql/test/query-tests/Security/CWE-312/cleartextLoggingTest.swift

@@ -96,8 +96,8 @@ func test1(password: String, passwordHash : String, passphrase: String, pass_phr
     NSLog("%@", password as! CVarArg) // $ MISSING: hasCleartextLogging=96
     NSLog("%@ %@", "" as! CVarArg, password as! CVarArg) // $ MISSING: hasCleartextLogging=97
     NSLog("\(password)") // $ hasCleartextLogging=98
-    NSLogv("%@", getVaList([password as! CVarArg])) // $ MISSING: hasCleartextLogging=99
-    NSLogv("%@ %@", getVaList(["" as! CVarArg, password as! CVarArg])) // $ MISSING: hasCleartextLogging=100
+    NSLogv("%@", getVaList([password as! CVarArg])) // $ hasCleartextLogging=99
+    NSLogv("%@ %@", getVaList(["" as! CVarArg, password as! CVarArg])) // $ hasCleartextLogging=100
     NSLog(passwordHash) // SAfe
     NSLogv("%@", getVaList([passwordHash as! CVarArg])) // Safe