diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-01-24 14:17:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-24 14:17:13 +0100 |
commit | 5eb436554c43ccc2d4b97421733b206081b2681d (patch) | |
tree | 78ad0c97295aad5f501bf9ab0072525baddebe43 /jdisc-security-filters/src/main | |
parent | e2d7d10f664ec221708d051ec754d68fc6cee5b6 (diff) |
Revert "Bjorncs/update zpe"
Diffstat (limited to 'jdisc-security-filters/src/main')
-rw-r--r-- | jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java | 5 |
1 files changed, 2 insertions, 3 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 9151aa1b693..74e0ee36959 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 @@ -121,12 +121,11 @@ public class AthenzAuthorizationFilter extends JsonSecurityRequestFilterBase { ZpeCheck<C> accessCheck, Function<C, AthenzPrincipal> principalFactory) { AuthorizationResult authorizationResult = accessCheck.checkAccess(credentials, resAndAction.resourceName(), resAndAction.action()); - if (authorizationResult.type() == AuthorizationResult.Type.ALLOW) { + if (authorizationResult == AuthorizationResult.ALLOW) { request.setUserPrincipal(principalFactory.apply(credentials)); - authorizationResult.matchedRole().ifPresent(role -> request.setUserRoles(new String[] {role.roleName()})); return Optional.empty(); } - return Optional.of(new ErrorResponse(Response.Status.FORBIDDEN, "Access forbidden: " + authorizationResult.type().getDescription())); + return Optional.of(new ErrorResponse(Response.Status.FORBIDDEN, "Access forbidden: " + authorizationResult.getDescription())); } private static AthenzPrincipal createPrincipal(X509Certificate certificate) { |