You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ve...@apache.org on 2016/03/30 22:41:23 UTC
incubator-ranger git commit: Ranger-894: Fixing few issues in the
ldap tool when user search base or group search base is configured as part of
input
Repository: incubator-ranger
Updated Branches:
refs/heads/master 62532a11d -> da10d0995
Ranger-894: Fixing few issues in the ldap tool when user search base or group search base is configured as part of input
Signed-off-by: Velmurugan Periasamy <ve...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/da10d099
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/da10d099
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/da10d099
Branch: refs/heads/master
Commit: da10d09953a83695a262d3016991e444a4def797
Parents: 62532a1
Author: Sailaja Polavarapu <sp...@hortonworks.com>
Authored: Wed Mar 23 10:43:42 2016 -0700
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Wed Mar 30 14:46:57 2016 -0400
----------------------------------------------------------------------
.../apache/ranger/ldapconfigcheck/UserSync.java | 35 ++++++++++++++------
1 file changed, 25 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/da10d099/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
----------------------------------------------------------------------
diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
index 2b14500..8c99b18 100644
--- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
+++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/UserSync.java
@@ -183,7 +183,7 @@ public class UserSync {
userSearchResultEnum = ldapContext.search(userSBase,
userSFilter, userSearchControls);
while (userSearchResultEnum.hasMore()) {
- if (noOfUsers >= 1) {
+ if (noOfUsers >= 5) {
break;
}
final SearchResult userEntry = userSearchResultEnum.next();
@@ -322,8 +322,13 @@ public class UserSync {
HashMap<String, Integer> ouOccurences = new HashMap<>();
- userSearchResultEnum = ldapContext.search(searchBase,
- extendedUserSearchFilter, userSearchControls);
+ if (userSearchBase == null || userSearchBase.isEmpty()) {
+ userSearchResultEnum = ldapContext.search(searchBase,
+ extendedUserSearchFilter, userSearchControls);
+ } else {
+ userSearchResultEnum = ldapContext.search(userSearchBase,
+ extendedUserSearchFilter, userSearchControls);
+ }
noOfUsers = 0;
while (userSearchResultEnum.hasMore()) {
@@ -388,7 +393,10 @@ public class UserSync {
}
}
}
- userSearchFilter = userNameAttribute + "=*";
+
+ if (userSearchFilter == null || userSearchFilter.isEmpty()) {
+ userSearchFilter = userNameAttribute + "=*";
+ }
if (isOutputNeeded) {
installProps.println("SYNC_LDAP_USER_SEARCH_BASE=" + userSearchBase);
@@ -422,7 +430,7 @@ public class UserSync {
int noOfUsers = 0;
Attribute userNameAttr = null;
//String groupName = null;
- Attribute groupMemberAttr;
+ Attribute groupMemberAttr = null;
NamingEnumeration<SearchResult> userSearchResultEnum = null;
SearchControls userSearchControls = new SearchControls();
userSearchControls.setSearchScope(config.getUserSearchScope());
@@ -433,6 +441,7 @@ public class UserSync {
if (userGroupMemberName != null) {
userSearchAttributes.add(userGroupMemberName);
}
+
if (userSearchAttributes.size() > 0) {
userSearchControls.setReturningAttributes(userSearchAttributes.toArray(
new String[userSearchAttributes.size()]));
@@ -507,7 +516,7 @@ public class UserSync {
Set<String> groups = new HashSet<>();
groupMemberAttr = attributes.get(userGroupMemberName);
-
+
if (groupMemberAttr != null) {
NamingEnumeration<?> groupEnum = groupMemberAttr.getAll();
while (groupEnum.hasMore()) {
@@ -599,7 +608,7 @@ public class UserSync {
try {
if (groupName == null || groupName.isEmpty()) {
- groupSearchResultEnum = ldapContext.search(searchBase, null);
+ groupSearchResultEnum = ldapContext.search(searchBase, null);
} else {
int baseIndex = groupName.indexOf(",");
groupBase = groupName.substring(baseIndex + 1);
@@ -694,9 +703,13 @@ public class UserSync {
try {
HashMap<String, Integer> ouOccurences = new HashMap<>();
-
- groupSearchResultEnum = ldapContext.search(searchBase, extendedGroupSearchFilter,
+ if (groupSearchBase == null || groupSearchBase.isEmpty()) {
+ groupSearchResultEnum = ldapContext.search(searchBase, extendedGroupSearchFilter,
groupSearchControls);
+ } else {
+ groupSearchResultEnum = ldapContext.search(groupSearchBase, extendedGroupSearchFilter,
+ groupSearchControls);
+ }
while (groupSearchResultEnum.hasMore()) {
if (noOfGroups >= 20) {
@@ -759,7 +772,9 @@ public class UserSync {
}
}
- groupSearchFilter = groupNameAttrName + "=*";
+ if (groupSearchFilter == null || groupSearchFilter.isEmpty()) {
+ groupSearchFilter = groupNameAttrName + "=*";
+ }
installProps.println("SYNC_GROUP_SEARCH_BASE=" + groupSearchBase);
installProps.println("SYNC_LDAP_GROUP_SEARCH_FILTER=" + groupSearchFilter);