Swift: Use ClassOrStructDecl.

geoffw0 · geoffw0 · commit 0ed89fb11a3c · 2022-10-04T15:10:41.000+01:00
diff --git a/swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql b/swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql
@@ -31,7 +31,7 @@ class Sink extends DataFlow::Node {
       int baseUrlArg
     |
       // arguments to method calls...
-      exists(string className, ClassDecl c |
+      exists(string className, ClassOrStructDecl c |
         (
           // `loadHTMLString`
           className = ["UIWebView", "WKWebView"] and
diff --git a/swift/ql/src/queries/Security/CWE-135/StringLengthConflation.ql b/swift/ql/src/queries/Security/CWE-135/StringLengthConflation.ql
@@ -99,7 +99,7 @@ class StringLengthConflationConfiguration extends DataFlow::Configuration {
     |
       (
         // arguments to method calls...
-        exists(string className, ClassDecl c |
+        exists(string className, ClassOrStructDecl c |
           (
             // `NSRange.init`
             className = "NSRange" and
@@ -127,7 +127,7 @@ class StringLengthConflationConfiguration extends DataFlow::Configuration {
             paramName = "at"
           ) and
           c.getName() = className and
-          c.getABaseTypeDecl*().(ClassDecl).getAMember() = funcDecl and
+          c.getABaseTypeDecl*().(ClassOrStructDecl).getAMember() = funcDecl and
           call.getStaticTarget() = funcDecl and
           flowstate = "NSString"
         )
diff --git a/swift/ql/src/queries/Security/CWE-311/CleartextStorageDatabase.ql b/swift/ql/src/queries/Security/CWE-311/CleartextStorageDatabase.ql
@@ -28,7 +28,7 @@ abstract class Stored extends DataFlow::Node { }
 class CoreDataStore extends Stored {
   CoreDataStore() {
     // `content` arg to `NWConnection.send` is a sink
-    exists(ClassDecl c, AbstractFunctionDecl f, CallExpr call |
+    exists(ClassOrStructDecl c, AbstractFunctionDecl f, CallExpr call |
       c.getName() = "NSManagedObject" and
       c.getAMember() = f and
       f.getName() = ["setValue(_:forKey:)", "setPrimitiveValue(_:forKey:)"] and
@@ -47,7 +47,7 @@ class RealmStore extends Stored instanceof DataFlow::PostUpdateNode {
     // any write into a class derived from `RealmSwiftObject` is a sink. For
     // example in `realmObj.data = sensitive` the post-update node corresponding
     // with `realmObj.data` is a sink.
-    exists(ClassDecl cd, Expr e |
+    exists(ClassOrStructDecl cd, Expr e |
       cd.getABaseTypeDecl*().getName() = "RealmSwiftObject" and
       this.getPreUpdateNode().asExpr() = e and
       e.getFullyConverted().getType() = cd.getType() and
@@ -81,7 +81,7 @@ class CleartextStorageConfig extends TaintTracking::Configuration {
     // flow out from fields of a `RealmSwiftObject` at the sink, for example in
     // `realmObj.data = sensitive`.
     isSink(node) and
-    exists(ClassDecl cd |
+    exists(ClassOrStructDecl cd |
       c.getAReadContent().(DataFlow::Content::FieldContent).getField() = cd.getAMember() and
       cd.getABaseTypeDecl*().getName() = "RealmSwiftObject"
     )
diff --git a/swift/ql/src/queries/Security/CWE-311/CleartextTransmission.ql b/swift/ql/src/queries/Security/CWE-311/CleartextTransmission.ql
@@ -28,7 +28,7 @@ abstract class Transmitted extends Expr { }
 class NWConnectionSend extends Transmitted {
   NWConnectionSend() {
     // `content` arg to `NWConnection.send` is a sink
-    exists(ClassDecl c, AbstractFunctionDecl f, CallExpr call |
+    exists(ClassOrStructDecl c, AbstractFunctionDecl f, CallExpr call |
       c.getName() = "NWConnection" and
       c.getAMember() = f and
       f.getName() = "send(content:contentContext:isComplete:completion:)" and
@@ -46,7 +46,7 @@ class Url extends Transmitted {
   Url() {
     // `string` arg in `URL.init` is a sink
     // (we assume here that the URL goes on to be used in a network operation)
-    exists(StructDecl c, AbstractFunctionDecl f, CallExpr call |
+    exists(ClassOrStructDecl c, AbstractFunctionDecl f, CallExpr call |
       c.getName() = "URL" and
       c.getAMember() = f and
       f.getName() = ["init(string:)", "init(string:relativeTo:)"] and
diff --git a/swift/ql/src/queries/Security/CWE-328/WeakSensitiveDataHashing.ql b/swift/ql/src/queries/Security/CWE-328/WeakSensitiveDataHashing.ql
@@ -42,7 +42,7 @@ module WeakHashingConfig {
         call.getAnArgument().getExpr() = this.asExpr() and
         call.getStaticTarget() = func and
         func.getName().matches(["hash(%", "update(%"]) and
-        algorithm = func.getEnclosingDecl().(StructDecl).getName() and
+        algorithm = func.getEnclosingDecl().(ClassOrStructDecl).getName() and
         algorithm = ["MD5", "SHA1"]
       )
     }
diff --git a/swift/ql/src/queries/Security/ECB-Encryption/ECBEncryption.ql b/swift/ql/src/queries/Security/ECB-Encryption/ECBEncryption.ql
@@ -26,7 +26,7 @@ abstract class BlockMode extends Expr { }
 class AES extends BlockMode {
   AES() {
     // `blockMode` arg in `AES.init` is a sink
-    exists(ClassDecl c, AbstractFunctionDecl f, CallExpr call |
+    exists(ClassOrStructDecl c, AbstractFunctionDecl f, CallExpr call |
       c.getName() = "AES" and
       c.getAMember() = f and
       f.getName() = ["init(key:blockMode:)", "init(key:blockMode:padding:)"] and
@@ -42,7 +42,7 @@ class AES extends BlockMode {
 class Blowfish extends BlockMode {
   Blowfish() {
     // `blockMode` arg in `Blowfish.init` is a sink
-    exists(ClassDecl c, AbstractFunctionDecl f, CallExpr call |
+    exists(ClassOrStructDecl c, AbstractFunctionDecl f, CallExpr call |
       c.getName() = "Blowfish" and
       c.getAMember() = f and
       f.getName() = "init(key:blockMode:padding:)" and
@@ -60,7 +60,7 @@ class EcbEncryptionConfig extends DataFlow::Configuration {
   EcbEncryptionConfig() { this = "EcbEncryptionConfig" }
 
   override predicate isSource(DataFlow::Node node) {
-    exists(StructDecl s, AbstractFunctionDecl f, CallExpr call |
+    exists(ClassOrStructDecl s, AbstractFunctionDecl f, CallExpr call |
       s.getName() = "ECB" and
       s.getAMember() = f and
       f.getName() = "init()" and

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class Sink extends DataFlow::Node {`
`31`	`31`	`int baseUrlArg`
`32`	`32`	`\|`
`33`	`33`	`// arguments to method calls...`
`34`		`- exists(string className, ClassDecl c \|`
	`34`	`+ exists(string className, ClassOrStructDecl c \|`
`35`	`35`	`(`
`36`	`36`	// `loadHTMLString`
`37`	`37`	`className = ["UIWebView", "WKWebView"] and`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ class StringLengthConflationConfiguration extends DataFlow::Configuration {`
`99`	`99`	`\|`
`100`	`100`	`(`
`101`	`101`	`// arguments to method calls...`
`102`		`- exists(string className, ClassDecl c \|`
	`102`	`+ exists(string className, ClassOrStructDecl c \|`
`103`	`103`	`(`
`104`	`104`	// `NSRange.init`
`105`	`105`	`className = "NSRange" and`
`@@ -127,7 +127,7 @@ class StringLengthConflationConfiguration extends DataFlow::Configuration {`
`127`	`127`	`paramName = "at"`
`128`	`128`	`) and`
`129`	`129`	`c.getName() = className and`
`130`		`- c.getABaseTypeDecl*().(ClassDecl).getAMember() = funcDecl and`
	`130`	`+ c.getABaseTypeDecl*().(ClassOrStructDecl).getAMember() = funcDecl and`
`131`	`131`	`call.getStaticTarget() = funcDecl and`
`132`	`132`	`flowstate = "NSString"`
`133`	`133`	`)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ module WeakHashingConfig {`
`42`	`42`	`call.getAnArgument().getExpr() = this.asExpr() and`
`43`	`43`	`call.getStaticTarget() = func and`
`44`	`44`	`func.getName().matches(["hash(%", "update(%"]) and`
`45`		`- algorithm = func.getEnclosingDecl().(StructDecl).getName() and`
	`45`	`+ algorithm = func.getEnclosingDecl().(ClassOrStructDecl).getName() and`
`46`	`46`	`algorithm = ["MD5", "SHA1"]`
`47`	`47`	`)`
`48`	`48`	`}`