You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by rm...@apache.org on 2015/04/24 20:44:44 UTC
[1/2] incubator-ranger git commit: Ranger-427:UserSync Process didn't
sync the group when groups are added to the user at later time
Repository: incubator-ranger
Updated Branches:
refs/heads/master 20baa3f88 -> 82960509b
Ranger-427:UserSync Process didn't sync the group when groups are added to the user at later time
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/c8376979
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/c8376979
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/c8376979
Branch: refs/heads/master
Commit: c8376979a73712a8b09410e16bba24cc513a1f6b
Parents: 168c135
Author: rmani <rm...@hortonworks.com>
Authored: Fri Apr 24 11:44:19 2015 -0700
Committer: rmani <rm...@hortonworks.com>
Committed: Fri Apr 24 11:44:19 2015 -0700
----------------------------------------------------------------------
.../process/PolicyMgrUserGroupBuilder.java | 24 ++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c8376979/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 6d78d25..84d9555 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
@@ -305,7 +305,7 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
LOG.debug("INFO: addPMXAGroupToUser(" + userName + "," + g + ")" ) ;
}
if (! isMockRun) {
- addXUserGroupInfo(user, addGroups) ;
+ addXUserGroupInfo(user, addGroups) ;
}
for(String g : delGroups) {
@@ -526,6 +526,8 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
private XUserGroupInfo addXUserGroupInfo(XUserInfo aUserInfo, XGroupInfo aGroupInfo) {
+ XUserGroupInfo ret = null ;
+
XUserGroupInfo ugInfo = new XUserGroupInfo() ;
ugInfo.setUserId(aUserInfo.getId());
@@ -534,7 +536,25 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink {
// ugInfo.setParentGroupId("1");
- return ugInfo ;
+ Client c = getClient() ;
+
+ WebResource r = c.resource(getURL(PM_ADD_USER_GROUP_LINK_URI)) ;
+
+ Gson gson = new GsonBuilder().create() ;
+
+ String jsonString = gson.toJson(ugInfo) ;
+
+ String response = r.accept(MediaType.APPLICATION_JSON_TYPE).type(MediaType.APPLICATION_JSON_TYPE).post(String.class, jsonString) ;
+
+ LOG.debug("RESPONSE: [" + response + "]") ;
+
+ ret = gson.fromJson(response, XUserGroupInfo.class) ;
+
+ if (ret != null) {
+ addUserGroupToList(ret);
+ }
+
+ return ret ;
}
[2/2] incubator-ranger git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ranger
Posted by rm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ranger
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/82960509
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/82960509
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/82960509
Branch: refs/heads/master
Commit: 82960509bd59219fb537f76a3620e8fc21b1abfc
Parents: c837697 20baa3f
Author: rmani <rm...@hortonworks.com>
Authored: Fri Apr 24 11:44:33 2015 -0700
Committer: rmani <rm...@hortonworks.com>
Committed: Fri Apr 24 11:44:33 2015 -0700
----------------------------------------------------------------------
.../service-defs/ranger-servicedef-kms.json | 4 +-
kms/scripts/importJCEKSKeys.sh | 19 ++
.../hadoop/crypto/key/JKS2RangerUtil.java | 143 +++++++++++++++
.../hadoop/crypto/key/RangerKeyStore.java | 88 +++++++++-
.../crypto/key/RangerKeyStoreProvider.java | 8 +-
.../kms/authorizer/RangerKmsAuthorizer.java | 55 ++++--
.../ranger/services/kms/client/KMSClient.java | 175 +++++++++----------
pom.xml | 4 +
.../db/mysql/patches/012-createusersyncuser.sql | 48 +++++
.../oracle/patches/012-createusersyncuser.sql | 50 ++++++
.../db/postgres/xa_core_db_postgres.sql | 4 +
.../db/sqlserver/xa_core_db_sqlserver.sql | 6 +
security-admin/scripts/db_setup.py | 46 +++--
security-admin/scripts/dba_script.py | 69 +++++---
security-admin/src/bin/ranger_install.py | 9 +-
.../java/org/apache/ranger/biz/UserMgr.java | 38 +++-
.../java/org/apache/ranger/biz/XUserMgr.java | 141 ++++++++++++++-
.../org/apache/ranger/common/RESTErrorUtil.java | 22 +++
.../java/org/apache/ranger/rest/PublicAPIs.java | 28 ++-
.../java/org/apache/ranger/rest/UserREST.java | 1 -
.../java/org/apache/ranger/rest/XUserREST.java | 7 +
.../conf.dist/security-applicationContext.xml | 4 +-
.../main/webapp/scripts/views/kms/KmsKeyForm.js | 1 -
.../java/org/apache/ranger/biz/TestUserMgr.java | 3 +
src/main/assembly/kms.xml | 4 +-
src/main/assembly/plugin-yarn.xml | 8 -
src/main/assembly/usersync.xml | 1 +
.../process/PolicyMgrUserGroupBuilder.java | 9 +-
.../config/UserGroupSyncConfig.java | 60 ++++++-
.../process/PolicyMgrUserGroupBuilder.java | 15 +-
.../conf.dist/unixauthservice.properties | 4 +
.../scripts/updatepolicymgrpassword.py | 171 ++++++++++++++++++
.../scripts/updatepolicymgrpassword.sh | 128 ++++++++++++++
33 files changed, 1181 insertions(+), 192 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/82960509/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java
----------------------------------------------------------------------