Merge branch 'main' into rust-ref-mut

github · Mar 3, 2025 · d8d8829 · d8d8829
2 parents bc651af + 7570672
commit d8d8829
Showing 27 changed files with 1,618 additions and 1,106 deletions.
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+        "version": "9.0.100"
+    }
+}
diff --git a/docs/codeql/reusables/supported-versions-compilers.rst b/docs/codeql/reusables/supported-versions-compilers.rst
@@ -33,7 +33,7 @@
     .. [2] Objective-C, Objective-C++, C++/CLI, and C++/CX are not supported.
     .. [3] Support for the clang-cl compiler is preliminary.
     .. [4] Support for the Arm Compiler (armcc) is preliminary.
-    .. [5] Builds that execute on Java 7 to 22 can be analyzed. The analysis understands standard language features in Java 8 to 22; "preview" and "incubator" features are not supported. Source code using Java language versions older than Java 8 are analyzed as Java 8 code.
+    .. [5] Builds that execute on Java 7 to 24 can be analyzed. The analysis understands standard language features in Java 8 to 24; "preview" and "incubator" features are not supported. Source code using Java language versions older than Java 8 are analyzed as Java 8 code.
     .. [6] ECJ is supported when the build invokes it via the Maven Compiler plugin or the Takari Lifecycle plugin.
     .. [7] JSX and Flow code, YAML, JSON, HTML, and XML files may also be analyzed with JavaScript files.
     .. [8] The extractor requires Python 3 to run. To analyze Python 2.7 you should install both versions of Python.

diff --git a/go/documentation/library-coverage/coverage.csv b/go/documentation/library-coverage/coverage.csv
@@ -70,6 +70,7 @@ github.com/jinzhu/gorm,13,15,1,,,,,,,,,,,,13,,,,,,15,,,,,1,
 github.com/jmoiron/sqlx,12,49,11,,,,,,,,,,,,12,,,,,,49,,,,,11,
 github.com/joho/godotenv,,4,,,,,,,,,,,,,,,,,,,,4,,,,,
 github.com/json-iterator/go,,,4,,,,,,,,,,,,,,,,,,,,,,,4,
+github.com/kanikanema/gorqlite,24,8,2,,,,,,,,,,,,24,,,,,,8,,,,,2,
 github.com/kataras/iris/context,6,,,,,,,,6,,,,,,,,,,,,,,,,,,
 github.com/kataras/iris/middleware/jwt,2,,,,2,,,,,,,,,,,,,,,,,,,,,,
 github.com/kataras/iris/server/web/context,6,,,,,,,,6,,,,,,,,,,,,,,,,,,
@@ -84,10 +85,10 @@ github.com/masterzen/xmlpath,2,,,,,,,,,,,,,,,,,,2,,,,,,,,
 github.com/moovweb/gokogiri/xml,4,,,,,,,,,,,,,,,,,,4,,,,,,,,
 github.com/moovweb/gokogiri/xpath,1,,,,,,,,,,,,,,,,,,1,,,,,,,,
 github.com/ory/fosite/token/jwt,2,,,,2,,,,,,,,,,,,,,,,,,,,,,
-github.com/raindog308/gorqlite,24,,,,,,,,,,,,,,24,,,,,,,,,,,,
+github.com/raindog308/gorqlite,24,8,2,,,,,,,,,,,,24,,,,,,8,,,,,2,
 github.com/revel/revel,2,23,10,,,,,,1,,,,,,,1,,,,,,,,23,,10,
 github.com/robfig/revel,2,23,10,,,,,,1,,,,,,,1,,,,,,,,23,,10,
-github.com/rqlite/gorqlite,24,,,,,,,,,,,,,,24,,,,,,,,,,,,
+github.com/rqlite/gorqlite,24,8,2,,,,,,,,,,,,24,,,,,,8,,,,,2,
 github.com/santhosh-tekuri/xpathparser,2,,,,,,,,,,,,,,,,,,2,,,,,,,,
 github.com/sendgrid/sendgrid-go/helpers/mail,,,1,,,,,,,,,,,,,,,,,,,,,,,1,
 github.com/sirupsen/logrus,145,,,,,,145,,,,,,,,,,,,,,,,,,,,

diff --git a/go/documentation/library-coverage/coverage.rst b/go/documentation/library-coverage/coverage.rst
@@ -53,7 +53,7 @@ Go framework & library support
    `goproxy <https://github.com/elazarl/goproxy>`_,``github.com/elazarl/goproxy*``,2,2,2
    `gorilla/mux <https://github.com/gorilla/mux>`_,``github.com/gorilla/mux*``,1,,
    `gorilla/websocket <https://github.com/gorilla/websocket>`_,``github.com/gorilla/websocket*``,3,,
