diff options
author | Morten Tokle <mortent@yahooinc.com> | 2022-11-10 14:29:11 +0100 |
---|---|---|
committer | Morten Tokle <mortent@yahooinc.com> | 2022-11-11 09:07:46 +0100 |
commit | 3d72f780f41efab8259d98648df0689a671d3a22 (patch) | |
tree | e7289a5c6dfcb7711b011424eefdedcde72140cc /jdisc-security-filters/src | |
parent | f2ce165982217902ea84bcb12e7a10fe008bacd4 (diff) |
remove obsolete code
Diffstat (limited to 'jdisc-security-filters/src')
2 files changed, 6 insertions, 25 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 5b774648314..8f7d921944b 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,9 +148,7 @@ public class AthenzAuthorizationFilter extends JsonSecurityRequestFilterBase { } private Result getResult(EnabledCredentials.Enum credentialType, AthenzIdentity identity, AuthorizationResult zpeResult, DiscFilterRequest request, ResourceNameAndAction resourceAndAction, List<String> privileges) { - String currentAction = resourceAndAction.action(); - String futureAction = resourceAndAction.futureAction(); - return new Result(credentialType, identity, zpeResult, privileges, currentAction, futureAction); + return new Result(credentialType, identity, zpeResult, privileges, resourceAndAction.action()); } private List<String> mapToRequestPrivileges(List<AthenzRole> roles) { @@ -282,8 +280,7 @@ 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(""), - "currentRequestMapping", result.map(r -> r.currentAction).orElse(""), - "futureRequestMapping", result.map(r -> r.futureAction).orElse("") + "requestMapping", result.map(r -> r.action).orElse("") )); metric.add(ACCEPTED_METRIC_NAME, 1L, context); } @@ -296,8 +293,7 @@ public class AthenzAuthorizationFilter extends JsonSecurityRequestFilterBase { "zpe-status", zpeCode, "httpMethod", HttpRequest.Method.valueOf(request.getMethod()), "requestPrivileges", result.map(r -> String.join(",", r.requestPrivileges)).orElse(""), - "currentRequestMapping", result.map(r -> r.currentAction).orElse(""), - "futureRequestMapping", result.map(r -> r.futureAction).orElse("") + "action", result.map(r -> r.action).orElse("") )); metric.add(REJECTED_METRIC_NAME, 1L, context); } @@ -307,16 +303,14 @@ public class AthenzAuthorizationFilter extends JsonSecurityRequestFilterBase { final AthenzIdentity identity; final AuthorizationResult zpeResult; final List<String> requestPrivileges; - final String currentAction; - final String futureAction; + final String action; - public Result(EnabledCredentials.Enum credentialType, AthenzIdentity identity, AuthorizationResult zpeResult, List<String> requestPrivileges, String currentAction, String futureAction) { + public Result(EnabledCredentials.Enum credentialType, AthenzIdentity identity, AuthorizationResult zpeResult, List<String> requestPrivileges, String action) { this.credentialType = credentialType; this.identity = identity; this.zpeResult = zpeResult; this.requestPrivileges = requestPrivileges; - this.currentAction = currentAction; - this.futureAction = futureAction; + this.action = action; } } } 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 65e16b77cb3..f8eab927643 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,15 +28,10 @@ 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() { @@ -47,14 +42,6 @@ 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{" + |