Merge pull request #10596 from geoffw0/swifturl

Swift: URL is a struct, not a class

Author: geoffw0

swift/ql/lib/codeql/swift/dataflow/internal/TaintTrackingPrivate.qll

@@ -49,7 +49,7 @@ private module Cached {
     )
     or
     // allow flow through `URL.init`.
-    exists(CallExpr call, ClassDecl c, AbstractFunctionDecl f |
+    exists(CallExpr call, StructDecl c, AbstractFunctionDecl f |
       c.getName() = "URL" and
       c.getAMember() = f and
       f.getName() = ["init(string:)", "init(string:relativeTo:)"] and

swift/ql/src/queries/Security/CWE-311/CleartextTransmission.ql

@@ -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(ClassDecl c, AbstractFunctionDecl f, CallExpr call |
+    exists(StructDecl c, AbstractFunctionDecl f, CallExpr call |
       c.getName() = "URL" and
       c.getAMember() = f and
       f.getName() = ["init(string:)", "init(string:relativeTo:)"] and

swift/ql/test/library-tests/dataflow/taint/url.swift

@@ -1,5 +1,5 @@
 
-class URL
+struct URL
 {
 	init?(string: String) {}
 	init?(string: String, relativeTo: URL?) {}

swift/ql/test/query-tests/Security/CWE-079/UnsafeWebViewFetch.swift

@@ -5,7 +5,7 @@ class NSObject
 {
 }
 
-class URL
+struct URL
 {
 	init?(string: String) {}
 	init?(string: String, relativeTo: URL?) {}
@@ -14,9 +14,9 @@ class URL
 extension String {
 	init(contentsOf: URL) throws {
         var data = ""
-        
+
         // ...
-        
+
         self.init(data)
     }
 }

swift/ql/test/query-tests/Security/CWE-311/testURL.swift

@@ -1,7 +1,7 @@
 
 // --- stubs ---
 
-class URL
+struct URL
 {
 	init?(string: String) {}
 	init?(string: String, relativeTo: URL?) {}