From fe82401b767a7f6c96ad1b1001eb2380ddc5a49a Mon Sep 17 00:00:00 2001 From: "Hassan, Sean (sh265m)" Date: Thu, 30 Jul 2020 14:27:20 -0500 Subject: [PATCH 01/16] prepare for release 2.7.0 Issue-ID: AAF-1142 Signed-off-by: Sean Hassan Change-Id: Idc555b8b7d343e7c284b2dcf2deed2fb4ba97690 --- Jenkinsfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..d9b07104 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,14 @@ +#!groovy + +properties([[$class: 'ParametersDefinitionProperty', parameterDefinitions: [ +[$class: 'hudson.model.StringParameterDefinition', name: 'ECO_PIPELINE_ID', defaultValue: '0', description: 'Select an environment'], +[$class: 'hudson.model.StringParameterDefinition', name: 'PHASE', defaultValue: 'BUILD, PACKAGE, SONAR, SAST', description: 'Select an instance'], +[$class: 'hudson.model.StringParameterDefinition', name: 'TARGET_NODE', defaultValue: 'zld03318.vci.att.com', description: 'Select an environment to deploy to'] +]]]) + +def wf = new MavenWorkflow() + +wf defaultPhase:'BUILD, SONAR, SAST, DAST', + language:'MAVEN', + deployType: 'SWM', + deployOptions:"swm:install -Dswm.target.node=${params.TARGET_NODE}" -- 2.16.6 From 6450272ae2ba501967bbedd275158aa014cbe238 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Fri, 31 Jul 2020 07:31:41 -0500 Subject: [PATCH 02/16] Minor HTML Gen improvments Handle Null Text, Add DOCTYPE Issue-ID: AAF-1190 Signed-off-by: Instrumental Change-Id: I4c9177cc402b4c0af58a5236610d178b28f2a5e4 --- misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java | 12 +++++++++--- .../src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java index b68ad6e5..258715e1 100644 --- a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java +++ b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java @@ -151,7 +151,9 @@ public class XGen> { @SuppressWarnings("unchecked") public RT text(String txt) { - forward.append(txt); + if(txt!=null) { + forward.append(txt); + } return (RT)this; } @@ -182,8 +184,12 @@ public class XGen> { for (int i=0;i"); + forward.println(""); incr("html",attrib); return this; } -- 2.16.6 From 3a3b7c6b505e842da89615dfff3a8d9e74b1390f Mon Sep 17 00:00:00 2001 From: "Hassan, Sean (sh265m)" Date: Fri, 31 Jul 2020 12:04:07 -0500 Subject: [PATCH 03/16] prepare for release 2.7.0 Issue-ID: AAF-1142 Signed-off-by: Sean Hassan Change-Id: I6ebd90ee0ed2d1fded13e761b35afcf1ef25bea6 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 02ce0893..ec090acd 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ # This TAG 2.1.21-SNAPSHOT is here to help remember to change this file. Keep it up to date with the following "real" entries: major=2 minor=1 -patch=21 +patch=22 base_version=${major}.${minor}.${patch} -- 2.16.6 From 43ee218d890c982328ed8f16ec87c51b31e825be Mon Sep 17 00:00:00 2001 From: Raviteja Cherughattu Date: Fri, 31 Jul 2020 13:18:47 -0500 Subject: [PATCH 04/16] Prepare for release 2.7.0 Issue-ID: AAF-1142 Change-Id: I0d339e6fb5cc503d9b7d2cc7ed3d5dd4f9c4f872 Signed-off-by: Raviteja Cherughattu --- version.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.properties b/version.properties index ec090acd..38e27527 100644 --- a/version.properties +++ b/version.properties @@ -24,10 +24,10 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -# This TAG 2.1.21-SNAPSHOT is here to help remember to change this file. Keep it up to date with the following "real" entries: +# 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=1 -patch=22 +minor=7 +patch=0 base_version=${major}.${minor}.${patch} -- 2.16.6 From b5a0b056808af99652b80e42b9d56a9670cc88a1 Mon Sep 17 00:00:00 2001 From: Raviteja Cherughattu Date: Fri, 31 Jul 2020 14:20:28 -0500 Subject: [PATCH 05/16] Prepare for release 2.7.0 - 2.7.0.yaml Issue-ID: AAF-1142 Change-Id: I3da114d234dfcbdd7775977f7441a95ab52cad99 Signed-off-by: Raviteja Cherughattu --- releases/2.7.0.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releases/2.7.0.yaml diff --git a/releases/2.7.0.yaml b/releases/2.7.0.yaml new file mode 100644 index 00000000..9cea6b4c --- /dev/null +++ b/releases/2.7.0.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '2.7.0' +project: 'aaf-authz' +log_dir: 'aaf-authz-maven-stage-master/448/' -- 2.16.6 From 61d58a9597f2640f52e6c274525b1712ee38c461 Mon Sep 17 00:00:00 2001 From: ChrisC Date: Wed, 19 Aug 2020 13:03:00 +0200 Subject: [PATCH 06/16] Update Release note Update release note to catch-up Frankfurt and El Alto maintenance release Issue-ID: AAF-1159 Signed-off-by: ChrisC Change-Id: I5a406b398f9333e3d1cec6801db96f1ca07eab44 --- docs/sections/release-notes.rst | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/docs/sections/release-notes.rst b/docs/sections/release-notes.rst index 7981ed46..2cbd1b6e 100644 --- a/docs/sections/release-notes.rst +++ b/docs/sections/release-notes.rst @@ -6,6 +6,20 @@ Release Notes ============= +Version: 2.1.23 (Frankfurt Maintenance, 6.0.0) +---------------------------------- +:Release Date: 2020-08-17 + +Note : there is no new containers for this release as this was fixed by a patch in OOM repo (using Certinitializer to override certificates in container) + +**Bug Fixes** + - `AAF-1159 `_ Certificate expired for AAF-SMS + - 'AAF-1175 `_ Certificate between CertService client and CertService server has expired + +**Known Issues - solve in Guilin** + + - `AAF-1087 `_ AAF init containers init with exit 0 even if failing + Version: 2.1.23 (Frankfurt, 6.0.0) --------------------------------------------- @@ -25,6 +39,17 @@ More details about CMPv2 support in ONAP can be found on a dedicated page. **Known Issues - solve in Guilin** - `AAF-1087 `_ AAF init containers init with exit 0 even if failing +Version: 2.1.15 (El Alto Maintenance, 5.0.2) +-------------------------------------------- + +:Release Date: 2020-08-24 + +Note : there is no new containers for this release as this was fixed by a patch in OOM repo (mounting replacement certificates through oom) + +**Bug Fixes** + + - `AAF-1159 `_ Certificate expired for AAF-SMS + Version: 2.1.15 (El Alto, 5.0.1) --------------------------------------------- -- 2.16.6 From 55789c5859aff784f6b3cb45e17375c5be1c4cf3 Mon Sep 17 00:00:00 2001 From: "Hassan, Sean (sh265m)" Date: Thu, 27 Aug 2020 16:22:05 -0500 Subject: [PATCH 07/16] Create and prepare non-deploy release 2.7.1 Contains two minor functional changes. First is the replace of "osaaf" with "onap.aaf" in pathing. Second is to have connection retries attempt to exhaust all located services before expiring. Issue-ID: AAF-1193 Signed-off-by: Hassan, Sean (sh265m) Change-Id: Ie8d8ad76104ead18eb568d0c48882e7cbead041a --- 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 +- .../src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java | 11 ++++++++++- .../src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java | 6 +++--- 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 +- 30 files changed, 41 insertions(+), 32 deletions(-) diff --git a/auth-client/pom.xml b/auth-client/pom.xml index 29b9e2df..bb6043c4 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT aaf-auth-client diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index 4012ab7c..dfd6ef63 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index 2b465819..a82fbc7a 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index ca08852d..cc825192 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -20,7 +20,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 19902604..4ffd87bf 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -18,7 +18,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index bef94675..0c251bfb 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 63372806..257db1d7 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.0-SNAPSHOT + 2.7.1-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index fcc4baa4..d5217ed4 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 0e00ca97..1d7460b6 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index 676ca3ea..cfc94e11 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index e1103eca..0b89dd39 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index d78a38d0..e234ea8c 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 4fbd4673..45f89bfc 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml index ff5c97eb..ab99c702 100644 --- a/auth/docker/pom.xml +++ b/auth/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT ../pom.xml diff --git a/auth/pom.xml b/auth/pom.xml index 22319b5b..fbb050ea 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT authparent AAF Auth Parent diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index ebe5c0b3..8051ffa8 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz cadiparent - 2.7.0-SNAPSHOT + 2.7.1-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 bd94d0ad..dbb9d5c9 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 @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.List; import org.onap.aaf.cadi.AbsUserCache; +import org.onap.aaf.cadi.Access; import org.onap.aaf.cadi.CachedPrincipal; import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.User; @@ -141,6 +142,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 + AAFConHttp forceCastCon = (AAFConHttp) con; + AAFLocator forceCastLoc = (AAFLocator) forceCastCon.hman().loc; + maxRetries = forceCastLoc.maxIters(); + } catch (Exception e) { + access.log(Access.Level.DEBUG, e); + } List attemptedUris = new ArrayList<>(); URI thisUri = null; for (int retries = 0;; retries++) { @@ -174,7 +183,7 @@ public class AAFAuthn extends AbsUserCache { attemptedUris.add(thisUri); } con.access.log(e); - if (retries > 2) { + if (retries > maxRetries) { return Resp.INACCESSIBLE; } } diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java index 8b91c74a..01a540b4 100644 --- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java +++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java @@ -61,7 +61,7 @@ import aaf.v2_0.Perms; * */ public class AAFLurPerm extends AbsAAFLur { - private static final String ORG_OSAAF_CADI_OAUTH_O_AUTH2_LUR = "org.osaaf.cadi.oauth.OAuth2Lur"; + private static final String ORG_ONAP_AAF_CADI_OAUTH_OAUTH_2_LUR = "org.onap.aaf.cadi.oauth.OAuth2Lur"; /** * Need to be able to transmutate a Principal into either Person or AppID, which are the only ones accepted at this @@ -87,14 +87,14 @@ public class AAFLurPerm extends AbsAAFLur { private void attachOAuth2(AAFCon con) throws APIException { String oauth2_url; - Class tmcls = Config.loadClass(access,"org.osaaf.cadi.oauth.TokenMgr"); + Class tmcls = Config.loadClass(access,"org.onap.aaf.cadi.oauth.TokenMgr"); if (tmcls!=null) { if ((oauth2_url = con.access.getProperty(Config.CADI_OAUTH2_URL,null))!=null) { try { Constructor tmconst = tmcls.getConstructor(AAFCon.class,String.class); Object tokMangr = tmconst.newInstance(con,oauth2_url); @SuppressWarnings("unchecked") - Class oa2cls = (Class)Config.loadClass(access,ORG_OSAAF_CADI_OAUTH_O_AUTH2_LUR); + Class oa2cls = (Class)Config.loadClass(access, ORG_ONAP_AAF_CADI_OAUTH_OAUTH_2_LUR); Constructor oa2const = oa2cls.getConstructor(tmcls); Lur oa2 = oa2const.newInstance(tokMangr); setPreemptiveLur(oa2); diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index 4ff66d81..b0a4492b 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ org.onap.aaf.authz cadiparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index 15bb7bbd..eda4a394 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ org.onap.aaf.authz cadiparent .. - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 0a222249..0c4a7019 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz cadiparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT .. diff --git a/cadi/pom.xml b/cadi/pom.xml index d9f0453d..ebfaf509 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz parent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT cadiparent AAF CADI Parent (Code, Access, Data, Identity) diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index 6fc12696..0350df49 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ org.onap.aaf.authz cadiparent .. - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT 4.0.0 CADI Servlet Sample (Test Only) diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 1bdbab0f..409ce4be 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT .. diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index 8c892b69..463029a5 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT .. diff --git a/misc/pom.xml b/misc/pom.xml index 27948dfb..66eb64a8 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT miscparent AAF Misc Parent diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index 2efbba76..c7cbd7dd 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT .. diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 52533ba0..90f287f4 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index bd4f3a2b..8ba61fea 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.aaf.authz parent - 2.7.0-SNAPSHOT + 2.7.1-SNAPSHOT aaf-authz pom diff --git a/version.properties b/version.properties index 38e27527..77d490c5 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=0 +patch=1 base_version=${major}.${minor}.${patch} -- 2.16.6 From 3e83d98dab0e45aa050b10e49249be05ca8aa974 Mon Sep 17 00:00:00 2001 From: "Hassan, Sean (sh265m)" Date: Wed, 2 Sep 2020 11:22:13 -0500 Subject: [PATCH 08/16] 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 09/16] 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 10/16] 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 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 16/16] 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