Revert "remove obsolete code"

2 files changed, 25 insertions, 6 deletions

diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java
index 8f7d921944b..5b774648314 100644
--- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java
@@ -148,7 +148,9 @@ public class AthenzAuthorizationFilter extends JsonSecurityRequestFilterBase {
     }
 
     private Result getResult(EnabledCredentials.Enum credentialType, AthenzIdentity identity, AuthorizationResult zpeResult, DiscFilterRequest request, ResourceNameAndAction resourceAndAction, List<String> privileges) {
-        return new Result(credentialType, identity, zpeResult, privileges, resourceAndAction.action());
+        String currentAction = resourceAndAction.action();
+        String futureAction = resourceAndAction.futureAction();
+        return new Result(credentialType, identity, zpeResult, privileges, currentAction, futureAction);
     }
 
     private List<String> mapToRequestPrivileges(List<AthenzRole> roles) {
@@ -280,7 +282,8 @@ public class AthenzAuthorizationFilter extends JsonSecurityRequestFilterBase {
                 "authz-required", Boolean.toString(authzRequired),
                 "httpMethod", HttpRequest.Method.valueOf(request.getMethod()).name(),
                 "requestPrivileges", result.map(r -> String.join(",", r.requestPrivileges)).orElse(""),
-                "requestMapping", result.map(r -> r.action).orElse("")
+                "currentRequestMapping", result.map(r -> r.currentAction).orElse(""),
+                "futureRequestMapping", result.map(r -> r.futureAction).orElse("")
         ));
         metric.add(ACCEPTED_METRIC_NAME, 1L, context);
     }
@@ -293,7 +296,8 @@ public class AthenzAuthorizationFilter extends JsonSecurityRequestFilterBase {
                 "zpe-status", zpeCode,
                 "httpMethod", HttpRequest.Method.valueOf(request.getMethod()),
                 "requestPrivileges", result.map(r -> String.join(",", r.requestPrivileges)).orElse(""),
-                "action", result.map(r -> r.action).orElse("")
+                "currentRequestMapping", result.map(r -> r.currentAction).orElse(""),
+                "futureRequestMapping", result.map(r -> r.futureAction).orElse("")
         ));
         metric.add(REJECTED_METRIC_NAME, 1L, context);
     }
@@ -303,14 +307,16 @@ public class AthenzAuthorizationFilter extends JsonSecurityRequestFilterBase {
         final AthenzIdentity identity;
         final AuthorizationResult zpeResult;
         final List<String> requestPrivileges;
-        final String action;
+        final String currentAction;
+        final String futureAction;
 
-        public Result(EnabledCredentials.Enum credentialType, AthenzIdentity identity, AuthorizationResult zpeResult, List<String> requestPrivileges, String action) {
+        public Result(EnabledCredentials.Enum credentialType, AthenzIdentity identity, AuthorizationResult zpeResult, List<String> requestPrivileges, String currentAction, String futureAction) {
             this.credentialType = credentialType;
             this.identity = identity;
             this.zpeResult = zpeResult;
             this.requestPrivileges = requestPrivileges;
-            this.action = action;
+            this.currentAction = currentAction;
+            this.futureAction = futureAction;
         }
     }
 }
diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/RequestResourceMapper.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/RequestResourceMapper.java
index f8eab927643..65e16b77cb3 100644
--- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/RequestResourceMapper.java
+++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/RequestResourceMapper.java
@@ -28,10 +28,15 @@ public interface RequestResourceMapper {
     class ResourceNameAndAction {
         private final AthenzResourceName resourceName;
         private final String action;
+        private final String futureAction;
 
         public ResourceNameAndAction(AthenzResourceName resourceName, String action) {
+            this(resourceName, action, action);
+        }
+        public ResourceNameAndAction(AthenzResourceName resourceName, String action, String futureAction) {
             this.resourceName = resourceName;
             this.action = action;
+            this.futureAction = futureAction;
         }
 
         public AthenzResourceName resourceName() {
@@ -42,6 +47,14 @@ public interface RequestResourceMapper {
             return action;
         }
 
+        public ResourceNameAndAction withFutureAction(String futureAction) {
+            return new ResourceNameAndAction(resourceName, action, futureAction);
+        }
+
+        public String futureAction() {
+            return futureAction;
+        }
+
         @Override
         public String toString() {
             return "ResourceNameAndAction{" +