diff --git a/docs/content/configuration/auth.md b/docs/content/configuration/auth.md index 6caf3aa6a66a..296d9ba2b1e8 100644 --- a/docs/content/configuration/auth.md +++ b/docs/content/configuration/auth.md @@ -10,7 +10,6 @@ layout: doc_page |`druid.escalator.type`|String|Type of the Escalator that should be used for internal Druid communications. This Escalator must use an authentication scheme that is supported by an Authenticator in `druid.auth.authenticationChain`.|"noop"|no| |`druid.auth.authorizers`|JSON List of Strings|List of Authorizer type names |["allowAll"]|no| |`druid.auth.unsecuredPaths`| List of Strings|List of paths for which security checks will not be performed. All requests to these paths will be allowed.|[]|no| -|`druid.auth.disableHttpOptionsAuthentication`|Boolean|If true, skip authentication checks for HTTP OPTIONS requests. Note that disabling authentication checks for OPTIONS requests will allow unauthenticated users to determine what Druid endpoints are valid, and this may leak sensitive information (for example, the `/druid/indexer/v1//task/{taskid}` endpoint on the Overlord and `/druid/coordinator/v1/datasources` endpoints on the Coordinator contain resource names), so the authentication checks should not be disabled unless truly necessary. |false|no| ## Enabling Authentication/Authorization diff --git a/integration-tests/src/test/java/io/druid/tests/security/ITBasicAuthConfigurationTest.java b/integration-tests/src/test/java/io/druid/tests/security/ITBasicAuthConfigurationTest.java index c1758967cdd1..17c87efa0fd2 100644 --- a/integration-tests/src/test/java/io/druid/tests/security/ITBasicAuthConfigurationTest.java +++ b/integration-tests/src/test/java/io/druid/tests/security/ITBasicAuthConfigurationTest.java @@ -224,18 +224,6 @@ public void testAuthConfiguration() throws Exception LOG.info("Testing Avatica query on router with incorrect credentials."); testAvaticaAuthFailure(routerUrl); - - LOG.info("Checking OPTIONS requests on services..."); - testOptionsRequests(adminClient); - } - - private void testOptionsRequests(HttpClient httpClient) - { - makeRequest(httpClient, HttpMethod.OPTIONS, config.getCoordinatorUrl() + "/status", null); - makeRequest(httpClient, HttpMethod.OPTIONS, config.getIndexerUrl() + "/status", null); - makeRequest(httpClient, HttpMethod.OPTIONS, config.getBrokerUrl() + "/status", null); - makeRequest(httpClient, HttpMethod.OPTIONS, config.getHistoricalUrl() + "/status", null); - makeRequest(httpClient, HttpMethod.OPTIONS, config.getRouterUrl() + "/status", null); } private void checkUnsecuredCoordinatorLoadQueuePath(HttpClient client) diff --git a/server/src/main/java/io/druid/server/security/AllowOptionsResourceFilter.java b/server/src/main/java/io/druid/server/security/AllowOptionsResourceFilter.java deleted file mode 100644 index d3960b313b2b..000000000000 --- a/server/src/main/java/io/druid/server/security/AllowOptionsResourceFilter.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to Metamarkets Group Inc. (Metamarkets) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. Metamarkets licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package io.druid.server.security; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.HttpMethod; -import java.io.IOException; - -public class AllowOptionsResourceFilter implements Filter -{ - private final boolean disableAuthentication; - - public AllowOptionsResourceFilter( - boolean disableAuthentication - ) - { - this.disableAuthentication = disableAuthentication; - } - - @Override - public void init(FilterConfig filterConfig) throws ServletException - { - - } - - @Override - public void doFilter( - ServletRequest request, ServletResponse response, FilterChain chain - ) throws IOException, ServletException - { - HttpServletRequest httpReq = (HttpServletRequest) request; - - // Druid itself doesn't explictly handle OPTIONS requests, no resource handler will authorize such requests. - // so this filter catches all OPTIONS requests and authorizes them. - if (HttpMethod.OPTIONS.equals(httpReq.getMethod())) { - if (disableAuthentication) { - httpReq.setAttribute( - AuthConfig.DRUID_AUTHENTICATION_RESULT, - new AuthenticationResult(AuthConfig.ALLOW_ALL_NAME, AuthConfig.ALLOW_ALL_NAME, null) - ); - } - - httpReq.setAttribute(AuthConfig.DRUID_AUTHORIZATION_CHECKED, true); - } - - chain.doFilter(request, response); - } - - @Override - public void destroy() - { - - } -} diff --git a/server/src/main/java/io/druid/server/security/AuthConfig.java b/server/src/main/java/io/druid/server/security/AuthConfig.java index 1c9d16dde0f8..95f67c9ee0fc 100644 --- a/server/src/main/java/io/druid/server/security/AuthConfig.java +++ b/server/src/main/java/io/druid/server/security/AuthConfig.java @@ -44,23 +44,19 @@ public class AuthConfig public AuthConfig() { - this(null, null, null, null); + this(null, null, null); } @JsonCreator public AuthConfig( @JsonProperty("authenticatorChain") List authenticationChain, @JsonProperty("authorizers") List authorizers, - @JsonProperty("unsecuredPaths") List unsecuredPaths, - @JsonProperty("disableHttpOptionsAuthentication") Boolean disableHttpOptionsAuthentication + @JsonProperty("unsecuredPaths") List unsecuredPaths ) { this.authenticatorChain = authenticationChain; this.authorizers = authorizers; this.unsecuredPaths = unsecuredPaths == null ? Collections.emptyList() : unsecuredPaths; - this.disableHttpOptionsAuthentication = disableHttpOptionsAuthentication == null - ? false - : disableHttpOptionsAuthentication; } @JsonProperty @@ -72,9 +68,6 @@ public AuthConfig( @JsonProperty private final List unsecuredPaths; - @JsonProperty - private final boolean disableHttpOptionsAuthentication; - public List getAuthenticatorChain() { return authenticatorChain; @@ -90,9 +83,14 @@ public List getUnsecuredPaths() return unsecuredPaths; } - public boolean isDisableHttpOptionsAuthentication() + @Override + public String toString() { - return disableHttpOptionsAuthentication; + return "AuthConfig{" + + "authenticatorChain='" + authenticatorChain + '\'' + + ", authorizers='" + authorizers + '\'' + + ", unsecuredPaths='" + unsecuredPaths + '\'' + + '}'; } @Override @@ -105,31 +103,14 @@ public boolean equals(Object o) return false; } AuthConfig that = (AuthConfig) o; - return isDisableHttpOptionsAuthentication() == that.isDisableHttpOptionsAuthentication() && - Objects.equals(getAuthenticatorChain(), that.getAuthenticatorChain()) && - Objects.equals(getAuthorizers(), that.getAuthorizers()) && - Objects.equals(getUnsecuredPaths(), that.getUnsecuredPaths()); + return Objects.equals(authenticatorChain, that.authenticatorChain) && + Objects.equals(authorizers, that.authorizers) && + Objects.equals(unsecuredPaths, that.unsecuredPaths); } @Override public int hashCode() { - return Objects.hash( - getAuthenticatorChain(), - getAuthorizers(), - getUnsecuredPaths(), - isDisableHttpOptionsAuthentication() - ); - } - - @Override - public String toString() - { - return "AuthConfig{" + - "authenticatorChain=" + authenticatorChain + - ", authorizers=" + authorizers + - ", unsecuredPaths=" + unsecuredPaths + - ", disableHttpOptionsAuthentication=" + disableHttpOptionsAuthentication + - '}'; + return Objects.hash(authenticatorChain, authorizers, unsecuredPaths); } } diff --git a/server/src/main/java/io/druid/server/security/AuthenticationUtils.java b/server/src/main/java/io/druid/server/security/AuthenticationUtils.java index fa8de6abd3a8..cabaa828274c 100644 --- a/server/src/main/java/io/druid/server/security/AuthenticationUtils.java +++ b/server/src/main/java/io/druid/server/security/AuthenticationUtils.java @@ -27,16 +27,6 @@ public class AuthenticationUtils { - public static void addAllowOptionsFilter(ServletContextHandler root, boolean disableHttpOptionsAuthentication) - { - FilterHolder holder = new FilterHolder(new AllowOptionsResourceFilter(disableHttpOptionsAuthentication)); - root.addFilter( - holder, - "/*", - null - ); - } - public static void addAuthenticationFilterChain( ServletContextHandler root, List authenticators diff --git a/services/src/main/java/io/druid/cli/CliOverlord.java b/services/src/main/java/io/druid/cli/CliOverlord.java index a40f5fcc6e49..33f842c2e4e6 100644 --- a/services/src/main/java/io/druid/cli/CliOverlord.java +++ b/services/src/main/java/io/druid/cli/CliOverlord.java @@ -344,8 +344,6 @@ public void initialize(Server server, Injector injector) AuthenticationUtils.addNoopAuthorizationFilters(root, UNSECURED_PATHS); AuthenticationUtils.addNoopAuthorizationFilters(root, authConfig.getUnsecuredPaths()); - AuthenticationUtils.addAllowOptionsFilter(root, authConfig.isDisableHttpOptionsAuthentication()); - authenticators = authenticatorMapper.getAuthenticatorChain(); AuthenticationUtils.addAuthenticationFilterChain(root, authenticators); diff --git a/services/src/main/java/io/druid/cli/CoordinatorJettyServerInitializer.java b/services/src/main/java/io/druid/cli/CoordinatorJettyServerInitializer.java index f165d3af6c3a..c9bc725e5e95 100644 --- a/services/src/main/java/io/druid/cli/CoordinatorJettyServerInitializer.java +++ b/services/src/main/java/io/druid/cli/CoordinatorJettyServerInitializer.java @@ -125,13 +125,12 @@ public void initialize(Server server, Injector injector) AuthenticationUtils.addNoopAuthorizationFilters(root, CliOverlord.UNSECURED_PATHS); } - AuthenticationUtils.addAllowOptionsFilter(root, authConfig.isDisableHttpOptionsAuthentication()); - authenticators = authenticatorMapper.getAuthenticatorChain(); AuthenticationUtils.addAuthenticationFilterChain(root, authenticators); JettyServerInitUtils.addExtensionFilters(root, injector); + // Check that requests were authorized before sending responses AuthenticationUtils.addPreResponseAuthorizationCheckFilter( root, diff --git a/services/src/main/java/io/druid/cli/MiddleManagerJettyServerInitializer.java b/services/src/main/java/io/druid/cli/MiddleManagerJettyServerInitializer.java index 16c79a5a067c..9408acc588bf 100644 --- a/services/src/main/java/io/druid/cli/MiddleManagerJettyServerInitializer.java +++ b/services/src/main/java/io/druid/cli/MiddleManagerJettyServerInitializer.java @@ -78,11 +78,10 @@ public void initialize(Server server, Injector injector) AuthenticationUtils.addNoopAuthorizationFilters(root, UNSECURED_PATHS); AuthenticationUtils.addNoopAuthorizationFilters(root, authConfig.getUnsecuredPaths()); - AuthenticationUtils.addAllowOptionsFilter(root, authConfig.isDisableHttpOptionsAuthentication()); - authenticators = authenticatorMapper.getAuthenticatorChain(); AuthenticationUtils.addAuthenticationFilterChain(root, authenticators); + JettyServerInitUtils.addExtensionFilters(root, injector); // Check that requests were authorized before sending responses diff --git a/services/src/main/java/io/druid/cli/QueryJettyServerInitializer.java b/services/src/main/java/io/druid/cli/QueryJettyServerInitializer.java index dd97a911eedc..b079041b2ad9 100644 --- a/services/src/main/java/io/druid/cli/QueryJettyServerInitializer.java +++ b/services/src/main/java/io/druid/cli/QueryJettyServerInitializer.java @@ -102,8 +102,6 @@ public void initialize(Server server, Injector injector) AuthenticationUtils.addNoopAuthorizationFilters(root, UNSECURED_PATHS); AuthenticationUtils.addNoopAuthorizationFilters(root, authConfig.getUnsecuredPaths()); - AuthenticationUtils.addAllowOptionsFilter(root, authConfig.isDisableHttpOptionsAuthentication()); - authenticators = authenticatorMapper.getAuthenticatorChain(); AuthenticationUtils.addAuthenticationFilterChain(root, authenticators); diff --git a/services/src/main/java/io/druid/cli/RouterJettyServerInitializer.java b/services/src/main/java/io/druid/cli/RouterJettyServerInitializer.java index c8c6a7003bbd..ec0ca471dfef 100644 --- a/services/src/main/java/io/druid/cli/RouterJettyServerInitializer.java +++ b/services/src/main/java/io/druid/cli/RouterJettyServerInitializer.java @@ -111,8 +111,6 @@ public void initialize(Server server, Injector injector) AuthenticationUtils.addNoopAuthorizationFilters(root, UNSECURED_PATHS); AuthenticationUtils.addNoopAuthorizationFilters(root, authConfig.getUnsecuredPaths()); - AuthenticationUtils.addAllowOptionsFilter(root, authConfig.isDisableHttpOptionsAuthentication()); - final List authenticators = authenticatorMapper.getAuthenticatorChain(); AuthenticationUtils.addAuthenticationFilterChain(root, authenticators);