浏览代码

SecurityRestFilter to delegate compatibleWith method (#67923)

SecurityRestFilter should delegate compatibleWith method calls to the
rest handler it wraps.
relates #51816
Przemyslaw Gomulka 4 年之前
父节点
当前提交
d641e6b40f

+ 6 - 0
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/rest/SecurityRestFilter.java

@@ -10,6 +10,7 @@ import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
 import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.common.util.Maps;
@@ -159,4 +160,9 @@ public class SecurityRestFilter implements RestHandler {
     public MediaTypeRegistry<? extends MediaType> validAcceptMediaTypes() {
         return restHandler.validAcceptMediaTypes();
     }
+
+    @Override
+    public Version compatibleWithVersion() {
+        return restHandler.compatibleWithVersion();
+    }
 }

+ 5 - 0
x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/rest/SecurityRestFilterTests.java

@@ -252,6 +252,11 @@ public class SecurityRestFilterTests extends ESTestCase {
         assertEquals("bar", map.get("foo"));
     }
 
+    public void testDelegationForCompatibleWithMethod() throws Exception {
+        filter.compatibleWithVersion();
+        verify(restHandler).compatibleWithVersion();
+    }
+
     private interface FilteredRestHandler extends RestHandler, RestRequestFilter {
     }
 }