X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fvalidation%2FValidator.java;h=c0f2f530c5cac305b44eeab5b3a653cdbb889bed;hp=7e861eda1c2a95f51a016372db8943eb176ce9f4;hb=ba989d05eca8d2a98c51ed9d38c4c3345db23349;hpb=e84b431dab21d38cd39119970b7d1fd82efa99f2

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/validation/Validator.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/validation/Validator.java
index 7e861eda..c0f2f530 100644
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/validation/Validator.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/validation/Validator.java
@@ -143,6 +143,21 @@ public class Validator {
         return this;
     }
 
+    public final Validator permTypeWithUser(String user, String type) {
+        if (type==null) {
+            msg("Perm Type is null");
+        } else if (user==null) {
+            msg("User is null");
+        } else {
+        	if(!(type.startsWith(user) && type.endsWith(":id"))) {
+        	  if(nob(type,NAME_CHARS)) {
+	            msg("Perm Type [" + type + "] is invalid.");
+        	  }
+        	}
+        }
+        return this;
+    }
+    
     public final Validator permType(String type, String ns) {
         if (type==null) {
             msg("Perm Type is null");
@@ -169,6 +184,26 @@ public class Validator {
         return this;
     }
 
+    public final Validator role(String user, String role) {
+    	if(role==null) {
+    		msg("Role is null");
+    	}
+    	if(user==null) {
+    		msg("User is null");    		
+    	}
+    	if(!err()) {
+    		if(role.startsWith(user) && role.endsWith(":user")) {
+    			if(!(role.length() == user.length() + 5)) {
+    	            msg("Role [" + role + "] is invalid.");
+    			}
+    		} else if (nob(role, NAME_CHARS)) {
+	            msg("Role [" + role + "] is invalid.");
+	        }
+    	}
+        return this;
+    }
+
+
     public final Validator role(String role) {
         if (nob(role, NAME_CHARS)) {
             msg("Role [" + role + "] is invalid.");