X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-certman%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcm%2FAAF_CM.java;h=cf912fa4254dd7e672b98a120106cfdd08537de5;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=7dea9f07aafecedd41a453309bfaff4aa77fe027;hpb=2c3cb70208785cf0272eae075206074318ca74cc;p=aaf%2Fauthz.git

diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java
index 7dea9f07..cf912fa4 100644
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/AAF_CM.java
@@ -40,6 +40,7 @@ import org.onap.aaf.auth.cm.facade.FacadeFactory;
 import org.onap.aaf.auth.cm.mapper.Mapper.API;
 import org.onap.aaf.auth.cm.service.CMService;
 import org.onap.aaf.auth.cm.service.Code;
+import org.onap.aaf.auth.cm.validation.CertmanValidator;
 import org.onap.aaf.auth.dao.CassAccess;
 import org.onap.aaf.auth.dao.cass.LocateDAO;
 import org.onap.aaf.auth.direct.DirectLocatorCreator;
@@ -72,6 +73,7 @@ import com.datastax.driver.core.Cluster;
 public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
 
     private static final String USER_PERMS = "userPerms";
+    private static final String CM_ALLOW_TMP = "cm_allow_tmp";
     private static final Map<String,CA> certAuths = new TreeMap<>();
     public static  Facade1_0 facade1_0; // this is the default Facade
     public static  Facade1_0 facade1_0_XML; // this is the XML Facade
@@ -85,7 +87,7 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
 
     //Added for junits
     public CMService getService() {
-    	return null;
+        return null;
     }
     /**
      * Construct AuthzAPI with all the Context Supporting Routes that Authz needs
@@ -106,6 +108,13 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
         if (aafEnv==null) {
             throw new APIException("aaf_env needs to be set");
         }
+        
+        // Check for allowing /tmp in Properties
+        String allowTmp = env.getProperty(CM_ALLOW_TMP);
+        if("true".equalsIgnoreCase(allowTmp)) {
+            CertmanValidator.allowTmp();
+        }
+
 
         // Initialize Facade for all uses
         AuthzTrans trans = env.newTrans();
@@ -141,10 +150,10 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
                         pinst[2]= aafEnv;
                         pinst[3] = multiParams; 
                         try {
-                        	CA ca = cons.newInstance(pinst);
+                            CA ca = cons.newInstance(pinst);
                             certAuths.put(ca.getName(),ca);
                         } catch (InvocationTargetException e) {
-                    		access.log(e, "Loading", segs[0]);
+                            access.log(e, "Loading", segs[0]);
                         }
                     }
                 }
@@ -156,7 +165,7 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
 
         service = getService();
         if(service == null) {
-        	service = new CMService(trans, this);
+            service = new CMService(trans, this);
         }
         // note: Service knows how to shutdown Cluster on Shutdown, etc.  See Constructor
         facade1_0 = FacadeFactory.v1_0(this,trans, service,Data.TYPE.JSON);   // Default Facade
@@ -245,14 +254,14 @@ public class AAF_CM extends AbsService<AuthzEnv, AuthzTrans> {
             Log4JLogIt logIt = new Log4JLogIt(args, "cm");
             PropAccess propAccess = new PropAccess(logIt,args);
             try {
-	            new JettyServiceStarter<AuthzEnv,AuthzTrans>(
-	            	new AAF_CM(new AuthzEnv(propAccess)),true)
-	            		.start();
-	        } catch (Exception e) {
-	            propAccess.log(e);
-	        }
+                new JettyServiceStarter<AuthzEnv,AuthzTrans>(
+                    new AAF_CM(new AuthzEnv(propAccess)),true)
+                        .start();
+            } catch (Exception e) {
+                propAccess.log(e);
+            }
         } catch (APIException e) {
-        	e.printStackTrace(System.err);
+            e.printStackTrace(System.err);
         }
     }
 }