From 3e83d98dab0e45aa050b10e49249be05ca8aa974 Mon Sep 17 00:00:00 2001 From: "Hassan, Sean (sh265m)" Date: Wed, 2 Sep 2020 11:22:13 -0500 Subject: [PATCH 1/9] Prepare for release 2.7.1 - 2.7.1.yaml Issue-ID: AAF-1193 Signed-off-by: Hassan, Sean (sh265m) Change-Id: I86d334c7d09f5b102bff26fbca7f7eef4289dcee --- releases/2.7.1.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releases/2.7.1.yaml 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/' -- 2.16.6 From 71ba4dc9540db18cc51e318df94c81e7b49613af Mon Sep 17 00:00:00 2001 From: "Hassan, Sean (sh265m)" Date: Thu, 24 Sep 2020 12:03:43 -0500 Subject: [PATCH 2/9] Create and prepare non-deploy release 2.7.2 Issue-ID: AAF-1203 Change-Id: I5c8c5bca1c5804211ba514b5d6492ef1ba81cc24 Signed-off-by: Sean Hassan --- auth-client/pom.xml | 2 +- auth/auth-batch/pom.xml | 2 +- auth/auth-cass/pom.xml | 2 +- auth/auth-certman/pom.xml | 2 +- auth/auth-cmd/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-deforg/pom.xml | 2 +- auth/auth-fs/pom.xml | 2 +- auth/auth-gui/pom.xml | 2 +- auth/auth-hello/pom.xml | 2 +- auth/auth-locate/pom.xml | 2 +- auth/auth-oauth/pom.xml | 2 +- auth/auth-service/pom.xml | 2 +- auth/docker/pom.xml | 2 +- auth/pom.xml | 2 +- cadi/aaf/pom.xml | 2 +- cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java | 8 ++++---- cadi/client/pom.xml | 2 +- cadi/core/pom.xml | 2 +- cadi/oauth-enduser/pom.xml | 2 +- cadi/pom.xml | 2 +- cadi/servlet-sample/pom.xml | 2 +- misc/env/pom.xml | 2 +- misc/log4j/pom.xml | 2 +- misc/pom.xml | 2 +- misc/rosetta/pom.xml | 2 +- misc/xgen/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/auth-client/pom.xml b/auth-client/pom.xml index bb6043c4..8d9f389d 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.2-SNAPSHOT aaf-auth-client diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index dfd6ef63..dc8c2d01 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.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index a82fbc7a..e9c0ecaf 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.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index cc825192..9c928a42 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.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 4ffd87bf..5722e4af 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.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 0c251bfb..3fe252d6 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.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 257db1d7..b3be5c1d 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.2-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index d5217ed4..25c7db6e 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.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 1d7460b6..312e5c3e 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.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index cfc94e11..63c0d05e 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.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index 0b89dd39..e85484cd 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.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index e234ea8c..b503eeaf 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.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 45f89bfc..501a9f97 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.2-SNAPSHOT ../pom.xml diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml index ab99c702..f5ce443b 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.2-SNAPSHOT ../pom.xml diff --git a/auth/pom.xml b/auth/pom.xml index fbb050ea..e392cdc6 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT authparent AAF Auth Parent diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 8051ffa8..5504e265 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.2-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..f74306fb 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 @@ -108,7 +108,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 +116,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; @@ -169,7 +169,7 @@ public class AAFAuthn extends AbsUserCache { // ); 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..a87867dc 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.2-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index eda4a394..1bd1d5ac 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.2-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 0c4a7019..3043f15c 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.2-SNAPSHOT .. diff --git a/cadi/pom.xml b/cadi/pom.xml index ebfaf509..6c7e2896 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.2-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..b0d4a677 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.2-SNAPSHOT 4.0.0 CADI Servlet Sample (Test Only) diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 409ce4be..3776f637 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.2-SNAPSHOT .. diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index 463029a5..db3bd301 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.2-SNAPSHOT .. diff --git a/misc/pom.xml b/misc/pom.xml index 66eb64a8..5720cfb1 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT miscparent AAF Misc Parent diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index c7cbd7dd..aca025b5 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.2-SNAPSHOT .. diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 90f287f4..1df6056e 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.2-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 8ba61fea..38d43025 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.2-SNAPSHOT aaf-authz pom diff --git a/version.properties b/version.properties index 77d490c5..9bdcd7be 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=2 base_version=${major}.${minor}.${patch} -- 2.16.6 From 95a6e66b8cb44eba7052518be1f62db25a7ed22a Mon Sep 17 00:00:00 2001 From: "Hassan, Sean (sh265m)" Date: Thu, 24 Sep 2020 13:54:43 -0500 Subject: [PATCH 3/9] Prepare for release 2.7.2 - 2.7.2.yaml Issue-ID: AAF-1203 Change-Id: I60e5141c1b92cc358dd678acf5659b8ddf3a176e Signed-off-by: Hassan, Sean (sh265m) --- releases/2.7.2.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releases/2.7.2.yaml 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/' -- 2.16.6 From cee64537a7e4b8579996a4e3e1b0f98b7fe646cb Mon Sep 17 00:00:00 2001 From: Sean Hassan Date: Tue, 29 Sep 2020 13:14:27 -0500 Subject: [PATCH 4/9] Correct ClassCastException on locator object Issue-ID: AAF-1204 Change-Id: I03dbe7cf109ac8a0ff3a5b02338043ab5ced6323 Signed-off-by: Sean Hassan --- .../src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 f74306fb..d1a3b19b 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; @@ -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); } -- 2.16.6 From 0e051c5f9acaa54fcbf119b674d7e4e89a853363 Mon Sep 17 00:00:00 2001 From: Sean Hassan Date: Tue, 29 Sep 2020 14:51:21 -0500 Subject: [PATCH 5/9] Prepare for release 2.7.3 Issue-ID: AAF-1205 Change-Id: Ifd1c6b57730d7df183829db2a316d3a77abcb435 Signed-off-by: Sean Hassan --- auth-client/pom.xml | 2 +- auth/auth-batch/pom.xml | 2 +- auth/auth-cass/pom.xml | 2 +- auth/auth-certman/pom.xml | 2 +- auth/auth-cmd/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-deforg/pom.xml | 2 +- auth/auth-fs/pom.xml | 2 +- auth/auth-gui/pom.xml | 2 +- auth/auth-hello/pom.xml | 2 +- auth/auth-locate/pom.xml | 2 +- auth/auth-oauth/pom.xml | 2 +- auth/auth-service/pom.xml | 2 +- auth/docker/pom.xml | 2 +- auth/pom.xml | 2 +- cadi/aaf/pom.xml | 2 +- cadi/client/pom.xml | 2 +- cadi/core/pom.xml | 2 +- cadi/oauth-enduser/pom.xml | 2 +- cadi/pom.xml | 2 +- cadi/servlet-sample/pom.xml | 2 +- misc/env/pom.xml | 2 +- misc/log4j/pom.xml | 2 +- misc/pom.xml | 2 +- misc/rosetta/pom.xml | 2 +- misc/xgen/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/auth-client/pom.xml b/auth-client/pom.xml index 8d9f389d..b6c765e1 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT aaf-auth-client diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index dc8c2d01..c8c3b8c0 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index e9c0ecaf..d4716098 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index 9c928a42..aba1f988 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -20,7 +20,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 5722e4af..0c926773 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -18,7 +18,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 3fe252d6..d19326ec 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index b3be5c1d..605b7671 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.2-SNAPSHOT + 2.7.3-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index 25c7db6e..712ff753 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 312e5c3e..2afe19a7 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index 63c0d05e..1a0c622d 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index e85484cd..ebff0e7d 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index b503eeaf..574bb01c 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 501a9f97..71f5b898 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml index f5ce443b..b239d0f1 100644 --- a/auth/docker/pom.xml +++ b/auth/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT ../pom.xml diff --git a/auth/pom.xml b/auth/pom.xml index e392cdc6..76464783 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT authparent AAF Auth Parent diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 5504e265..7b475f52 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz cadiparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT .. diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index a87867dc..d7810552 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ org.onap.aaf.authz cadiparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index 1bd1d5ac..c4d5d75b 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ org.onap.aaf.authz cadiparent .. - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 3043f15c..54080f91 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz cadiparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT .. diff --git a/cadi/pom.xml b/cadi/pom.xml index 6c7e2896..89cb4058 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz parent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT cadiparent AAF CADI Parent (Code, Access, Data, Identity) diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index b0d4a677..ac80b1b7 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ org.onap.aaf.authz cadiparent .. - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT 4.0.0 CADI Servlet Sample (Test Only) diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 3776f637..1c8c98ce 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT .. diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index db3bd301..e725fa28 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT .. diff --git a/misc/pom.xml b/misc/pom.xml index 5720cfb1..b380d98f 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT miscparent AAF Misc Parent diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index aca025b5..d6a3566e 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT .. diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 1df6056e..4bd271b6 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 38d43025..25e25662 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.aaf.authz parent - 2.7.2-SNAPSHOT + 2.7.3-SNAPSHOT aaf-authz pom diff --git a/version.properties b/version.properties index 9bdcd7be..9b78cd0b 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=2 +patch=3 base_version=${major}.${minor}.${patch} -- 2.16.6 From 29405550beee518cbd18cf14678904471206a8f6 Mon Sep 17 00:00:00 2001 From: Sean Hassan Date: Tue, 29 Sep 2020 15:36:56 -0500 Subject: [PATCH 6/9] Prepare for release 2.7.3 - 2.7.3.yaml Issue-ID: AAF-1205 Change-Id: I2d178a189850909cf16be9b540e976ba191b6853 Signed-off-by: Sean Hassan --- releases/2.7.3.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releases/2.7.3.yaml 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/' -- 2.16.6 From d47bcb076eda98afc13cdb29e8c56e8be25e78d3 Mon Sep 17 00:00:00 2001 From: Sean Hassan Date: Mon, 26 Oct 2020 20:54:21 -0500 Subject: [PATCH 7/9] Prepare for release 2.7.4 Issue-ID: AAF-1209 Change-Id: If4014cdbc72dc585b814b6d6ed0c66ffddb08eda Signed-off-by: Sean Hassan --- auth-client/pom.xml | 2 +- auth/auth-batch/pom.xml | 2 +- auth/auth-cass/pom.xml | 2 +- auth/auth-certman/pom.xml | 2 +- auth/auth-cmd/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-deforg/pom.xml | 2 +- auth/auth-fs/pom.xml | 2 +- auth/auth-gui/pom.xml | 2 +- auth/auth-hello/pom.xml | 2 +- auth/auth-locate/pom.xml | 2 +- auth/auth-oauth/pom.xml | 2 +- auth/auth-service/pom.xml | 2 +- auth/docker/pom.xml | 2 +- auth/pom.xml | 2 +- cadi/aaf/pom.xml | 2 +- .../main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java | 15 +++++---------- cadi/client/pom.xml | 2 +- cadi/core/pom.xml | 2 +- cadi/oauth-enduser/pom.xml | 2 +- cadi/pom.xml | 2 +- cadi/servlet-sample/pom.xml | 2 +- misc/env/pom.xml | 2 +- misc/log4j/pom.xml | 2 +- misc/pom.xml | 2 +- misc/rosetta/pom.xml | 2 +- misc/xgen/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- 29 files changed, 33 insertions(+), 38 deletions(-) diff --git a/auth-client/pom.xml b/auth-client/pom.xml index b6c765e1..f87f982f 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT aaf-auth-client diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index c8c3b8c0..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.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index d4716098..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.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index aba1f988..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.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 0c926773..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.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index d19326ec..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.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 605b7671..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.3-SNAPSHOT + 2.7.4-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index 712ff753..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.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 2afe19a7..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.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index 1a0c622d..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.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index ebff0e7d..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.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index 574bb01c..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.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 71f5b898..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.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml index b239d0f1..8f7782e7 100644 --- a/auth/docker/pom.xml +++ b/auth/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/pom.xml b/auth/pom.xml index 76464783..16804d32 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT authparent AAF Auth Parent diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 7b475f52..5077ddb9 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz cadiparent - 2.7.3-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 d1a3b19b..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 @@ -161,17 +161,12 @@ 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, timeToLive)); diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index d7810552..1ecc96ae 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ org.onap.aaf.authz cadiparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index c4d5d75b..1dc419aa 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ org.onap.aaf.authz cadiparent .. - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 54080f91..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.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/cadi/pom.xml b/cadi/pom.xml index 89cb4058..ba74e929 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz parent - 2.7.3-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 ac80b1b7..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.3-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 1c8c98ce..58ba3642 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index e725fa28..cc08f441 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/misc/pom.xml b/misc/pom.xml index b380d98f..1c475ce4 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT miscparent AAF Misc Parent diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index d6a3566e..b0625333 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 4bd271b6..8de93549 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 25e25662..9edf385c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.aaf.authz parent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT aaf-authz pom diff --git a/version.properties b/version.properties index 9b78cd0b..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=3 +patch=4 base_version=${major}.${minor}.${patch} -- 2.16.6 From c0d6c3e3c27a4c97a59a2a1f403229fae9603707 Mon Sep 17 00:00:00 2001 From: Sean Hassan Date: Tue, 27 Oct 2020 11:06:06 -0500 Subject: [PATCH 8/9] Prepare for release 2.7.4 - 2.7.4.yaml Issue-ID: AAF-1209 Change-Id: I674104d9ff08935cf6c06c8cf70bb572b40afdd6 Signed-off-by: Sean Hassan --- releases/2.7.4.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releases/2.7.4.yaml 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/' -- 2.16.6 From 5836e4a53d87b1792486aa6b0b1ddb2e71d91bb9 Mon Sep 17 00:00:00 2001 From: Kenny Paul Date: Fri, 23 Apr 2021 13:49:43 -0700 Subject: [PATCH 9/9] changed to unmaintained Issue-ID: CIMAN-33 Signed-off-by: Kenny Paul Change-Id: I1ad834908c16091843c4c8fcdd2089e94c306568 --- INFO.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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: -- 2.16.6