kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pengjian...@apache.org
Subject kylin git commit: revert KYLIN-3197 2fd676b36ec9e0f853d59db31ee62cd90a647641
Date Mon, 12 Feb 2018 06:13:20 GMT
Repository: kylin
Updated Branches:
  refs/heads/master f1e9f1882 -> 714aee04e


revert KYLIN-3197 2fd676b36ec9e0f853d59db31ee62cd90a647641

Signed-off-by: peng.jianhua <peng.jianhua@zte.com.cn>


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

Branch: refs/heads/master
Commit: 714aee04e1ee8964c0e5309fed3bbf711b995f13
Parents: f1e9f18
Author: peng.jianhua <peng.jianhua@zte.com.cn>
Authored: Mon Feb 12 11:01:17 2018 +0800
Committer: peng.jianhua <peng.jianhua@zte.com.cn>
Committed: Mon Feb 12 14:12:37 2018 +0800

----------------------------------------------------------------------
 .../apache/kylin/rest/security/LDAPAuthoritiesPopulator.java  | 7 -------
 1 file changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/714aee04/server-base/src/main/java/org/apache/kylin/rest/security/LDAPAuthoritiesPopulator.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/security/LDAPAuthoritiesPopulator.java
b/server-base/src/main/java/org/apache/kylin/rest/security/LDAPAuthoritiesPopulator.java
index 50e3cf3..d7a3765 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/security/LDAPAuthoritiesPopulator.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/security/LDAPAuthoritiesPopulator.java
@@ -22,7 +22,6 @@ import java.util.Set;
 
 import org.apache.kylin.rest.constant.Constant;
 import org.springframework.ldap.core.ContextSource;
-import org.springframework.ldap.core.DirContextOperations;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator;
@@ -50,10 +49,4 @@ public class LDAPAuthoritiesPopulator extends DefaultLdapAuthoritiesPopulator
{
         return userAuthorities;
     }
 
-    @Override
-    protected Set<GrantedAuthority> getAdditionalRoles(DirContextOperations user, String
username) {
-        String userDn = user.getNameInNamespace();
-        username = user.getStringAttribute("cn");
-        return getGroupMembershipRoles(userDn, username);
-    }
 }


Mime
View raw message