Fix testing results for Authn

[aaf/authz.git] / cadi / core / src / main / java / org / onap / aaf / cadi / config / Config.java

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
index b74ccb3..b4e31f2 100644 (file)
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java
@@ -259,7 +259,7 @@ public class Config {
                
                access.log(Level.INIT, "Hostname set to",hostname);
                // Get appropriate TAFs
-               ArrayList<HttpTaf> htlist = new ArrayList<HttpTaf>();
+               ArrayList<HttpTaf> htlist = new ArrayList<>();
 
                /////////////////////////////////////////////////////
                // Add a Denial of Service TAF
@@ -474,6 +474,14 @@ public class Config {
                        }
                }
                
+               // Add BasicAuth, if any, to x509Taf
+               if(x509TAF!=null) {
+                       for( HttpTaf ht : htlist) {
+                               if(ht instanceof BasicHttpTaf) {
+                                       x509TAF.add((BasicHttpTaf)ht);
+                               }
+                       }
+               }
                /////////////////////////////////////////////////////
                // Create EpiTaf from configured TAFs
                /////////////////////////////////////////////////////
@@ -507,7 +515,7 @@ public class Config {
        
        public static Lur configLur(SecurityInfoC<HttpURLConnection> si, Connector con, Object ... additionalTafLurs) throws CadiException {
                Access access = si.access;
-               List<Lur> lurs = new ArrayList<Lur>();
+               List<Lur> lurs = new ArrayList<>();
                
                /////////////////////////////////////////////////////
                // Configure a Local Property Based RBAC/LUR
@@ -671,7 +679,7 @@ public class Config {
                                        aafConClass = loadClass(access, AAF_V2_0_AAF_CON_HTTP);
                                        if (aafConClass != null) {
                                                for (Constructor<?> c : aafConClass.getConstructors()) {
-                                                       List<Object> lo = new ArrayList<Object>();
+                                                       List<Object> lo = new ArrayList<>();
                                                        for (Class<?> pc : c.getParameterTypes()) {
                                                                if (pc.equals(Access.class)) {
                                                                        lo.add(access);