Merge branch 'main' into dataflow/provenance-postprocess-qltest

shared/controlflow/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/controlflow/change-notes/released/1.0.4.md

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

shared/controlflow/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/controlflow/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 dependencies:

shared/dataflow/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/dataflow/change-notes/released/1.0.4.md

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

shared/dataflow/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/dataflow/codeql/dataflow/DataFlow.qll

@@ -124,8 +124,6 @@ signature module InputSig<LocationSig Location> {
     string toString();
   }
 
-  string ppReprType(DataFlowType t);
-
   /**
    * Holds if `t1` and `t2` are compatible types.
    *

shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll

@@ -3445,9 +3445,11 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       AccessPathApproxConsNil() { this = TConsNil(c, t) }
 
+      private string ppTyp() { result = t.toString() and result != "" }
+
       override string toString() {
-        // The `concat` becomes "" if `ppReprType` has no result.
-        result = "[" + c.toString() + "]" + concat(" : " + ppReprType(t))
+        // The `concat` becomes "" if `ppTyp` has no result.
+        result = "[" + c.toString() + "]" + concat(" : " + this.ppTyp())
       }
 
       override Content getHead() { result = c }
@@ -3668,7 +3670,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       ParamNodeEx getParamNode() { result = p }
 
-      override string toString() { result = p + concat(" : " + ppReprType(t)) + " " + ap }
+      private string ppTyp() { result = t.toString() and result != "" }
+
+      override string toString() { result = p + concat(" : " + this.ppTyp()) + " " + ap }
 
       Location getLocation() { result = p.getLocation() }
     }
@@ -3935,10 +3939,12 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
       override int length() { result = 1 + tail_.length() }
 
+      private string ppTyp() { result = t.toString() and result != "" }
+
       private string toStringImpl(boolean needsSuffix) {
         tail_ = TAccessPathNil() and
         needsSuffix = false and
-        result = head_.toString() + "]" + concat(" : " + ppReprType(t))
+        result = head_.toString() + "]" + concat(" : " + this.ppTyp())
         or
         result = head_ + ", " + tail_.(AccessPathCons).toStringImpl(needsSuffix)
         or
@@ -4087,9 +4093,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       private string ppType() {
         this instanceof PathNodeSink and result = ""
         or
-        exists(DataFlowType t | t = this.(PathNodeMid).getType() |
-          // The `concat` becomes "" if `ppReprType` has no result.
-          result = concat(" : " + ppReprType(t))
+        exists(string t | t = this.(PathNodeMid).getType().toString() |
+          if t = "" then result = "" else result = " : " + t
         )
       }
 
@@ -5402,9 +5407,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           private string ppType() {
             this instanceof PartialPathNodeRev and result = ""
             or
-            exists(DataFlowType t | t = this.(PartialPathNodeFwd).getType() |
-              // The `concat` becomes "" if `ppReprType` has no result.
-              result = concat(" : " + ppReprType(t))
+            exists(string t | t = this.(PartialPathNodeFwd).getType().toString() |
+              if t = "" then result = "" else result = " : " + t
             )
           }
 

shared/dataflow/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 dependencies:

shared/mad/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/mad/change-notes/released/1.0.4.md

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

shared/mad/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/mad/codeql/mad/ModelValidation.qll

@@ -118,7 +118,7 @@ module KindValidation<KindValidationConfigSig Config> {
       this =
         [
           // shared
-          "local", "remote", "file", "commandargs", "database", "environment",
+          "local", "remote", "file", "commandargs", "database", "environment", "reverse-dns",
           // Java
           "android-external-storage-dir", "contentprovider",
           // C#

shared/mad/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 dependencies:

shared/rangeanalysis/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/rangeanalysis/change-notes/released/1.0.4.md

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

shared/rangeanalysis/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/rangeanalysis/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 dependencies:

shared/regex/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/regex/change-notes/released/1.0.4.md

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

shared/regex/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/regex/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 dependencies:

shared/ssa/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/ssa/change-notes/released/1.0.4.md

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

shared/ssa/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/ssa/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 dependencies:

shared/threat-models/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/threat-models/change-notes/released/1.0.4.md

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

shared/threat-models/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/threat-models/ext/threat-model-grouping.model.yml

@@ -21,3 +21,10 @@ extensions:
       # Android threat models
       - ["android-external-storage-dir", "android"]
       - ["contentprovider", "android"]
+
+      # Threat models that are not grouped with any other threat models.
+      # (Note that all threat models are a child of "all" implicitly, and we
+      # make it explicit here just to make sure all threat models are listed.)
+      - ["database-access-result", "all"]
+      - ["file-write", "all"]
+      - ["reverse-dns", "all"]

shared/threat-models/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.4-dev
+version: 1.0.5-dev
 library: true
 groups: shared
 dataExtensions:

shared/tutorial/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/tutorial/change-notes/released/1.0.4.md

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

shared/tutorial/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/tutorial/qlpack.yml

@@ -1,7 +1,7 @@
 name: codeql/tutorial
 description: Library for the CodeQL detective tutorials, helping new users learn to
   write CodeQL queries.
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 warnOnImplicitThis: true

shared/typeflow/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/typeflow/change-notes/released/1.0.4.md

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

shared/typeflow/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/typeflow/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 dependencies:

shared/typetracking/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/typetracking/change-notes/released/1.0.4.md

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

shared/typetracking/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/typetracking/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 dependencies:

shared/typos/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/typos/change-notes/released/1.0.4.md

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

shared/typos/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/typos/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 warnOnImplicitThis: true

shared/util/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/util/change-notes/released/1.0.4.md

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

shared/util/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/util/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/util
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 dependencies: null

shared/xml/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/xml/change-notes/released/1.0.4.md

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

shared/xml/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/xml/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 dependencies:

shared/yaml/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+
+No user-facing changes.
+
 ## 1.0.3
 
 No user-facing changes.

shared/yaml/change-notes/released/1.0.4.md

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

shared/yaml/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.3
+lastReleaseVersion: 1.0.4

shared/yaml/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.4-dev
+version: 1.0.5-dev
 groups: shared
 library: true
 warnOnImplicitThis: true