-   `gorqlite <https://github.com/rqlite/gorqlite>`_,"``github.com/raindog308/gorqlite*``, ``github.com/rqlite/gorqlite*``",,,48
+   `gorqlite <https://github.com/rqlite/gorqlite>`_,"``github.com/raindog308/gorqlite*``, ``github.com/rqlite/gorqlite*``",16,4,48
    `goxpath <https://github.com/ChrisTrenkamp/goxpath/wiki>`_,``github.com/ChrisTrenkamp/goxpath*``,,,3
    `htmlquery <https://github.com/antchfx/htmlquery>`_,``github.com/antchfx/htmlquery*``,,,4
    `json-iterator <https://github.com/json-iterator/go>`_,``github.com/json-iterator/go*``,,4,
@@ -73,5 +73,6 @@ Go framework & library support
    `xpathparser <https://github.com/santhosh-tekuri/xpathparser>`_,``github.com/santhosh-tekuri/xpathparser*``,,,2
    `yaml <https://gopkg.in/yaml.v3>`_,``gopkg.in/yaml*``,,9,
    `zap <https://go.uber.org/zap>`_,``go.uber.org/zap*``,,11,33
-   Totals,,470,952,1532
+   Others,``github.com/kanikanema/gorqlite``,8,2,24
+   Totals,,494,958,1556
 
diff --git a/java/ql/lib/change-notes/2025-02-27-jdk-24.md b/java/ql/lib/change-notes/2025-02-27-jdk-24.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* The Java extractor and QL libraries now support Java 24.
diff --git a/java/ql/test-kotlin1/library-tests/compilation-units/cus.expected b/java/ql/test-kotlin1/library-tests/compilation-units/cus.expected
@@ -2,6 +2,8 @@
 | AbstractList$RandomAccessSpliterator | .../AbstractList$RandomAccessSpliterator.class:0:0:0:0 |
 | ArrayList | .../ArrayList.class:0:0:0:0 |
 | ArrayList$ArrayListSpliterator | .../ArrayList$ArrayListSpliterator.class:0:0:0:0 |
+| CleanerImpl$CleanableList | .../CleanerImpl$CleanableList.class:0:0:0:0 |
+| CleanerImpl$CleanableList$Node | .../CleanerImpl$CleanableList$Node.class:0:0:0:0 |
 | List | .../List.class:0:0:0:0 |
 | ListIterator | .../ListIterator.class:0:0:0:0 |
 | MemorySessionImpl$ResourceList | .../MemorySessionImpl$ResourceList.class:0:0:0:0 |

diff --git a/java/ql/test-kotlin1/library-tests/java-kotlin-collection-type-generic-methods/test.expected b/java/ql/test-kotlin1/library-tests/java-kotlin-collection-type-generic-methods/test.expected
@@ -16,6 +16,22 @@ methodWithDuplicate
 | AbstractCollection<E> | removeAll | Collection<?> |
 | AbstractCollection<E> | retainAll | Collection<?> |
 | AbstractCollection<E> | toArray | T[] |
+| AbstractCollection<Entry<K,V>> | add | Entry<K,V> |
+| AbstractCollection<Entry<K,V>> | addAll | Collection<? extends Entry<K,V>> |
+| AbstractCollection<Entry<K,V>> | contains | Object |
+| AbstractCollection<Entry<K,V>> | containsAll | Collection<?> |
+| AbstractCollection<Entry<K,V>> | remove | Object |
+| AbstractCollection<Entry<K,V>> | removeAll | Collection<?> |
+| AbstractCollection<Entry<K,V>> | retainAll | Collection<?> |
+| AbstractCollection<Entry<K,V>> | toArray | T[] |
+| AbstractCollection<K> | add | K |
+| AbstractCollection<K> | addAll | Collection<? extends K> |
+| AbstractCollection<K> | contains | Object |
+| AbstractCollection<K> | containsAll | Collection<?> |
+| AbstractCollection<K> | remove | Object |
+| AbstractCollection<K> | removeAll | Collection<?> |
+| AbstractCollection<K> | retainAll | Collection<?> |
+| AbstractCollection<K> | toArray | T[] |
 | AbstractCollection<Runnable> | add | Runnable |
 | AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
 | AbstractCollection<Runnable> | contains | Object |
@@ -40,6 +56,14 @@ methodWithDuplicate
 | AbstractCollection<T> | removeAll | Collection<?> |
 | AbstractCollection<T> | retainAll | Collection<?> |
 | AbstractCollection<T> | toArray | T[] |
