Update DlsFlsFilterLeafReader to reflect Apache Lucene 10 APIs changes

Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Feb 23, 2025 · 0f0a5bf · 0f0a5bf
1 parent b20a09b
commit 0f0a5bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/org/opensearch/security/configuration/DlsFlsFilterLeafReader.java b/src/main/java/org/opensearch/security/configuration/DlsFlsFilterLeafReader.java
@@ -74,7 +74,6 @@
 
 class DlsFlsFilterLeafReader extends SequentialStoredFieldsLeafReader {
 
-    private static final String KEYWORD = ".keyword";
     private final FieldInfos flsFieldInfos;
     private final IndexService indexService;
     private final ThreadContext threadContext;
@@ -822,6 +821,11 @@ public void seekExact(long ord) throws IOException {
         public long ord() throws IOException {
             throw new UnsupportedOperationException();
         }
+
+        @Override
+        public IOBooleanSupplier prepareSeekExact(BytesRef text) throws IOException {
+            return isAllowed(text) ? in.prepareSeekExact(text) : () -> false;
+        }
     }
 
     private final class FilteredTerms extends FilterTerms {

diff --git a/src/test/java/org/opensearch/security/dlic/dlsfls/FlsExistsFieldsTest.java b/src/test/java/org/opensearch/security/dlic/dlsfls/FlsExistsFieldsTest.java
@@ -38,11 +38,11 @@ protected void populateData(Client tc) {
                     "@timestamp",
                     "type=date",
                     "host",
-                    "type=text,doc_values=false,norms=true",
+                    "type=text,norms=false",
                     "response",
-                    "type=text,doc_values=false,norms=true",
+                    "type=text,norms=false",
                     "non-existing",
-                    "type=text,doc_values=false,norms=true"
+                    "type=text,norms=false"
                 )
             )
             .actionGet();