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%2FAAFCon.java;h=98303092a9db2c0af787596d82669014b7b8b7d4;hb=HEAD;hp=3b97883b4f3694b1238313ce93ead4d58917def5;hpb=701e71853ec8c52eef0fa2f3ff4deaef788cabd4;p=aaf%2Fauthz.git diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java index 3b97883b..98303092 100644 --- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.java +++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFCon.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. @@ -23,6 +23,7 @@ package org.onap.aaf.cadi.aaf.v2_0; import java.net.URI; import java.net.UnknownHostException; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -134,12 +135,12 @@ public abstract class AAFCon implements Connector { si.defSS=x509Alias(alias); set(si.defSS); } else { - + String encpass = access.getProperty(Config.AAF_APPPASS, null); if (encpass==null) { encpass = access.getProperty(Config.OAUTH_CLIENT_SECRET,null); } - + if (encpass==null) { if (alias==null) { access.printf(Access.Level.WARN,"%s, %s or %s required before use.", Config.CADI_ALIAS, Config.AAF_APPID, Config.OAUTH_CLIENT_ID); @@ -151,17 +152,17 @@ public abstract class AAFCon implements Connector { set(si.defSS); } else { si.defSS=new SecuritySetter() { - + @Override public String getID() { return ""; } - + @Override public void setSecurity(CLIENT client) throws CadiException { throw new CadiException("AAFCon has not been initialized with Credentials (SecuritySetter)"); } - + @Override public int setLastResponse(int respCode) { return 0; @@ -172,18 +173,17 @@ public abstract class AAFCon implements Connector { } } } - + timeout = Integer.parseInt(access.getProperty(Config.AAF_CALL_TIMEOUT, Config.AAF_CALL_TIMEOUT_DEF)); cleanInterval = Integer.parseInt(access.getProperty(Config.AAF_CLEAN_INTERVAL, Config.AAF_CLEAN_INTERVAL_DEF)); highCount = Integer.parseInt(access.getProperty(Config.AAF_HIGH_COUNT, Config.AAF_HIGH_COUNT_DEF).trim()); connTimeout = Integer.parseInt(access.getProperty(Config.AAF_CONN_TIMEOUT, Config.AAF_CONN_TIMEOUT_DEF).trim()); userExpires = Integer.parseInt(access.getProperty(Config.AAF_USER_EXPIRES, Config.AAF_USER_EXPIRES_DEF).trim()); usageRefreshTriggerCount = Integer.parseInt(access.getProperty(Config.AAF_USER_EXPIRES, Config.AAF_USER_EXPIRES_DEF).trim())-1; // zero based - + app=FQI.reverseDomain(si.defSS.getID()); - //TODO Get Realm from AAF - realm="people.osaaf.org"; - + realm = access.getProperty(Config.AAF_DEFAULT_REALM, Config.getDefaultRealm()); + env = new RosettaEnv(); permsDF = env.newDataFactory(Perms.class); usersDF = env.newDataFactory(Users.class); @@ -201,22 +201,22 @@ public abstract class AAFCon implements Connector { public final String aafVersion() { return apiVersion; } - + /** * Use this call to get the appropriate client based on configuration (HTTP, future) * using default AAF API Version - * + * * @param apiVersion * @return * @throws CadiException */ public Rcli client() throws CadiException { return client(apiVersion); - } + } /** * Use this call to get the appropriate client based on configuration (HTTP, future) - * + * * @param apiVersion * @return * @throws CadiException @@ -228,19 +228,19 @@ public abstract class AAFCon implements Connector { client.apiVersion(apiVersion) .readTimeout(connTimeout); clients.put(apiVersion, client); - } + } return client; } public Rcli client(URI uri) throws CadiException { return rclient(uri,si.defSS).readTimeout(connTimeout); } - + /** * Use this API when you have permission to have your call act as the end client's ID. - * + * * Your calls will get 403 errors if you do not have this permission. it is a special setup, rarely given. - * + * * @param apiVersion * @param req * @return @@ -249,12 +249,12 @@ public abstract class AAFCon implements Connector { public Rcli clientAs(TaggedPrincipal p) throws CadiException { return clientAs(apiVersion,p); } - + /** * Use this API when you have permission to have your call act as the end client's ID. - * + * * Your calls will get 403 errors if you do not have this permission. it is a special setup, rarely given. - * + * * @param apiVersion * @param req * @return @@ -265,14 +265,32 @@ public abstract class AAFCon implements Connector { return cl.forUser(transferSS(p)); } - + + /** + * Use this call to get the appropriate client based on configuration (HTTP, future), + * ignoring those already attempted, using the default api version + * + * @param attemptedClients + * @return + * @throws CadiException + */ + public Rcli clientIgnoreAlreadyAttempted(List attemptedClients) throws CadiException { + Rcli client = rclient(attemptedClients, si.defSS); + client.apiVersion(apiVersion) + .readTimeout(connTimeout); + clients.put(apiVersion, client); + + return client; + } + + public RosettaEnv env() { return env; } - + /** * Return the backing AAFCon, if there is a Lur Setup that is AAF. - * + * * If there is no AAFLur setup, it will return "null" * @param servletRequest * @return @@ -295,9 +313,9 @@ public abstract class AAFCon implements Connector { } return null; } - + public abstract AAFCon clone(String url) throws CadiException, LocatorException; - + public AAFAuthn newAuthn() throws APIException { try { return new AAFAuthn<>(this); @@ -324,7 +342,7 @@ public abstract class AAFCon implements Connector { throw new CadiException(e); } } - + public AAFLurPerm newLur(AbsUserCache c) throws APIException { try { return new AAFLurPerm(this,c); @@ -336,33 +354,35 @@ public abstract class AAFCon implements Connector { } protected abstract Rcli rclient(URI uri, SecuritySetter ss) throws CadiException; - + + protected abstract Rcli rclient(List uris, SecuritySetter ss) throws CadiException; + public abstract Rcli rclient(Locator loc, SecuritySetter ss) throws CadiException; public Rcli client(Locator locator) throws CadiException { return rclient(locator,si.defSS); } - + public abstract RET best(Retryable retryable) throws LocatorException, CadiException, APIException; public abstract RET bestForUser(GetSetter get, Retryable retryable) throws LocatorException, CadiException, APIException; public abstract SecuritySetter basicAuth(String user, String password) throws CadiException; - + public abstract SecuritySetter transferSS(TaggedPrincipal principal) throws CadiException; - + public abstract SecuritySetter basicAuthSS(BasicPrincipal principal) throws CadiException; - + public abstract SecuritySetter tokenSS(final String client_id, final String accessToken) throws CadiException; - + public abstract SecuritySetter x509Alias(String alias) throws APIException, CadiException; - + public String getRealm() { return realm; } - + /** * This interface allows the AAFCon, even though generic, to pass in correctly typed values based on the above SS commands. * @author Jonathan @@ -379,7 +399,7 @@ public abstract class AAFCon implements Connector { } return ss; } - + public SecurityInfoC securityInfo() { return si; } @@ -390,7 +410,7 @@ public abstract class AAFCon implements Connector { } return "unknown"; } - + public void invalidate() throws CadiException { for (Rcli client : clients.values()) { client.invalidate(); @@ -412,7 +432,7 @@ public abstract class AAFCon implements Connector { } return text; } - + public static AAFCon newInstance(PropAccess pa) throws CadiException, LocatorException { // Potentially add plugin for other kinds of Access return new AAFConHttp(pa);