Merge branch 'main' into rust-experiment

swift/ql/lib/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.2
+
+No user-facing changes.
+
 ## 1.1.1
 
 ### Minor Analysis Improvements

swift/ql/lib/change-notes/2024-09-03-outdated-deprecations.md

@@ -0,0 +1,5 @@
+---
+category: breaking
+---
+* Deleted the deprecated `explorationLimit` predicate from `DataFlow::Configuration`, use `FlowExploration<explorationLimit>` instead.
+* Deleted the deprecated `getDerivedTypeDecl` predicate from the `TypeDecl` class, use `getADerivedTypeDecl` or `getABaseTypeDecl` instead.

swift/ql/lib/change-notes/released/1.1.2.md

@@ -0,0 +1,3 @@
+## 1.1.2
+
+No user-facing changes.

swift/ql/lib/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.1.1
+lastReleaseVersion: 1.1.2

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

@@ -168,14 +168,6 @@ abstract deprecated class Configuration extends string {
    */
   predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
 
-  /**
-   * DEPRECATED: Use `FlowExploration<explorationLimit>` instead.
-   *
-   * Gets the exploration limit for `hasPartialFlow` and `hasPartialFlowRev`
-   * measured in approximate number of interprocedural steps.
-   */
-  deprecated int explorationLimit() { none() }
-
   /**
    * Holds if hidden nodes should be included in the data flow graph.
    *

swift/ql/lib/codeql/swift/elements/decl/TypeDecl.qll

@@ -75,13 +75,6 @@ class TypeDecl extends Generated::TypeDecl {
    */
   TypeDecl getABaseTypeDecl() { result = this.getABaseType().(AnyGenericType).getDeclaration() }
 
-  /**
-   * Gets a declaration that has this type as its `index`th base type.
-   *
-   * DEPRECATED: The index is not very meaningful here. Use `getADerivedTypeDecl` or `getABaseTypeDecl`.
-   */
-  deprecated TypeDecl getDerivedTypeDecl(int i) { result.getBaseTypeDecl(i) = this }
-
   /**
    * Gets the declaration of any type derived from this type declaration. Expands protocols
    * added in extensions and expands type aliases. For example in the following code, `B`

swift/ql/lib/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 1.1.2-dev
+version: 1.1.3-dev
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme

swift/ql/src/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.6
+
+### Minor Analysis Improvements
+
+* False positive results from the `swift/cleartext-transmission` ("Cleartext transmission of sensitive information") query involving `tel:`, `mailto:` and similar URLs have been fixed.
+
 ## 1.0.5
 
 ### Minor Analysis Improvements

swift/ql/src/change-notes/released/1.0.6.md

@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 1.0.6
+
+### Minor Analysis Improvements
+
 * False positive results from the `swift/cleartext-transmission` ("Cleartext transmission of sensitive information") query involving `tel:`, `mailto:` and similar URLs have been fixed.

swift/ql/src/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.5
+lastReleaseVersion: 1.0.6

swift/ql/src/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.0.6-dev
+version: 1.0.7-dev
 groups:
   - swift
   - queries

swift/ql/src/queries/Security/CWE-020/IncompleteHostnameRegex.qhelp

@@ -46,7 +46,7 @@
 
 		</p>
 
-		<sample src="IncompleteHostnameRegexBad.swift"/>
+		<sample src="IncompleteHostnameRegexBad.swift" language=""/>
 
 		<p>
 
@@ -63,7 +63,7 @@
 
 		</p>
 
-		<sample src="IncompleteHostnameRegexGood.swift"/>
+		<sample src="IncompleteHostnameRegexGood.swift" language=""/>
 
 	</example>
 

swift/ql/src/queries/Security/CWE-116/BadTagFilter.qhelp

@@ -28,7 +28,7 @@ likely to handle corner cases correctly than a custom implementation.
 The following example attempts to filters out all <code>&lt;script&gt;</code> tags.
 </p>
 
-<sample src="BadTagFilterBad.swift" />
+<sample src="BadTagFilterBad.swift" language="" />
 
 <p>
 The above sanitizer does not filter out all <code>&lt;script&gt;</code> tags.

swift/ql/src/queries/Security/CWE-1333/ReDoS.qhelp

@@ -3,7 +3,7 @@
   <include src="ReDoSIntroduction.inc.qhelp" />
   <example>
     <p>Consider the following regular expression:</p>
-    <sample language="swift">
+    <sample language="">
 /^_(__|.)+_$/</sample>
     <p>
       Its sub-expression <code>"(__|.)+"</code> can match the string
@@ -19,7 +19,7 @@
       the ambiguity between the two branches of the alternative inside the
       repetition:
     </p>
-    <sample language="swift">
+    <sample language="">
 /^_(__|[^_])+_$/</sample>
   </example>
   <include src="ReDoSReferences.inc.qhelp"/>

swift/third_party/load.bzl

@@ -1,11 +1,11 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
-_swift_prebuilt_version = "swift-5.10-RELEASE.322"
+_swift_prebuilt_version = "swift-5.10.1-RELEASE.323"
 _swift_sha_map = {
-    "Linux-X64": "634497779e930a808489e5d472753b604c07085abf411356cae7921bde14130f",
-    "macOS-ARM64": "293df92da9a3cc79c595a28b1b4ec881a5fdb248ea7eac34c89943e94deff700",
-    "macOS-X64": "813c1746777701d30e716c130b0bb087a9c5b7ab025fd99afc695ec52cd432ad",
+    "Linux-X64": "29c7c53ab2f438e85daecdb4567173c78ac32afc45753d7277d744aed515229d",
+    "macOS-ARM64": "e697f423c8abcb8a942246489fd4f8ce71472119510b64b2073eaeaec86b771e",
+    "macOS-X64": "faef29334e8615e8a71263c7453ebc7e566d6f2928d827675f6faae233c544a6",
 }
 
 _swift_arch_map = {