diff options
Diffstat (limited to 'policy-endpoints/src/main/java')
3 files changed, 30 insertions, 1 deletions
diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/HttpServletServer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/HttpServletServer.java index 1f008a8b..c4db9fbe 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/HttpServletServer.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/HttpServletServer.java @@ -50,6 +50,18 @@ public interface HttpServletServer extends Startable { void setBasicAuthentication(String user, String password, String relativeUriPath); /** + * Enables AAF based authentication. + * + * @param filterPath filter path + */ + void setAafAuthentication(String filterPath); + + /** + * Checks if AAF authentication has been enabled. + */ + boolean isAaf(); + + /** * Adds a filter at the specified path. * * @param filterPath filter path diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/HttpServletServerFactory.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/HttpServletServerFactory.java index 488512f9..4a33f568 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/HttpServletServerFactory.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/HttpServletServerFactory.java @@ -247,7 +247,7 @@ class IndexedHttpServletServerFactory implements HttpServletServerFactory { /* authentication method either AAF or HTTP Basic Auth */ if (aaf) { - service.addFilterClass(contextUriPath, CadiFilter.class.getCanonicalName()); + service.setAafAuthentication(contextUriPath); } else if (userName != null && !userName.isEmpty() && password != null && !password.isEmpty()) { service.setBasicAuthentication(userName, password, authUriPath); } diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java index ebac41ef..0c52aca8 100644 --- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java +++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/http/server/internal/JettyServletServer.java @@ -37,10 +37,12 @@ import org.eclipse.jetty.server.SecureRequestCustomizer; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.Slf4jRequestLog; +import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.util.security.Constraint; import org.eclipse.jetty.util.security.Credential; import org.eclipse.jetty.util.ssl.SslContextFactory; +import org.onap.aaf.cadi.filter.CadiFilter; import org.onap.policy.common.endpoints.http.server.HttpServletServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -234,6 +236,21 @@ public abstract class JettyServletServer implements HttpServletServer, Runnable } @Override + public void setAafAuthentication(String filterPath) { + this.addFilterClass(filterPath, CadiFilter.class.getCanonicalName()); + } + + @Override + public boolean isAaf() { + for (FilterHolder filter : context.getServletHandler().getFilters()) { + if (CadiFilter.class.getCanonicalName().equals(filter.getClassName())) { + return true; + } + } + return false; + } + + @Override public void setBasicAuthentication(String user, String password, String servletPath) { String srvltPath = servletPath; |