X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fdirect%2FDirectAAFLur.java;h=b25e205414b9bcefbe9bb2b523e380ec7aa495c3;hb=d1afbb8d807ea244920f37fdda4a9461c64d8773;hp=596139619cd772e4eef30479f46df59a2dc54986;hpb=7e966914050e66219689001ff4ab601a49eef0ac;p=aaf%2Fauthz.git diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLur.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLur.java index 59613961..b25e2054 100644 --- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLur.java +++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLur.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -44,18 +44,17 @@ import org.onap.aaf.misc.env.util.Split; public class DirectAAFLur implements Lur { private final AuthzEnv env; private final Question question; - + public DirectAAFLur(AuthzEnv env, Question question/*, TokenMgr tm*/) { this.env = env; - this.question = question; -// oauth = new OAuth2Lur(null); + this.question = question } @Override public boolean fish(Principal bait, Permission ... pond) { return fish(env.newTransNoAvg(),bait,pond); } - + public boolean fish(AuthzTrans trans, Principal bait, Permission ... pond) { boolean rv = false; Result> pdr = question.getPermsByUser(trans, bait.getName(),false); @@ -94,7 +93,7 @@ public class DirectAAFLur implements Lur { env.error().log("Can't access Cassandra to fulfill Permission Query: ",pdr.status,"-", pdr.details); } } - + @Override public void destroy() { } @@ -103,7 +102,7 @@ public class DirectAAFLur implements Lur { public boolean handlesExclusively(Permission ... pond) { return false; } - + /** * Small Class implementing CADI's Permission with Cassandra Data * @author Jonathan @@ -111,15 +110,15 @@ public class DirectAAFLur implements Lur { */ public static class PermPermission implements Permission { private PermDAO.Data data; - + public PermPermission(PermDAO.Data d) { data = d; } - + public PermPermission(AuthzTrans trans, Question q, String p) { data = PermDAO.Data.create(trans, q, p); } - + public PermPermission(String ns, String type, String instance, String action) { data = new PermDAO.Data(); data.ns = ns; @@ -148,7 +147,9 @@ public class DirectAAFLur implements Lur { return true; } else{ String[] lp = p.getKey().split("\\|"); - if (lp.length<3)return false; + if (lp.length<3) { + return false; + } if (data.fullType().equals(lp[0])) if (data.instance!=null && (data.instance.equals(lp[1]) || "*".equals(data.instance))) if (data.action!=null && (data.action.equals(lp[2]) || "*".equals(data.action))) @@ -161,12 +162,12 @@ public class DirectAAFLur implements Lur { public String permType() { return "AAFLUR"; } - + } - + public String toString() { return "DirectAAFLur is enabled"; - + } /* (non-Javadoc)