Repository: zeppelin Updated Branches: refs/heads/master ed2422a09 -> 5fde8c21d
[minor] Remove incorrect configuration and fix description of LdapRealm ### What is this PR for? There is wrong description and incorrect configuration defined in comment in LdapRealm.java. Since the documentation at (http://zeppelin.apache.org/docs/0.8.0-SNAPSHOT/security/shiroauthentication.html) does not mention LdapRealm, the information should be correct in the code comments at the least. ### What type of PR is it? Documentation ### What is the Jira issue? N/A ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Vipin Rathor <v.rat...@gmail.com> Closes #2330 from VipinRathor/fix-LdapRealm-description and squashes the following commits: 73148e3b9 [Vipin Rathor] [minor] Remove incorrect configuration and fix description of LdapRealm Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/5fde8c21 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/5fde8c21 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/5fde8c21 Branch: refs/heads/master Commit: 5fde8c21d67ccba2d939387777bf9a7d28920838 Parents: ed2422a Author: Vipin Rathor <v.rat...@gmail.com> Authored: Wed May 10 02:49:48 2017 -0700 Committer: Prabhjyot Singh <prabhjyotsi...@gmail.com> Committed: Mon May 15 11:19:20 2017 +0530 ---------------------------------------------------------------------- .../org/apache/zeppelin/realm/LdapRealm.java | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/5fde8c21/zeppelin-server/src/main/java/org/apache/zeppelin/realm/LdapRealm.java ---------------------------------------------------------------------- diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/realm/LdapRealm.java b/zeppelin-server/src/main/java/org/apache/zeppelin/realm/LdapRealm.java index 5740689..3381a51 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/realm/LdapRealm.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/realm/LdapRealm.java @@ -78,22 +78,24 @@ import javax.naming.ldap.PagedResultsControl; * <p>Sample config for <tt>shiro.ini</tt>: * * <p>[main] - * ldapRealm=org.apache.zeppelin.realm.LdapRealm - * ldapRealm.contextFactory=$ldapGroupContextFactory - * ldapRealm.contextFactory.authenticationMechanism=simple - * ldapRealm.contextFactory.url=ldap://localhost:33389 - * ldapRealm.userDnTemplate=uid={0},ou=people,dc=hadoop,dc=apache,dc=org + * ldapRealm = org.apache.zeppelin.realm.LdapRealm + * ldapRealm.contextFactory.url = ldap://localhost:33389 + * ldapRealm.contextFactory.authenticationMechanism = simple + * ldapRealm.contextFactory.systemUsername = uid=guest,ou=people,dc=hadoop,dc= + * apache,dc=org + * ldapRealm.contextFactory.systemPassword = S{ALIAS=ldcSystemPassword} + * ldapRealm.userDnTemplate = uid={0},ou=people,dc=hadoop,dc=apache,dc=org * # Ability to set ldap paging Size if needed default is 100 * ldapRealm.pagingSize = 200 - * ldapRealm.authorizationEnabled=true - * ldapRealm.contextFactory.systemAuthenticationMechanism=simple - * ldapRealm.searchBase=dc=hadoop,dc=apache,dc=org + * ldapRealm.authorizationEnabled = true + * ldapRealm.searchBase = dc=hadoop,dc=apache,dc=org * ldapRealm.userSearchBase = dc=hadoop,dc=apache,dc=org * ldapRealm.groupSearchBase = ou=groups,dc=hadoop,dc=apache,dc=org - * ldapRealm.groupObjectClass=groupofnames + * ldapRealm.userObjectClass = person + * ldapRealm.groupObjectClass = groupofnames * # Allow userSearchAttribute to be customized * ldapRealm.userSearchAttributeName = sAMAccountName - * ldapRealm.memberAttribute=member + * ldapRealm.memberAttribute = member * # force usernames returned from ldap to lowercase useful for AD * ldapRealm.userLowerCase = true * # ability set searchScopes subtree (default), one, base @@ -101,10 +103,6 @@ import javax.naming.ldap.PagedResultsControl; * ldapRealm.groupSearchScope = subtree; * ldapRealm.memberAttributeValueTemplate=cn={0},ou=people,dc=hadoop,dc=apache, * dc=org - * ldapRealm.contextFactory.systemUsername=uid=guest,ou=people,dc=hadoop,dc= - * apache,dc=org - * ldapRealm.contextFactory.systemPassword=S{ALIAS=ldcSystemPassword} [urls] - * **=authcBasic * # enable support for nested groups using the LDAP_MATCHING_RULE_IN_CHAIN operator * ldapRealm.groupSearchEnableMatchingRuleInChain = true * @@ -116,6 +114,9 @@ import javax.naming.ldap.PagedResultsControl; * *:ToDoItem:*:*; \ self-install_role = *:ToDoItemsFixturesService:install:* ; * \ admin_role = * * + * <p>[urls] + * **=authcBasic + * * <p>securityManager.realms = $ldapRealm * */
