diff options
Diffstat (limited to 'jdisc-security-filters')
2 files changed, 3 insertions, 9 deletions
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..8df5734407b 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 @@ -16,14 +16,7 @@ public interface RequestResourceMapper { /** * @return A resource name + action to use for access control, empty if no access control should be performed. */ - Optional<ResourceNameAndAction> getResourceNameAndAction(String method, String uriPath, String uriQuery); - - /** - * @return A resource name + action to use for access control, empty if no access control should be performed. - */ - default Optional<ResourceNameAndAction> getResourceNameAndAction(DiscFilterRequest request) { - return getResourceNameAndAction(request.getMethod(), request.getRequestURI(), request.getQueryString()); - } + Optional<ResourceNameAndAction> getResourceNameAndAction(DiscFilterRequest request); class ResourceNameAndAction { private final AthenzResourceName resourceName; diff --git a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/StaticRequestResourceMapper.java b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/StaticRequestResourceMapper.java index 627cb793569..e0026112426 100644 --- a/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/StaticRequestResourceMapper.java +++ b/jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/StaticRequestResourceMapper.java @@ -2,6 +2,7 @@ package com.yahoo.jdisc.http.filter.security.athenz; import com.yahoo.component.annotation.Inject; +import com.yahoo.jdisc.http.filter.DiscFilterRequest; import com.yahoo.vespa.athenz.api.AthenzResourceName; import java.util.Optional; @@ -27,7 +28,7 @@ public class StaticRequestResourceMapper implements RequestResourceMapper { } @Override - public Optional<ResourceNameAndAction> getResourceNameAndAction(String method, String uriPath, String uriQuery) { + public Optional<ResourceNameAndAction> getResourceNameAndAction(DiscFilterRequest request) { return Optional.of(new ResourceNameAndAction(resourceName, action)); } } |