Repository: incubator-ranger Updated Branches: refs/heads/master 3595251bc -> b48e0a3f9
RANGER-978 Removing creation of default email address in usersync and removing generation of GUID in REST API when empty Signed-off-by: Velmurugan Periasamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/d501faa7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/d501faa7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/d501faa7 Branch: refs/heads/master Commit: d501faa79512a50f79c3ab3d3e84c1e9ce26d8e2 Parents: 3595251 Author: Bryan Bende <[email protected]> Authored: Mon May 9 15:45:52 2016 -0400 Committer: Velmurugan Periasamy <[email protected]> Committed: Mon May 16 11:18:29 2016 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/ranger/biz/UserMgr.java | 6 ++---- .../ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d501faa7/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java index bd7608d..0e042fe 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java @@ -210,8 +210,7 @@ public class UserMgr { // emailAddress String emailAddress = userProfile.getEmailAddress(); if (stringUtil.isEmpty(emailAddress)) { - String randomString = guidUtil.genGUID(); - userProfile.setEmailAddress(randomString); + userProfile.setEmailAddress(null); updateUser = true; } else { if (stringUtil.validateEmail(emailAddress)) { @@ -1153,8 +1152,7 @@ public class UserMgr { MessageEnums.OPER_NOT_ALLOWED_FOR_STATE); } } else { - String randomEmail = guidUtil.genGUID(); - userProfile.setEmailAddress(randomEmail); + userProfile.setEmailAddress(null); xXPortalUser = this.createUser(userProfile, RangerCommonEnums.STATUS_ENABLED); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d501faa7/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java ---------------------------------------------------------------------- diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java index 068c9df..df029c2 100644 --- a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java +++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java @@ -779,7 +779,6 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink { userInfo.setLoginId(aUserName); userInfo.setFirstName(aUserName); userInfo.setLastName(aUserName); - userInfo.setEmailAddress(aUserName + "@" + LOCAL_HOSTNAME); if (authenticationType != null && AUTH_KERBEROS.equalsIgnoreCase(authenticationType) && SecureClientLogin.isKerberosCredentialExists(principal, keytab)) { try {
