Return-Path: X-Original-To: apmail-ranger-commits-archive@www.apache.org Delivered-To: apmail-ranger-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E9FE9182A5 for ; Mon, 23 Nov 2015 22:09:00 +0000 (UTC) Received: (qmail 90645 invoked by uid 500); 23 Nov 2015 22:09:00 -0000 Delivered-To: apmail-ranger-commits-archive@ranger.apache.org Received: (qmail 90614 invoked by uid 500); 23 Nov 2015 22:09:00 -0000 Mailing-List: contact commits-help@ranger.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ranger.incubator.apache.org Delivered-To: mailing list commits@ranger.incubator.apache.org Received: (qmail 90605 invoked by uid 99); 23 Nov 2015 22:09:00 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Nov 2015 22:09:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 4C1C2C440B for ; Mon, 23 Nov 2015 22:09:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.227 X-Spam-Level: * X-Spam-Status: No, score=1.227 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id STsw9k6hrYrB for ; Mon, 23 Nov 2015 22:08:55 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 07BA0439F8 for ; Mon, 23 Nov 2015 22:08:54 +0000 (UTC) Received: (qmail 90559 invoked by uid 99); 23 Nov 2015 22:08:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Nov 2015 22:08:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 40D8AE08EF; Mon, 23 Nov 2015 22:08:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vel@apache.org To: commits@ranger.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-ranger git commit: RANGER-720: Handling some error cases and fixing the issues that were reported in the Jira Date: Mon, 23 Nov 2015 22:08:54 +0000 (UTC) Repository: incubator-ranger Updated Branches: refs/heads/master 04c5dc364 -> 7b7b314d8 RANGER-720: Handling some error cases and fixing the issues that were reported in the Jira Signed-off-by: Velmurugan Periasamy Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/7b7b314d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/7b7b314d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/7b7b314d Branch: refs/heads/master Commit: 7b7b314d89fab7c40f747c04c3bca989c4593de3 Parents: 04c5dc3 Author: Sailaja Polavarapu Authored: Mon Nov 16 13:01:23 2015 -0800 Committer: Velmurugan Periasamy Committed: Mon Nov 23 17:08:36 2015 -0500 ---------------------------------------------------------------------- .../ldapconfigcheck/LdapConfigCheckMain.java | 6 +----- .../apache/ranger/ldapconfigcheck/UserSync.java | 17 ++++++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/7b7b314d/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfigCheckMain.java ---------------------------------------------------------------------- diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfigCheckMain.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfigCheckMain.java index ad56b2e..073df27 100644 --- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfigCheckMain.java +++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/LdapConfigCheckMain.java @@ -200,10 +200,6 @@ public class LdapConfigCheckMain { msg = "ranger.usersync.ldap.user.objectclass "; throw new NullArgumentException(msg); } - if (userSyncObj.getUserGroupMemberName() == null || userSyncObj.getUserGroupMemberName().isEmpty()) { - msg = "ranger.usersync.ldap.user.groupnameattribute "; - throw new NullArgumentException(msg); - } if ((userSyncObj.getUserSearchBase() == null || userSyncObj.getUserSearchBase().isEmpty()) && (userSyncObj.getSearchBase() == null || userSyncObj.getSearchBase().isEmpty())) { msg = "ranger.usersync.ldap.user.searchbase and " + @@ -223,7 +219,7 @@ public class LdapConfigCheckMain { msg = "ranger.usersync.group.objectclass "; throw new NullArgumentException(msg); } - if (userSyncObj.getUserGroupMemberName() == null || userSyncObj.getUserGroupMemberName().isEmpty()) { + if (userSyncObj.getGroupMemberName() == null || userSyncObj.getGroupMemberName().isEmpty()) { msg = "ranger.usersync.group.memberattributename "; throw new NullArgumentException(msg); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/7b7b314d/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 53da9f2..f8b9aea 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 @@ -258,7 +258,7 @@ public class UserSync { groupMemberAttr = attributes.get(userGroupMemAttrValues[i]); if (groupMemberAttr != null) { userGroupMemberName = userGroupMemAttrValues[i]; - groupName = groupMemberAttr.get(1).toString(); + groupName = groupMemberAttr.get(0).toString(); break; } } @@ -421,7 +421,7 @@ public class UserSync { public void getAllUsers(LdapContext ldapContext) throws Throwable { int noOfUsers = 0; Attribute userNameAttr = null; - String groupName = null; + //String groupName = null; Attribute groupMemberAttr; NamingEnumeration userSearchResultEnum = null; SearchControls userSearchControls = new SearchControls(); @@ -598,12 +598,15 @@ public class UserSync { groupSearchControls.setSearchScope(config.getGroupSearchScope()); try { - int baseIndex = groupName.indexOf(","); - groupBase = groupName.substring(baseIndex + 1); - groupFilter = groupName.substring(0, baseIndex); - groupSearchResultEnum = ldapContext.search(groupBase, groupFilter, + if (groupName == null || groupName.isEmpty()) { + groupSearchResultEnum = ldapContext.search(searchBase, null); + } else { + int baseIndex = groupName.indexOf(","); + groupBase = groupName.substring(baseIndex + 1); + groupFilter = groupName.substring(0, baseIndex); + groupSearchResultEnum = ldapContext.search(groupBase, groupFilter, groupSearchControls); - + } noOfGroups = 0; while (groupSearchResultEnum.hasMore()) { if (noOfGroups >= 1) {