serve web-console even if router management proxy is not enabled (#8797)

This commit is contained in:
Clint Wylie 2019-10-31 21:15:40 -07:00 committed by Vadim Ogievetsky
parent 16aaf7227e
commit 49bd16766f
1 changed files with 2 additions and 6 deletions

View File

@ -129,9 +129,7 @@ public class RouterJettyServerInitializer implements JettyServerInitializer
root.addServlet(managementForwardingServletHolder, "/proxy/*"); root.addServlet(managementForwardingServletHolder, "/proxy/*");
} }
if (managementProxyConfig.isEnabled()) { root.setBaseResource(Resource.newClassPathResource("org/apache/druid/console"));
root.setBaseResource(Resource.newClassPathResource("org/apache/druid/console"));
}
final ObjectMapper jsonMapper = injector.getInstance(Key.get(ObjectMapper.class, Json.class)); final ObjectMapper jsonMapper = injector.getInstance(Key.get(ObjectMapper.class, Json.class));
final AuthenticatorMapper authenticatorMapper = injector.getInstance(AuthenticatorMapper.class); final AuthenticatorMapper authenticatorMapper = injector.getInstance(AuthenticatorMapper.class);
@ -140,9 +138,7 @@ public class RouterJettyServerInitializer implements JettyServerInitializer
// perform no-op authorization/authentication for these resources // perform no-op authorization/authentication for these resources
AuthenticationUtils.addNoopAuthenticationAndAuthorizationFilters(root, UNSECURED_PATHS); AuthenticationUtils.addNoopAuthenticationAndAuthorizationFilters(root, UNSECURED_PATHS);
if (managementProxyConfig.isEnabled()) { AuthenticationUtils.addNoopAuthenticationAndAuthorizationFilters(root, UNSECURED_PATHS_FOR_UI);
AuthenticationUtils.addNoopAuthenticationAndAuthorizationFilters(root, UNSECURED_PATHS_FOR_UI);
}
AuthenticationUtils.addNoopAuthenticationAndAuthorizationFilters(root, authConfig.getUnsecuredPaths()); AuthenticationUtils.addNoopAuthenticationAndAuthorizationFilters(root, authConfig.getUnsecuredPaths());
final List<Authenticator> authenticators = authenticatorMapper.getAuthenticatorChain(); final List<Authenticator> authenticators = authenticatorMapper.getAuthenticatorChain();