summaryrefslogtreecommitdiffstats
path: root/cadi
diff options
context:
space:
mode:
authorHassan, Sean (sh265m) <sean.hassan@att.com>2020-09-24 12:03:43 -0500
committerHassan, Sean (sh265m) <sean.hassan@att.com>2020-09-24 12:03:51 -0500
commit71ba4dc9540db18cc51e318df94c81e7b49613af (patch)
tree560620800a454308590c3a975cdd23de79f7c5ef /cadi
parent3e83d98dab0e45aa050b10e49249be05ca8aa974 (diff)
Create and prepare non-deploy release 2.7.2
Issue-ID: AAF-1203 Change-Id: I5c8c5bca1c5804211ba514b5d6492ef1ba81cc24 Signed-off-by: Sean Hassan <sean.hassan@att.com>
Diffstat (limited to 'cadi')
-rw-r--r--cadi/aaf/pom.xml2
-rw-r--r--cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java8
-rw-r--r--cadi/client/pom.xml2
-rw-r--r--cadi/core/pom.xml2
-rw-r--r--cadi/oauth-enduser/pom.xml2
-rw-r--r--cadi/pom.xml2
-rw-r--r--cadi/servlet-sample/pom.xml2
7 files changed, 10 insertions, 10 deletions
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 @@
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
- <version>2.7.1-SNAPSHOT</version>
+ <version>2.7.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
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<CLIENT> extends AbsUserCache<AAFPermission> {
}
}
- 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<CLIENT> extends AbsUserCache<AAFPermission> {
if (usr!=null) {
usr.principal = cp;
} else {
- addUser(new User<AAFPermission>(cp,con.timeout));
+ addUser(new User<AAFPermission>(cp,con.userExpires));
}
return null;
case INACCESSIBLE:
return "AAF Inaccessible";
case UNVALIDATED:
- addUser(new User<AAFPermission>(user,bytes,con.timeout));
+ addUser(new User<AAFPermission>(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<CLIENT> extends AbsUserCache<AAFPermission> {
// );
if (fp.get(con.timeout)) {
expires = System.currentTimeMillis() + timeToLive;
- addUser(new User<AAFPermission>(this, expires));
+ addUser(new User<AAFPermission>(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 @@
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
- <version>2.7.1-SNAPSHOT</version>
+ <version>2.7.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
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 @@
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<relativePath>..</relativePath>
- <version>2.7.1-SNAPSHOT</version>
+ <version>2.7.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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 @@
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
- <version>2.7.1-SNAPSHOT</version>
+ <version>2.7.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
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 @@
<parent>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>parent</artifactId>
- <version>2.7.1-SNAPSHOT</version>
+ <version>2.7.2-SNAPSHOT</version>
</parent>
<artifactId>cadiparent</artifactId>
<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
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 @@
<groupId>org.onap.aaf.authz</groupId>
<artifactId>cadiparent</artifactId>
<relativePath>..</relativePath>
- <version>2.7.1-SNAPSHOT</version>
+ <version>2.7.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<name>CADI Servlet Sample (Test Only)</name>