minor fixes

albertzaharovits · Jun 11, 2024 · dbf21bb · dbf21bb
1 parent e587778
commit dbf21bb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...security/src/main/java/org/elasticsearch/xpack/security/support/FieldNameTranslators.java b/...security/src/main/java/org/elasticsearch/xpack/security/support/FieldNameTranslators.java
@@ -68,7 +68,7 @@ public final class FieldNameTranslators {
         )
     );
 
-    final List<FieldNameTranslator> fieldNameTranslators;
+    private final List<FieldNameTranslator> fieldNameTranslators;
 
     private FieldNameTranslators(List<FieldNameTranslator> fieldNameTranslators) {
         this.fieldNameTranslators = fieldNameTranslators;
@@ -315,6 +315,10 @@ public Set<String> translatePattern(String fieldNameOrPattern) {
         return indexFieldNames;
     }
 
+    public boolean isFieldAllowed(String fieldName) {
+        return fieldNameTranslators.stream().anyMatch(t -> t.supports(fieldName));
+    }
+
     private abstract static class FieldNameTranslator {
 
         private final Function<String, String> translationFunc;

diff --git a/...y/src/test/java/org/elasticsearch/xpack/security/support/ApiKeyBoolQueryBuilderTests.java b/...y/src/test/java/org/elasticsearch/xpack/security/support/ApiKeyBoolQueryBuilderTests.java
@@ -612,7 +612,7 @@ public void testAllowListOfFieldNames() {
         final Authentication authentication = randomBoolean() ? AuthenticationTests.randomAuthentication(null, null) : null;
 
         final String randomFieldName = randomValueOtherThanMany(
-            s -> API_KEY_FIELD_NAME_TRANSLATORS.fieldNameTranslators.stream().anyMatch(t -> t.supports(s)),
+            API_KEY_FIELD_NAME_TRANSLATORS::isFieldAllowed,
             () -> randomAlphaOfLengthBetween(3, 20)
         );
         final String fieldName = randomFrom(

diff --git a/...ity/src/test/java/org/elasticsearch/xpack/security/support/UserBoolQueryBuilderTests.java b/...ity/src/test/java/org/elasticsearch/xpack/security/support/UserBoolQueryBuilderTests.java
@@ -110,7 +110,7 @@ public void testAllowListOfFieldNames() {
     public void testTermsLookupIsNotAllowed() {
         final TermsQueryBuilder q1 = QueryBuilders.termsLookupQuery("roles", new TermsLookup("lookup", "1", "id"));
         final IllegalArgumentException e1 = expectThrows(IllegalArgumentException.class, () -> UserBoolQueryBuilder.build(q1));
-        assertThat(e1.getMessage(), containsString("Terms query with terms lookup is not supported for User query"));
+        assertThat(e1.getMessage(), containsString("terms query with terms lookup is not currently supported in this context"));
     }
 
     public void testDisallowedQueryTypes() {
@@ -155,7 +155,7 @@ public void testDisallowedQueryTypes() {
         );
 
         final IllegalArgumentException e1 = expectThrows(IllegalArgumentException.class, () -> UserBoolQueryBuilder.build(q1));
-        assertThat(e1.getMessage(), containsString("Query type [" + q1.getName() + "] is not supported for User query"));
+        assertThat(e1.getMessage(), containsString("Query type [" + q1.getName() + "] is not currently supported in this context"));
     }
 
     public void testWillSetAllowedFields() {