You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sp...@apache.org on 2017/03/10 00:31:46 UTC
ranger git commit: RANGER-1434: Enable Group Search First causes
issues when Enable Group Sync is disabled - ranger-0.6 branch
Repository: ranger
Updated Branches:
refs/heads/ranger-0.6 9561f0d5b -> 76020e495
RANGER-1434: Enable Group Search First causes issues when Enable Group Sync is disabled - ranger-0.6 branch
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/76020e49
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/76020e49
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/76020e49
Branch: refs/heads/ranger-0.6
Commit: 76020e495ea072b3893c236397be298b2839d54c
Parents: 9561f0d
Author: Sailaja Polavarapu <sp...@hortonworks.com>
Authored: Thu Mar 9 16:31:41 2017 -0800
Committer: Sailaja Polavarapu <sp...@hortonworks.com>
Committed: Thu Mar 9 16:31:41 2017 -0800
----------------------------------------------------------------------
.../ranger/unixusersync/config/UserGroupSyncConfig.java | 3 +++
.../org/apache/ranger/usergroupsync/LdapUserGroupTest.java | 8 ++++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/76020e49/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
----------------------------------------------------------------------
diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
index 9552041..eac0073 100644
--- a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
+++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java
@@ -684,6 +684,9 @@ public class UserGroupSyncConfig {
} else {
groupSearchFirstEnabled = Boolean.valueOf(val);
}
+ if (isGroupSearchEnabled() == false) {
+ groupSearchFirstEnabled = false;
+ }
return groupSearchFirstEnabled;
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/76020e49/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java
----------------------------------------------------------------------
diff --git a/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java b/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java
index 673a88e..c3c9f90 100644
--- a/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java
+++ b/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java
@@ -304,6 +304,7 @@ public class LdapUserGroupTest extends AbstractLdapTestUnit{
config.setUserGroupMemberAttributeName("member");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
ldapBuilder.init();
PolicyMgrUserGroupBuilderTest sink = new PolicyMgrUserGroupBuilderTest();
@@ -322,6 +323,7 @@ public class LdapUserGroupTest extends AbstractLdapTestUnit{
config.setUserGroupMemberAttributeName("member");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
config.setUserSearchEnabled(true);
ldapBuilder.init();
@@ -341,6 +343,7 @@ public class LdapUserGroupTest extends AbstractLdapTestUnit{
config.setUserGroupMemberAttributeName("member");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
config.setUserSearchEnabled(true);
ldapBuilder.init();
@@ -359,6 +362,7 @@ public class LdapUserGroupTest extends AbstractLdapTestUnit{
config.setGroupSearchFilter("cn=*");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
config.setUserSearchEnabled(true);
ldapBuilder.init();
@@ -378,6 +382,7 @@ public class LdapUserGroupTest extends AbstractLdapTestUnit{
config.setUserGroupMemberAttributeName("member");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
config.setUserSearchEnabled(true);
ldapBuilder.init();
@@ -415,6 +420,7 @@ public class LdapUserGroupTest extends AbstractLdapTestUnit{
config.setUserGroupMemberAttributeName("member");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
config.setUserSearchEnabled(false);
ldapBuilder.init();
@@ -434,6 +440,7 @@ public class LdapUserGroupTest extends AbstractLdapTestUnit{
config.setUserGroupMemberAttributeName("member");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
config.setUserSearchEnabled(false);
ldapBuilder.init();
@@ -525,6 +532,7 @@ public class LdapUserGroupTest extends AbstractLdapTestUnit{
config.setUserGroupMemberAttributeName("member");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
config.setUserSearchEnabled(false);
ldapBuilder.init();