X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Faaf%2Fv2_0%2FAAFTrustChecker.java;h=e912fc53a542f8f4d961f04b2fe9576820f97efd;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=db6ae9630b75cbfec00d1589b0ecb5d9d88d3a7d;hpb=4b5a7d721d994a49057e9bfb403c7bff1b376660;p=aaf%2Fauthz.git diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java index db6ae963..e912fc53 100644 --- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java +++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFTrustChecker.java @@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRequest ; import org.onap.aaf.cadi.Access; import org.onap.aaf.cadi.Lur; import org.onap.aaf.cadi.TrustChecker; +import org.onap.aaf.cadi.Access.Level; import org.onap.aaf.cadi.aaf.AAFPermission; import org.onap.aaf.cadi.config.Config; import org.onap.aaf.cadi.principal.TrustPrincipal; @@ -53,7 +54,7 @@ public class AAFTrustChecker implements TrustChecker { id = env.getProperty(Config.CADI_ALIAS,env.getProperty(Config.AAF_APPID)); // share between components String str = env.getProperty(Config.CADI_TRUST_PERM); AAFPermission temp=null; - if(str!=null) { + if (str!=null) { String[] sp = Split.splitTrim('|', str); switch(sp.length) { case 3: @@ -72,7 +73,7 @@ public class AAFTrustChecker implements TrustChecker { id = access.getProperty(Config.CADI_ALIAS,access.getProperty(Config.AAF_APPID,null)); // share between components String str = access.getProperty(Config.CADI_TRUST_PERM,null); AAFPermission temp=null; - if(str!=null) { + if (str!=null) { String[] sp = Split.splitTrim('|', str); switch(sp.length) { case 3: @@ -101,6 +102,8 @@ public class AAFTrustChecker implements TrustChecker { return tresp; } + tresp.getAccess().log(Level.DEBUG, user_info); + String[] info = Split.split(',', user_info); String[] flds = Split.splitTrim(':', info[0]); if (flds.length < 4) { @@ -111,11 +114,11 @@ public class AAFTrustChecker implements TrustChecker { } String principalName = tresp.getPrincipal().getName(); - if(principalName.equals(id) // We do trust our own App Components: if a trust entry is made with self, always accept + if (principalName.equals(id) // We do trust our own App Components: if a trust entry is made with self, always accept || lur.fish(tresp.getPrincipal(), perm)) { // Have Perm set by Config.CADI_TRUST_PERM String desc = " " + flds[0] + " validated using " + flds[2] + " by " + flds[1] + ','; return new TrustTafResp(tresp, new TrustPrincipal(tresp.getPrincipal(), flds[0]), desc); - } else if(principalName.equals(flds[0])) { // Ignore if same identity + } else if (principalName.equals(flds[0])) { // Ignore if same identity return tresp; } else { String desc = tresp.getPrincipal().getName() + " requested trust as " + flds[0] + ", but does not have Authorization";