summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2021-06-11 13:13:31 +0200
committerGitHub <noreply@github.com>2021-06-11 13:13:31 +0200
commitd7946daee2e666122236acd56b762eef19753bb0 (patch)
tree7798edad5efde60190fed035d82c6b939bdedc4a
parent43330139565f62619e9459644431caa1fa23577f (diff)
parent54ba3fa465c307b14a8e1010edd1aff212bb2d93 (diff)
Merge pull request #18213 from vespa-engine/mortent/athenzfilter-remove-null-dimension-vals
Remove null dimension values
-rw-r--r--jdisc-security-filters/src/main/java/com/yahoo/jdisc/http/filter/security/athenz/AthenzAuthorizationFilter.java2
1 files changed, 2 insertions, 0 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 d4e891b8d4f..6136bcdfd3a 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
@@ -22,6 +22,7 @@ import java.security.cert.X509Certificate;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.logging.Level;
@@ -155,6 +156,7 @@ public class AthenzAuthorizationFilter extends JsonSecurityRequestFilterBase {
private List<String> mapToRequestPrivileges(List<AthenzRole> roles) {
return roles.stream()
.map(this::rolePrivilege)
+ .filter(Objects::nonNull)
.collect(Collectors.toList());
}