Swift: Accept cross-language standardized CSV sink label.

Author: geoffw0

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

@@ -26,7 +26,11 @@ class CleartextLoggingAdditionalFlowStep extends Unit {
  * A sink defined in a CSV model.
  */
 private class DefaultCleartextLoggingSink extends CleartextLoggingSink {
-  DefaultCleartextLoggingSink() { sinkNode(this, "logging") }
+  DefaultCleartextLoggingSink() {
+    sinkNode(this, "log-injection")
+    or
+    sinkNode(this, "logging") // deprecated label
+  }
 }
 
 /**

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

@@ -151,5 +151,9 @@ private class GrdbDefaultSqlInjectionSink extends SqlInjectionSink {
  * A sink defined in a CSV model.
  */
 private class DefaultSqlInjectionSink extends SqlInjectionSink {
-  DefaultSqlInjectionSink() { sinkNode(this, "sql") }
+  DefaultSqlInjectionSink() {
+    sinkNode(this, "sql-injection")
+    or
+    sinkNode(this, "sql") // deprecated label
+  }
 }

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

@@ -39,6 +39,8 @@ private class DefaultUncontrolledFormatStringSink extends UncontrolledFormatStri
     this.asExpr() = any(FormattingFunctionCall fc).getFormat()
     or
     // a sink defined in a CSV model.
-    sinkNode(this, "uncontrolled-format-string")
+    sinkNode(this, "format-string")
+    or
+    sinkNode(this, "uncontrolled-format-string") // deprecated label
   }
 }

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

@@ -144,5 +144,9 @@ private class DefaultUnsafeJsEvalAdditionalFlowStep extends UnsafeJsEvalAddition
  * A sink defined in a CSV model.
  */
 private class DefaultUnsafeJsEvalSink extends UnsafeJsEvalSink {
-  DefaultUnsafeJsEvalSink() { sinkNode(this, "js-eval") }
+  DefaultUnsafeJsEvalSink() {
+    sinkNode(this, "code-injection")
+    or
+    sinkNode(this, "js-eval") // deprecated label
+  }
 }