From: Kenny Paul Date: Fri, 23 Apr 2021 20:49:43 +0000 (-0700) Subject: changed to unmaintained X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=HEAD;hp=55789c5859aff784f6b3cb45e17375c5be1c4cf3 changed to unmaintained Issue-ID: CIMAN-33 Signed-off-by: Kenny Paul Change-Id: I1ad834908c16091843c4c8fcdd2089e94c306568 --- diff --git a/INFO.yaml b/INFO.yaml index 74fedbc0..20fd8115 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -20,13 +20,13 @@ mailing_list: tag: '<[sub-project_name]>' realtime_discussion: '' meetings: - - type: 'zoom' - agenda: 'https://wiki.onap.org/display/DW/AAF+Meeting+Minutes' - url: 'https://wiki.onap.org/pages/viewpage.action?pageId=15302787' + - type: 'n/a' + agenda: 'n/a' + url: 'n/a' server: 'n/a' channel: 'n/a' - repeats: 'weekly' - time: '14:00 UTC' + repeats: 'n/a' + time: 'n/a' repositories: - 'aaf/authz' committers: diff --git a/auth-client/pom.xml b/auth-client/pom.xml index bb6043c4..f87f982f 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT aaf-auth-client diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index dfd6ef63..b8cd5efa 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index a82fbc7a..0be9d85a 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index cc825192..94c2a6de 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -20,7 +20,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 4ffd87bf..656d45af 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -18,7 +18,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 0c251bfb..3d3cedec 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 257db1d7..bd3af3a8 100644 --- a/auth/auth-deforg/pom.xml +++ b/auth/auth-deforg/pom.xml @@ -26,7 +26,7 @@ authparent ../pom.xml org.onap.aaf.authz - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index d5217ed4..21e820c0 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 1d7460b6..cb61fe0f 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index cfc94e11..856a316f 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index 0b89dd39..e30fc390 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index e234ea8c..19f6cfcc 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 45f89bfc..45cd601f 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml index ab99c702..8f7782e7 100644 --- a/auth/docker/pom.xml +++ b/auth/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/pom.xml b/auth/pom.xml index fbb050ea..16804d32 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT authparent AAF Auth Parent diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 8051ffa8..5077ddb9 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz cadiparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java index dbb9d5c9..e16782fa 100644 --- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java +++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java @@ -34,6 +34,7 @@ import org.onap.aaf.cadi.User; import org.onap.aaf.cadi.aaf.AAFPermission; import org.onap.aaf.cadi.client.Future; import org.onap.aaf.cadi.client.Rcli; +import org.onap.aaf.cadi.locator.SingleEndpointLocator; import org.onap.aaf.cadi.lur.ConfigPrincipal; import aaf.v2_0.CredRequest; @@ -108,7 +109,7 @@ public class AAFAuthn extends AbsUserCache { } } - AAFCachedPrincipal cp = new AAFCachedPrincipal(user, bytes, con.cleanInterval); + AAFCachedPrincipal cp = new AAFCachedPrincipal(user, bytes, con.userExpires); // Since I've relocated the Validation piece in the Principal, just revalidate, then do Switch // Statement switch(cp.revalidate(state)) { @@ -116,13 +117,13 @@ public class AAFAuthn extends AbsUserCache { if (usr!=null) { usr.principal = cp; } else { - addUser(new User(cp,con.timeout)); + addUser(new User(cp,con.userExpires)); } return null; case INACCESSIBLE: return "AAF Inaccessible"; case UNVALIDATED: - addUser(new User(user,bytes,con.timeout)); + addUser(new User(user,bytes,con.userExpires)); return "user/pass combo invalid for " + user; case DENIED: return "AAF denies API for " + user; @@ -143,10 +144,14 @@ public class AAFAuthn extends AbsUserCache { public Resp revalidate(Object state) { int maxRetries = 15; - try { // these SHOULD be AAFConHttp and AAFLocator objects, but put in a try anyway to be safe + try { // these SHOULD be an AAFConHttp and a AAFLocator or SingleEndpointLocator objects, but put in a try to be safe AAFConHttp forceCastCon = (AAFConHttp) con; - AAFLocator forceCastLoc = (AAFLocator) forceCastCon.hman().loc; - maxRetries = forceCastLoc.maxIters(); + if (forceCastCon.hman().loc instanceof SingleEndpointLocator) { + maxRetries = 1; // we cannot retry the single LGW gateway! + } else { + AAFLocator forceCastLoc = (AAFLocator) forceCastCon.hman().loc; + maxRetries = forceCastLoc.maxIters(); + } } catch (Exception e) { access.log(Access.Level.DEBUG, e); } @@ -156,20 +161,15 @@ public class AAFAuthn extends AbsUserCache { try { Miss missed = missed(getName(), getCred()); if (missed == null || missed.mayContinue()) { - CredRequest cr = new CredRequest(); - cr.setId(getName()); - cr.setPassword(new String(getCred())); - Rcli client = con.clientIgnoreAlreadyAttempted(attemptedUris); + Rcli client = con.clientIgnoreAlreadyAttempted(attemptedUris).forUser(con.basicAuth(getName(), new String(getCred()))); thisUri = client.getURI(); - Future fp = client.readPost("/authn/validate", con.credReqDF, cr); - //Rcli client = con.client().forUser(con.basicAuth(getName(), new String(getCred()))); - //Future fp = client.read( - // "/authn/basicAuth", - // "text/plain" - // ); + Future fp = client.read( + "/authn/basicAuth", + "text/plain" + ); if (fp.get(con.timeout)) { expires = System.currentTimeMillis() + timeToLive; - addUser(new User(this, expires)); + addUser(new User(this, timeToLive)); return Resp.REVALIDATED; } else { addMiss(getName(), getCred()); diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index b0a4492b..1ecc96ae 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ org.onap.aaf.authz cadiparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index eda4a394..1dc419aa 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ org.onap.aaf.authz cadiparent .. - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 0c4a7019..a9a2207f 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz cadiparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/cadi/pom.xml b/cadi/pom.xml index ebfaf509..ba74e929 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT cadiparent AAF CADI Parent (Code, Access, Data, Identity) diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index 0350df49..c2f3982f 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ org.onap.aaf.authz cadiparent .. - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT 4.0.0 CADI Servlet Sample (Test Only) diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 409ce4be..58ba3642 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index 463029a5..cc08f441 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/misc/pom.xml b/misc/pom.xml index 66eb64a8..1c475ce4 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT miscparent AAF Misc Parent diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index c7cbd7dd..b0625333 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 90f287f4..8de93549 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 8ba61fea..9edf385c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.4-SNAPSHOT aaf-authz pom diff --git a/releases/2.7.1.yaml b/releases/2.7.1.yaml new file mode 100644 index 00000000..008a8066 --- /dev/null +++ b/releases/2.7.1.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '2.7.1' +project: 'aaf-authz' +log_dir: 'aaf-authz-maven-stage-master/482/' diff --git a/releases/2.7.2.yaml b/releases/2.7.2.yaml new file mode 100644 index 00000000..eb2e65c6 --- /dev/null +++ b/releases/2.7.2.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '2.7.2' +project: 'aaf-authz' +log_dir: 'aaf-authz-maven-stage-master/506/' diff --git a/releases/2.7.3.yaml b/releases/2.7.3.yaml new file mode 100644 index 00000000..075f5c04 --- /dev/null +++ b/releases/2.7.3.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '2.7.3' +project: 'aaf-authz' +log_dir: 'aaf-authz-maven-stage-master/512/' diff --git a/releases/2.7.4.yaml b/releases/2.7.4.yaml new file mode 100644 index 00000000..41a61887 --- /dev/null +++ b/releases/2.7.4.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '2.7.4' +project: 'aaf-authz' +log_dir: 'aaf-authz-maven-stage-master/540/' diff --git a/version.properties b/version.properties index 77d490c5..9575b61b 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ # This TAG 2.7.0-SNAPSHOT is here to help remember to change this file. Keep it up to date with the following "real" entries: major=2 minor=7 -patch=1 +patch=4 base_version=${major}.${minor}.${patch}