Swift: Convert to MaD.

Author: geoffw0

swift/ql/lib/codeql/swift/frameworks/Alamofire/Alamofire.qll

@@ -7,32 +7,16 @@ private import codeql.swift.dataflow.DataFlow
 private import codeql.swift.dataflow.ExternalFlow
 private import codeql.swift.dataflow.FlowSources
 
-/**
- * An Alamofire response handler type.
- */
-private class AlamofireResponseType extends NominalTypeDecl {
-  AlamofireResponseType() {
-    this.getABaseTypeDecl*().getFullName() = ["DataResponse", "DownloadResponse"]
-  }
-
-  /**
-   * Gets a field that contains remote data.
-   */
-  FieldDecl getADataField() {
-    result = this.getAMember() and
-    result.getName() = ["data", "value", "result"]
-  }
-}
-
-/**
- * A remote flow source that is an access to remote data from an Alamofire response handler.
- */
-private class AlamofireResponseSource extends RemoteFlowSource {
-  AlamofireResponseSource() {
-    exists(AlamofireResponseType responseType |
-      this.asExpr().(MemberRefExpr).getMember() = responseType.getADataField()
-    )
+private class StringSource extends SourceModelCsv {
+  override predicate row(string row) {
+    row =
+      [
+        // `DataResponse.data`, `.value`, `.result`
+        ";DataResponse;true;data;;;;remote", ";DataResponse;true;value;;;;remote",
+        ";DataResponse;true;result;;;;remote",
+        // `DownloadResponse.data`, `.value`, `.result`
+        ";DownloadResponse;true;data;;;;remote", ";DownloadResponse;true;value;;;;remote",
+        ";DownloadResponse;true;result;;;;remote",
+      ]
   }
-
-  override string getSourceType() { result = "Data from an Alamofire response" }
 }

swift/ql/test/library-tests/dataflow/flowsources/FlowSources.expected

@@ -1,35 +1,16 @@
-| alamofire.swift:91:27:91:27 | .result | Data from an Alamofire response |
-| alamofire.swift:99:27:99:27 | .result | Data from an Alamofire response |
-| alamofire.swift:342:23:342:32 | .data | Data from an Alamofire response |
-| alamofire.swift:349:22:349:31 | .value | Data from an Alamofire response |
-| alamofire.swift:356:23:356:32 | .value | Data from an Alamofire response |
-| alamofire.swift:363:22:363:31 | .value | Data from an Alamofire response |
-| alamofire.swift:370:23:370:32 | .value | Data from an Alamofire response |
-| alamofire.swift:377:28:377:37 | .value | Data from an Alamofire response |
 | alamofire.swift:387:28:387:28 | call to init(contentsOfFile:) | external |
 | alamofire.swift:387:28:387:55 | call to init(contentsOfFile:) | external |
-| alamofire.swift:394:22:394:31 | .value | Data from an Alamofire response |
-| alamofire.swift:401:22:401:31 | .value | Data from an Alamofire response |
 | alamofire.swift:402:28:402:28 | call to init(contentsOf:) | external |
 | alamofire.swift:402:28:402:50 | call to init(contentsOf:) | external |
-| alamofire.swift:409:23:409:32 | .value | Data from an Alamofire response |
-| alamofire.swift:416:22:416:31 | .value | Data from an Alamofire response |
-| alamofire.swift:423:23:423:32 | .value | Data from an Alamofire response |
-| alamofire.swift:429:28:429:37 | .value | Data from an Alamofire response |
 | alamofire.swift:446:20:446:20 | call to init(contentsOfFile:) | external |
 | alamofire.swift:446:20:446:49 | call to init(contentsOfFile:) | external |
-| alamofire.swift:453:23:453:32 | .data | Data from an Alamofire response |
-| alamofire.swift:459:23:459:32 | .data | Data from an Alamofire response |
 | customurlschemes.swift:30:44:30:54 | url | external |
 | customurlschemes.swift:34:52:34:68 | url | external |
 | customurlschemes.swift:38:52:38:62 | url | external |
 | customurlschemes.swift:43:9:43:28 | ...[...] | Remote URL in UIApplicationDelegate.application.launchOptions |
 | customurlschemes.swift:48:9:48:28 | ...[...] | Remote URL in UIApplicationDelegate.application.launchOptions |
 | data.swift:18:20:18:20 | call to init(contentsOf:options:) | external |
 | data.swift:18:20:18:54 | call to init(contentsOf:options:) | external |
-| file://:0:0:0:0 | .data | Data from an Alamofire response |
-| file://:0:0:0:0 | .result | Data from an Alamofire response |
-| file://:0:0:0:0 | .result | Data from an Alamofire response |
 | nsdata.swift:18:17:18:17 | call to init(contentsOf:) | external |
 | nsdata.swift:18:17:18:40 | call to init(contentsOf:) | external |
 | nsdata.swift:19:17:19:17 | call to init(contentsOf:options:) | external |