+| AbstractCollection<V> | add | V |
+| AbstractCollection<V> | addAll | Collection<? extends V> |
+| AbstractCollection<V> | contains | Object |
+| AbstractCollection<V> | containsAll | Collection<?> |
+| AbstractCollection<V> | remove | Object |
+| AbstractCollection<V> | removeAll | Collection<?> |
+| AbstractCollection<V> | retainAll | Collection<?> |
+| AbstractCollection<V> | toArray | T[] |
 | AbstractList | add | E |
 | AbstractList | add | int |
 | AbstractList | addAll | Collection<? extends E> |

diff --git a/java/ql/test-kotlin2/library-tests/compilation-units/cus.expected b/java/ql/test-kotlin2/library-tests/compilation-units/cus.expected
@@ -2,6 +2,8 @@
 | AbstractList$RandomAccessSpliterator | .../AbstractList$RandomAccessSpliterator.class:0:0:0:0 |
 | ArrayList | .../ArrayList.class:0:0:0:0 |
 | ArrayList$ArrayListSpliterator | .../ArrayList$ArrayListSpliterator.class:0:0:0:0 |
+| CleanerImpl$CleanableList | .../CleanerImpl$CleanableList.class:0:0:0:0 |
+| CleanerImpl$CleanableList$Node | .../CleanerImpl$CleanableList$Node.class:0:0:0:0 |
 | List | .../List.class:0:0:0:0 |
 | ListIterator | .../ListIterator.class:0:0:0:0 |
 | MemorySessionImpl$ResourceList | .../MemorySessionImpl$ResourceList.class:0:0:0:0 |

diff --git a/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected b/java/ql/test-kotlin2/library-tests/java-kotlin-collection-type-generic-methods/test.expected
@@ -16,6 +16,22 @@ methodWithDuplicate
 | AbstractCollection<E> | removeAll | Collection<?> |
 | AbstractCollection<E> | retainAll | Collection<?> |
 | AbstractCollection<E> | toArray | T[] |
+| AbstractCollection<Entry<K,V>> | add | Entry<K,V> |
+| AbstractCollection<Entry<K,V>> | addAll | Collection<? extends Entry<K,V>> |
+| AbstractCollection<Entry<K,V>> | contains | Object |
+| AbstractCollection<Entry<K,V>> | containsAll | Collection<?> |
+| AbstractCollection<Entry<K,V>> | remove | Object |
+| AbstractCollection<Entry<K,V>> | removeAll | Collection<?> |
+| AbstractCollection<Entry<K,V>> | retainAll | Collection<?> |
+| AbstractCollection<Entry<K,V>> | toArray | T[] |
+| AbstractCollection<K> | add | K |
+| AbstractCollection<K> | addAll | Collection<? extends K> |
+| AbstractCollection<K> | contains | Object |
+| AbstractCollection<K> | containsAll | Collection<?> |
+| AbstractCollection<K> | remove | Object |
+| AbstractCollection<K> | removeAll | Collection<?> |
+| AbstractCollection<K> | retainAll | Collection<?> |
+| AbstractCollection<K> | toArray | T[] |
 | AbstractCollection<Runnable> | add | Runnable |
 | AbstractCollection<Runnable> | addAll | Collection<? extends Runnable> |
 | AbstractCollection<Runnable> | contains | Object |
@@ -40,6 +56,14 @@ methodWithDuplicate
 | AbstractCollection<T> | removeAll | Collection<?> |
 | AbstractCollection<T> | retainAll | Collection<?> |
 | AbstractCollection<T> | toArray | T[] |
+| AbstractCollection<V> | add | V |
+| AbstractCollection<V> | addAll | Collection<? extends V> |
+| AbstractCollection<V> | contains | Object |
+| AbstractCollection<V> | containsAll | Collection<?> |
+| AbstractCollection<V> | remove | Object |
+| AbstractCollection<V> | removeAll | Collection<?> |
+| AbstractCollection<V> | retainAll | Collection<?> |
+| AbstractCollection<V> | toArray | T[] |
 | AbstractList | add | E |
 | AbstractList | add | int |
 | AbstractList | addAll | Collection<? extends E> |

diff --git a/java/ql/test-kotlin2/library-tests/reflection/reflection.expected b/java/ql/test-kotlin2/library-tests/reflection/reflection.expected
@@ -333,6 +333,7 @@ compGenerated
 | file://<external>/TextStyle.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/Thread$State.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/TimeUnit.class:0:0:0:0 | getEntries | Default property accessor |
+| file://<external>/TypeKind.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/VarHandle$AccessMode.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/VarHandle$AccessType.class:0:0:0:0 | getEntries | Default property accessor |
 | file://<external>/Wrapper.class:0:0:0:0 | getEntries | Default property accessor |

