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 <[email protected]> Authored: Fri Apr 24 11:44:33 2015 -0700 Committer: rmani <[email protected]> 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 ----------------------------------------------------------------------
