From 7f983422c4970efdf778b99318e346e5de0cd60f Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Fri, 26 Oct 2018 09:27:05 -0500 Subject: Enable Authorization AAF Filter programmatically The intent is to reduce configuration options and automatically set up the authorization filter (that will complement the authentication filter that the policy-endpoints common framework automatically provides). Previously to enable the AAF authorization filter, it will need the configuration had to kept track of AAF flag, and the "filterClasses" property configuration, make a bit more difficult to keep them sync, and easily turn on/off AAF. Change-Id: I3d59de6fa83986c5dcb6b3d38077278b8e75689a Issue-ID: POLICY-1216 Signed-off-by: Jorge Hernandez --- .../src/main/feature/config/feature-healthcheck.properties | 3 +-- .../src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'feature-healthcheck') diff --git a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties index e44543a8..eaecaa67 100644 --- a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties +++ b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties @@ -27,8 +27,7 @@ http.server.services.HEALTHCHECK.swagger=true http.server.services.HEALTHCHECK.userName=${{HEALTHCHECK_USER}} http.server.services.HEALTHCHECK.password=${{HEALTHCHECK_PASSWORD}} http.server.services.HEALTHCHECK.https=true -http.server.services.HEALTHCHECK.aaf=false -http.server.services.HEALTHCHECK.filterClasses= +http.server.services.HEALTHCHECK.aaf=${{AAF}} http.client.services=PAP,PDP diff --git a/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java index 36444f8e..6b5dcfb8 100644 --- a/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java +++ b/feature-healthcheck/src/main/java/org/onap/policy/drools/healthcheck/HealthCheck.java @@ -256,6 +256,9 @@ class HealthCheckMonitor implements HealthCheck { this.clients = getClientFactory().build(healthCheckProperties); for (HttpServletServer server : servers) { + if (server.isAaf()) { + server.addFilterClass(null, AafHealthCheckFilter.class.getCanonicalName()); + } startServer(server); } } catch (Exception e) { -- cgit 1.2.3-korg