Swift: CleartextStoragePreferences

d10c · d10c · commit 9f8b1494d3bf · 2025-07-08T17:24:37.000+02:00
diff --git a/swift/ql/lib/codeql/swift/security/CleartextStoragePreferencesQuery.qll b/swift/ql/lib/codeql/swift/security/CleartextStoragePreferencesQuery.qll
@@ -31,8 +31,15 @@ module CleartextStoragePreferencesConfig implements DataFlow::ConfigSig {
     isSource(node)
   }
 
-  predicate observeDiffInformedIncrementalMode() {
-    any() // TODO: Make sure that the location overrides match the query's select clause: Column 1 does not select a source or sink originating from the flow call on line 32 (/Users/d10c/src/semmle-code/ql/swift/ql/src/queries/Security/CWE-312/CleartextStoragePreferences.ql@34:8:34:16)
+  predicate observeDiffInformedIncrementalMode() { any() }
+
+  Location getASelectedSinkLocation(DataFlow::Node sink) {
+    exists(DataFlow::Node cleanSink | result = cleanSink.getLocation() |
+      cleanSink = sink.(DataFlow::PostUpdateNode).getPreUpdateNode()
+      or
+      not sink instanceof DataFlow::PostUpdateNode and
+      cleanSink = sink
+    )
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,15 @@ module CleartextStoragePreferencesConfig implements DataFlow::ConfigSig {`
`31`	`31`	`isSource(node)`
`32`	`32`	`}`
`33`	`33`
`34`		`- predicate observeDiffInformedIncrementalMode() {`
`35`		`- any() // TODO: Make sure that the location overrides match the query's select clause: Column 1 does not select a source or sink originating from the flow call on line 32 (/Users/d10c/src/semmle-code/ql/swift/ql/src/queries/Security/CWE-312/CleartextStoragePreferences.ql@34:8:34:16)`
	`34`	`+ predicate observeDiffInformedIncrementalMode() { any() }`
	`35`	`+`
	`36`	`+ Location getASelectedSinkLocation(DataFlow::Node sink) {`
	`37`	`+ exists(DataFlow::Node cleanSink \| result = cleanSink.getLocation() \|`
	`38`	`+ cleanSink = sink.(DataFlow::PostUpdateNode).getPreUpdateNode()`
	`39`	`+ or`
	`40`	`+ not sink instanceof DataFlow::PostUpdateNode and`
	`41`	`+ cleanSink = sink`
	`42`	`+ )`
`36`	`43`	`}`
`37`	`44`	`}`
`38`	`45`