Swift: Attempt to speed up evaluation of the private information regex for Swift.

geoffw0 · geoffw0 · commit 7029de59895a · 2024-07-17T15:43:30.000+01:00
diff --git a/swift/ql/lib/codeql/swift/security/SensitiveExprs.qll b/swift/ql/lib/codeql/swift/security/SensitiveExprs.qll
@@ -64,9 +64,9 @@ class SensitivePrivateInfo extends SensitiveDataType, TPrivateInfo {
   override string toString() { result = "private information" }
 
   override string getRegexp() {
+    // we've had good results for the e-mail heuristic in Swift, which isn't part of the default regex. Add it in.
     result = HeuristicNames::maybeSensitiveRegexp(SensitiveDataClassification::private())
-    or
-    result = "(?is).*e(mail|_mail).*"
+      .replaceAll(".*(", ".*(e(mail|_mail)|")
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ class SensitivePrivateInfo extends SensitiveDataType, TPrivateInfo {`
`64`	`64`	`override string toString() { result = "private information" }`
`65`	`65`
`66`	`66`	`override string getRegexp() {`
	`67`	`+ // we've had good results for the e-mail heuristic in Swift, which isn't part of the default regex. Add it in.`
`67`	`68`	`result = HeuristicNames::maybeSensitiveRegexp(SensitiveDataClassification::private())`
`68`		`- or`
`69`		`- result = "(?is).e(mail\|_mail)."`
	`69`	`+ .replaceAll(".(", ".(e(mail\|_mail)\|")`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`