This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 2b191de8f9982317fc9bc1339374f02f16e620c8 Author: Alex Heneveld <[email protected]> AuthorDate: Tue Jan 15 14:16:12 2019 +0000 a few more cleanups --- .../rest/filter/BrooklynSecurityProviderFilterJavax.java | 7 ++++--- .../rest/filter/BrooklynSecurityProviderFilterJersey.java | 9 +++++---- .../apache/brooklyn/rest/filter/EntitlementContextFilter.java | 1 - .../brooklyn/rest/security/provider/AnyoneSecurityProvider.java | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/BrooklynSecurityProviderFilterJavax.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/BrooklynSecurityProviderFilterJavax.java index 2f448e2..eb26d8a 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/BrooklynSecurityProviderFilterJavax.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/BrooklynSecurityProviderFilterJavax.java @@ -48,7 +48,7 @@ public class BrooklynSecurityProviderFilterJavax implements Filter { @Override public void init(FilterConfig filterConfig) throws ServletException { // no init needed - log.debug("init"); + log.trace("BrooklynSecurityProviderFilterJavax.init"); } @Override @@ -56,7 +56,7 @@ public class BrooklynSecurityProviderFilterJavax implements Filter { throws IOException, ServletException { try { - log.debug("doFilter"); + log.trace("BrooklynSecurityProviderFilterJavax.doFilter {}", request); ManagementContext mgmt = new ManagementContextProvider(request.getServletContext()).getManagementContext(); Preconditions.checkNotNull(mgmt, "Brooklyn management context not available; cannot authenticate"); new BrooklynSecurityProviderFilterHelper().run((HttpServletRequest)request, mgmt); @@ -64,7 +64,7 @@ public class BrooklynSecurityProviderFilterJavax implements Filter { chain.doFilter(request, response); } catch (SecurityProviderDeniedAuthentication e) { - log.debug("doFilter catch SecurityProviderDeniedAuthentication {}",e); + log.trace("BrooklynSecurityProviderFilterJavax.doFilter caught SecurityProviderDeniedAuthentication", e); HttpServletResponse rout = ((HttpServletResponse)response); Response rin = e.getResponse(); if (rin==null) rin = Response.status(Status.UNAUTHORIZED).build(); @@ -85,6 +85,7 @@ public class BrooklynSecurityProviderFilterJavax implements Filter { @Override public void destroy() { // no clean-up needed + log.trace("BrooklynSecurityProviderFilterJavax.destroy"); } } \ No newline at end of file diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/BrooklynSecurityProviderFilterJersey.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/BrooklynSecurityProviderFilterJersey.java index c9dc0d8..d5d7cd2 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/BrooklynSecurityProviderFilterJersey.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/BrooklynSecurityProviderFilterJersey.java @@ -50,9 +50,10 @@ public class BrooklynSecurityProviderFilterJersey implements ContainerRequestFil @Context private ContextResolver<ManagementContext> mgmtC; + @SuppressWarnings("resource") @Override public void filter(ContainerRequestContext requestContext) throws IOException { - log.debug("filter"); + log.trace("BrooklynSecurityProviderFilterJersey.filter {}", requestContext); try { new BrooklynSecurityProviderFilterHelper().run(webRequest, mgmtC.getContext(ManagementContext.class)); } catch (SecurityProviderDeniedAuthentication e) { @@ -62,11 +63,11 @@ public class BrooklynSecurityProviderFilterJersey implements ContainerRequestFil if (rin.getStatus()==Status.FOUND.getStatusCode()) { String location = rin.getHeaderString(HttpHeader.LOCATION.asString()); if (location!=null) { - log.debug("Redirect to {} for authentication",location); + log.trace("Redirect to {} for authentication",location); final UriBuilder uriBuilder = UriBuilder.fromPath(location); - rin= Response.temporaryRedirect(uriBuilder.build()).entity("Authentication is required at "+location).build(); + rin = Response.temporaryRedirect(uriBuilder.build()).entity("Authentication is required at "+location).build(); } else { - log.debug("Unauthorized"); + log.trace("Unauthorized"); rin = Response.status(Status.UNAUTHORIZED).entity("Authentication is required").build(); } } diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/EntitlementContextFilter.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/EntitlementContextFilter.java index 58ba340..d2ce055 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/EntitlementContextFilter.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/EntitlementContextFilter.java @@ -29,7 +29,6 @@ import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.ContainerResponseContext; import javax.ws.rs.container.ContainerResponseFilter; import javax.ws.rs.core.Context; -import javax.ws.rs.core.Request; import javax.ws.rs.core.SecurityContext; import javax.ws.rs.ext.Provider; diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/provider/AnyoneSecurityProvider.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/provider/AnyoneSecurityProvider.java index 06e255a..b15ef3a 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/provider/AnyoneSecurityProvider.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/provider/AnyoneSecurityProvider.java @@ -32,7 +32,7 @@ public class AnyoneSecurityProvider implements SecurityProvider { @Override public boolean requiresUserPass() { // doesn't matter as isAuth always returns true, this should never be called - return true; + return false; } @Override
