You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/10/24 15:58:24 UTC

[04/12] kylin git commit: minor, support real admin ldap-group name

minor, support real admin ldap-group name


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/6f54daca
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/6f54daca
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/6f54daca

Branch: refs/heads/2.2.x
Commit: 6f54dacaee1dad1df53d28530abdce9ed0e7d49f
Parents: 227668a
Author: lidongsjtu <li...@apache.org>
Authored: Thu Oct 19 22:32:41 2017 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Thu Oct 19 23:12:42 2017 +0800

----------------------------------------------------------------------
 .../java/org/apache/kylin/rest/security/AuthoritiesPopulator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/6f54daca/server-base/src/main/java/org/apache/kylin/rest/security/AuthoritiesPopulator.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/security/AuthoritiesPopulator.java b/server-base/src/main/java/org/apache/kylin/rest/security/AuthoritiesPopulator.java
index 592791c..dbe2d39 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/security/AuthoritiesPopulator.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/security/AuthoritiesPopulator.java
@@ -49,7 +49,7 @@ public class AuthoritiesPopulator extends DefaultLdapAuthoritiesPopulator {
      */
     public AuthoritiesPopulator(ContextSource contextSource, String groupSearchBase, String adminRole, String defaultRole) {
         super(contextSource, groupSearchBase);
-        this.adminRoleAsAuthority = new SimpleGrantedAuthority(adminRole);
+        this.adminRoleAsAuthority = new SimpleGrantedAuthority(adminRole.toUpperCase()); // spring will convert group names to uppercase by default
 
         String[] defaultRoles = StringUtils.split(defaultRole, ",");
         if (ArrayUtils.contains(defaultRoles, Constant.ROLE_MODELER)) {