diff --git a/.build/owasp/dependency-check-suppressions.xml b/.build/owasp/dependency-check-suppressions.xml index 6defa63cbe..496dd3335a 100644 --- a/.build/owasp/dependency-check-suppressions.xml +++ b/.build/owasp/dependency-check-suppressions.xml @@ -43,4 +43,10 @@ CVE-2023-6378 CVE-2023-6481 + + + + ^pkg:maven/org\.apache\.lucene/lucene\-.*@9.7.0$ + CVE-2024-45772 + diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml index 0235ae6ea9..ee4dc0a66f 100644 --- a/.build/parent-pom-template.xml +++ b/.build/parent-pom-template.xml @@ -1219,12 +1219,12 @@ org.apache.lucene lucene-core - 9.7.0 + 9.12.0 org.apache.lucene lucene-analysis-common - 9.7.0 + 9.12.0 io.github.jbellis diff --git a/CHANGES.txt b/CHANGES.txt index f4e9d0f5fa..d81ffaebb0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -93,6 +93,7 @@ * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) Merged from 5.0: + * Suppress CVE-2024-45772, upgrade to lucene-core-9.12.0.jar (CASSANDRA-20024) * Use SinglePartitionReadCommand for index queries that use strict filtering (CASSANDRA-19968) * Always write local expiration time as an int to LivenessInfo digest (CASSANDRA-19989) * Enables IAuthenticator's to return own AuthenticateMessage (CASSANDRA-19984) diff --git a/src/java/org/apache/cassandra/index/sai/disk/io/SeekingRandomAccessInput.java b/src/java/org/apache/cassandra/index/sai/disk/io/SeekingRandomAccessInput.java index fcc5baed9d..077369d3e5 100644 --- a/src/java/org/apache/cassandra/index/sai/disk/io/SeekingRandomAccessInput.java +++ b/src/java/org/apache/cassandra/index/sai/disk/io/SeekingRandomAccessInput.java @@ -62,6 +62,12 @@ public class SeekingRandomAccessInput implements RandomAccessInput return in.readLong(); } + @Override + public long length() + { + throw new UnsupportedOperationException("calling length() on SeekingRandomAccessInput not supported"); + } + @Override public String toString() {