X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fdao%2Fhl%2FFunction.java;h=761ebec974b1863ee7c24fae6135cf69b174ef5d;hb=HEAD;hp=89643c4d46849455986da7733b9246725c4c0caa;hpb=3c11fabbde68768a59d764087904b9d8560946e6;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java
index 89643c4d..761ebec9 100644
--- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java
+++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/dao/hl/Function.java
@@ -96,10 +96,10 @@ public class Function {
         E("Executed"),D("Denied"),P("Pending"),L("Lapsed");
 
         private String desc;
-        public final static Result<OP_STATUS> RE = Result.ok(OP_STATUS.E);
-        public final static Result<OP_STATUS> RD = Result.ok(OP_STATUS.D);
-        public final static Result<OP_STATUS> RP = Result.ok(OP_STATUS.P);
-        public final static Result<OP_STATUS> RL = Result.ok(OP_STATUS.L);
+        public static final Result<OP_STATUS> RE = Result.ok(OP_STATUS.E);
+        public static final Result<OP_STATUS> RD = Result.ok(OP_STATUS.D);
+        public static final Result<OP_STATUS> RP = Result.ok(OP_STATUS.P);
+        public static final Result<OP_STATUS> RL = Result.ok(OP_STATUS.L);
 
         private OP_STATUS(String desc) {
             this.desc = desc;
@@ -227,7 +227,6 @@ public class Function {
         if (rparent.notOK()) {
             return Result.err(rparent);
         }
-        parent = rparent.value.parent;
         if (!fromApproval) {
             rparent = q.mayUser(trans, user, rparent.value, Access.write);
             if (rparent.notOK()) {
@@ -760,7 +759,7 @@ public class Function {
             }
 
             for (CredDAO.Data cd : cdr.value) {
-                if (cd.expires.after(now)) {
+                if (cd.expires.after(now) || trans.org().isUserExpireExempt(cd.id, cd.expires)) {
                     return Result.ok();
                 }
             }
@@ -1441,7 +1440,7 @@ public class Function {
         List<UserRoleDAO.Data> list = rurdd.value;
         List<String> rv = new ArrayList<>(list.size()); // presize
         for (UserRoleDAO.Data urdd : rurdd.value) {
-            if (includeExpired || urdd.expires.after(now)) {
+            if (includeExpired || urdd.expires.after(now) || trans.org().isUserExpireExempt(urdd.user, urdd.expires)) {
                 rv.add(urdd.user);
             }
         }