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:14:53 UTC
ranger git commit: RANGER-1434: Enable Group Search First causes
issues when Enable Group Sync is disabled
Repository: ranger
Updated Branches:
refs/heads/master a15a0bd81 -> 6d862ed43
RANGER-1434: Enable Group Search First causes issues when Enable Group Sync is disabled
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/6d862ed4
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/6d862ed4
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/6d862ed4
Branch: refs/heads/master
Commit: 6d862ed4339a4589c4ce1be38a119cd2a49e5a5e
Parents: a15a0bd
Author: Sailaja Polavarapu <sp...@hortonworks.com>
Authored: Thu Mar 9 16:14:44 2017 -0800
Committer: Sailaja Polavarapu <sp...@hortonworks.com>
Committed: Thu Mar 9 16:14:44 2017 -0800
----------------------------------------------------------------------
.../unixusersync/config/UserGroupSyncConfig.java | 3 +++
.../apache/ranger/usergroupsync/TestLdapUserGroup.java | 13 ++++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/6d862ed4/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 90f9997..2c9365d 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
@@ -643,6 +643,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/6d862ed4/ugsync/src/test/java/org/apache/ranger/usergroupsync/TestLdapUserGroup.java
----------------------------------------------------------------------
diff --git a/ugsync/src/test/java/org/apache/ranger/usergroupsync/TestLdapUserGroup.java b/ugsync/src/test/java/org/apache/ranger/usergroupsync/TestLdapUserGroup.java
index b4c9065..e5bf110 100644
--- a/ugsync/src/test/java/org/apache/ranger/usergroupsync/TestLdapUserGroup.java
+++ b/ugsync/src/test/java/org/apache/ranger/usergroupsync/TestLdapUserGroup.java
@@ -248,7 +248,7 @@ public class TestLdapUserGroup extends AbstractLdapTestUnit{
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
config.setGroupSearchEnabled(false);
- config.setGroupSearchFirstEnabled(false);
+ config.setGroupSearchFirstEnabled(true);
ldapBuilder.init();
PolicyMgrUserGroupBuilderTest sink = new PolicyMgrUserGroupBuilderTest();
sink.init();
@@ -304,6 +304,7 @@ public class TestLdapUserGroup 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 TestLdapUserGroup 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 TestLdapUserGroup 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 TestLdapUserGroup 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 TestLdapUserGroup 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 TestLdapUserGroup 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 TestLdapUserGroup 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 TestLdapUserGroup extends AbstractLdapTestUnit{
config.setUserGroupMemberAttributeName("member");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
config.setUserSearchEnabled(false);
ldapBuilder.init();
@@ -605,6 +613,7 @@ public class TestLdapUserGroup extends AbstractLdapTestUnit{
config.setUserGroupMemberAttributeName("member");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
config.setUserSearchEnabled(true);
config.setDeltaSync(true);
@@ -626,6 +635,7 @@ public class TestLdapUserGroup extends AbstractLdapTestUnit{
config.setUserGroupMemberAttributeName("member");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
config.setUserSearchEnabled(true);
config.setDeltaSync(true);
@@ -647,6 +657,7 @@ public class TestLdapUserGroup extends AbstractLdapTestUnit{
config.setUserGroupMemberAttributeName("member");
config.setUserObjectClass("organizationalPerson");
config.setGroupObjectClass("groupOfNames");
+ config.setGroupSearchEnabled(true);
config.setGroupSearchFirstEnabled(true);
config.setUserSearchEnabled(false);
config.setDeltaSync(true);