Merge pull request github#12634 from github/redsun82/swift-successuful-extractions

redsun82 · web-flow · commit 329684c2b0d8 · 2023-03-23T12:52:13.000+01:00
Swift: add a query showing successfully extracted files
diff --git a/java/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql b/java/ql/src/Security/CWE/CWE-190/ArithmeticTainted.ql
@@ -37,7 +37,8 @@ module RemoteUserInputOverflow = TaintTracking::Make<RemoteUserInputOverflowConf
 module RemoteUserInputUnderflow = TaintTracking::Make<RemoteUserInputUnderflowConfig>;
 
 module Flow =
-  DataFlow::MergePathGraph<RemoteUserInputOverflow::PathNode, RemoteUserInputUnderflow::PathNode, RemoteUserInputOverflow::PathGraph, RemoteUserInputUnderflow::PathGraph>;
+  DataFlow::MergePathGraph<RemoteUserInputOverflow::PathNode, RemoteUserInputUnderflow::PathNode,
+    RemoteUserInputOverflow::PathGraph, RemoteUserInputUnderflow::PathGraph>;
 
 import Flow::PathGraph
 
diff --git a/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql b/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql
@@ -261,7 +261,9 @@ module InsecureMethodPathGraph implements DataFlow::PathGraphSig<MethodAccessIns
 }
 
 module Flow =
-  DataFlow::MergePathGraph<TempDirSystemGetPropertyToCreate::PathNode, MethodAccessInsecureFileCreation, TempDirSystemGetPropertyToCreate::PathGraph, InsecureMethodPathGraph>;
+  DataFlow::MergePathGraph<TempDirSystemGetPropertyToCreate::PathNode,
+    MethodAccessInsecureFileCreation, TempDirSystemGetPropertyToCreate::PathGraph,
+    InsecureMethodPathGraph>;
 
 import Flow::PathGraph
 
diff --git a/swift/ql/src/diagnostics/SuccessfullyExtractedFiles.ql b/swift/ql/src/diagnostics/SuccessfullyExtractedFiles.ql
@@ -0,0 +1,15 @@
+/**
+ * @name Successfully extracted files
+ * @description Lists all files in the source code directory that were extracted without encountering a problem in the file.
+ * @kind diagnostic
+ * @id swift/diagnostics/successfully-extracted-files
+ * @tags successfully-extracted-files
+ */
+
+import swift
+
+from File f
+where
+  not exists(CompilerError e | e.getFile() = f) and
+  f.getBaseName().regexpMatch(".*\\.swift\\z")
+select f, "File successfully extracted."
diff --git a/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected b/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.expected
@@ -0,0 +1 @@
+| main.swift:0:0:0:0 | main.swift | File successfully extracted. |
diff --git a/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.qlref b/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedFiles.qlref
@@ -0,0 +1 @@
+diagnostics/SuccessfullyExtractedFiles.ql
diff --git a/swift/ql/test/query-tests/Diagnostics/error.swift b/swift/ql/test/query-tests/Diagnostics/error.swift
@@ -0,0 +1,2 @@
+//codeql-extractor-expected-status: 1
+#error("Uh oh")
diff --git a/swift/ql/test/query-tests/Diagnostics/main.swift b/swift/ql/test/query-tests/Diagnostics/main.swift

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,9 @@ module InsecureMethodPathGraph implements DataFlow::PathGraphSig<MethodAccessIns`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`module Flow =`
`264`		`- DataFlow::MergePathGraph<TempDirSystemGetPropertyToCreate::PathNode, MethodAccessInsecureFileCreation, TempDirSystemGetPropertyToCreate::PathGraph, InsecureMethodPathGraph>;`
	`264`	`+ DataFlow::MergePathGraph<TempDirSystemGetPropertyToCreate::PathNode,`
	`265`	`+ MethodAccessInsecureFileCreation, TempDirSystemGetPropertyToCreate::PathGraph,`
	`266`	`+ InsecureMethodPathGraph>;`
`265`	`267`
`266`	`268`	`import Flow::PathGraph`
`267`	`269`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+\| main.swift:0:0:0:0 \| main.swift \| File successfully extracted. \|`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+diagnostics/SuccessfullyExtractedFiles.ql`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+//codeql-extractor-expected-status: 1`
	`2`	`+#error("Uh oh")`