[knox] branch master updated: KNOX-2342 - CommonIdentityAssertionFilter calling mapGroupPrincipals Twice

[lmccay]

This is an automated email from the ASF dual-hosted git repository.

lmccay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git


The following commit(s) were added to refs/heads/master by this push:
     new 7aa020e  KNOX-2342 - CommonIdentityAssertionFilter calling 
mapGroupPrincipals Twice
7aa020e is described below

commit 7aa020eb59c5d6fd178d17ed82e550556e9e9d32
Author: lmccay <lmc...@apache.org>
AuthorDate: Wed Apr 15 16:34:50 2020 -0400

    KNOX-2342 - CommonIdentityAssertionFilter calling mapGroupPrincipals Twice
---
 .../identityasserter/common/filter/CommonIdentityAssertionFilter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
 
b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
index f16fa50..7d66925 100644
--- 
a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
+++ 
b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java
@@ -84,7 +84,7 @@ public class CommonIdentityAssertionFilter extends 
AbstractIdentityAssertionFilt
 
     String mappedPrincipalName = mapUserPrincipalBase(principalName);
     mappedPrincipalName = mapUserPrincipal(mappedPrincipalName);
-    String[] mappedGroups = mapGroupPrincipals(mappedPrincipalName, subject);
+    String[] mappedGroups = mapGroupPrincipalsBase(mappedPrincipalName, 
subject);
     String[] groups = mapGroupPrincipals(mappedPrincipalName, subject);
     groups = combineGroupMappings(mappedGroups, groups);