diff --git a/java/ql/test/library-tests/errortype-with-params/PrintAst.expected b/java/ql/test/library-tests/errortype-with-params/PrintAst.expected
@@ -2,5 +2,5 @@ Test.java:
 #    0| [CompilationUnit] Test
 #    1|   1: [Class] Test
 #-----|     -1: (Base Types)
-#    1|       0: [TypeAccess] <any>
+#    1|       0: [TypeAccess] Unavailable<String>
 #    1|         0: [TypeAccess] String
diff --git a/java/ql/test/library-tests/errortype/Diags.expected b/java/ql/test/library-tests/errortype/Diags.expected
@@ -3,4 +3,5 @@
 | Test.java:6:23:6:39 | Unexpected symbol for constructor: new NoSuchClass() |
 | Test.java:6:23:6:39 | Unknown or erroneous type for expression of kind ClassInstanceCreation |
 | Test.java:6:27:6:37 | Unknown or erroneous type for expression of kind TypeAccess |
+| Test.java:7:12:7:14 | Unknown or erroneous type for expression of kind VarAccess |
 | file://:0:0:0:0 | 2 errors during annotation processing |
diff --git a/java/ql/test/library-tests/errortype/Test.java b/java/ql/test/library-tests/errortype/Test.java
@@ -14,3 +14,4 @@ public NoSuchClass test() {
 // Diagnostic Matches: 2 errors during annotation processing
 // Diagnostic Matches: Unknown or erroneous type for expression of kind TypeAccess
 // Diagnostic Matches: Unknown or erroneous type for expression of kind ClassInstanceCreation
+// Diagnostic Matches: Unknown or erroneous type for expression of kind VarAccess
diff --git a/rust/ql/integration-tests/hello-project/summary.expected b/rust/ql/integration-tests/hello-project/summary.expected
@@ -14,7 +14,7 @@
 | Macro calls - resolved | 2 |
 | Macro calls - total | 2 |
 | Macro calls - unresolved | 0 |
-| Taint edges - number of edges | 1471 |
+| Taint edges - number of edges | 1670 |
 | Taint reach - nodes tainted | 0 |
 | Taint reach - per million nodes | 0 |
 | Taint sinks - cryptographic operations | 0 |

diff --git a/rust/ql/integration-tests/hello-workspace/summary.cargo.expected b/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
@@ -14,7 +14,7 @@
 | Macro calls - resolved | 2 |
 | Macro calls - total | 2 |
 | Macro calls - unresolved | 0 |
-| Taint edges - number of edges | 1471 |
+| Taint edges - number of edges | 1670 |
 | Taint reach - nodes tainted | 0 |
 | Taint reach - per million nodes | 0 |
 | Taint sinks - cryptographic operations | 0 |

diff --git a/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected b/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
@@ -14,7 +14,7 @@
 | Macro calls - resolved | 2 |
 | Macro calls - total | 2 |
 | Macro calls - unresolved | 0 |
-| Taint edges - number of edges | 1471 |
+| Taint edges - number of edges | 1670 |
 | Taint reach - nodes tainted | 0 |
 | Taint reach - per million nodes | 0 |
 | Taint sinks - cryptographic operations | 0 |

diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/lang-core.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/lang-core.model.yml
@@ -19,6 +19,13 @@ extensions:
       - ["lang:core", "<crate::slice::iter::Iter as crate::iter::traits::iterator::Iterator>::collect", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
       - ["lang:core", "<crate::slice::iter::Iter as crate::iter::traits::iterator::Iterator>::map", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
       - ["lang:core", "<crate::slice::iter::Iter as crate::iter::traits::iterator::Iterator>::for_each", "Argument[self].Element", "Argument[0].Parameter[0]", "value", "manual"]
+      # ptr
+      - ["lang:core", "crate::ptr::read", "Argument[0].Reference", "ReturnValue", "value", "manual"]
+      - ["lang:core", "crate::ptr::read_unaligned", "Argument[0].Reference", "ReturnValue", "value", "manual"]
+      - ["lang:core", "crate::ptr::read_volatile", "Argument[0].Reference", "ReturnValue", "value", "manual"]
+      - ["lang:core", "crate::ptr::write", "Argument[1]", "Argument[0].Reference", "value", "manual"]
+      - ["lang:core", "crate::ptr::write_unaligned", "Argument[1]", "Argument[0].Reference", "value", "manual"]
+      - ["lang:core", "crate::ptr::write_volatile", "Argument[1]", "Argument[0].Reference", "value", "manual"]
       # Str
       - ["lang:core", "<str>::parse", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "taint", "manual"]
       # String