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/3487811e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3487811e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3487811e Branch: refs/heads/master Commit: 3487811ecb3717d306f3c6834b5dae3d6c6c2892 Parents: d4ca4ef a697bca Author: rmani <[email protected]> Authored: Tue Mar 31 09:38:21 2015 -0700 Committer: rmani <[email protected]> Committed: Tue Mar 31 09:38:21 2015 -0700 ---------------------------------------------------------------------- .../ranger/plugin/model/RangerPolicy.java | 25 +- .../ranger/plugin/model/RangerServiceDef.java | 200 +++++++++++-- .../policyengine/RangerPolicyRepository.java | 4 +- .../RangerDefaultPolicyEvaluator.java | 6 +- .../RangerAbstractResourceMatcher.java | 10 +- .../RangerDefaultResourceMatcher.java | 10 - .../RangerPathResourceMatcher.java | 9 - .../ranger/plugin/service/RangerBasePlugin.java | 4 +- .../service-defs/ranger-servicedef-hbase.json | 19 ++ .../service-defs/ranger-servicedef-hdfs.json | 22 ++ .../service-defs/ranger-servicedef-hive.json | 17 ++ .../service-defs/ranger-servicedef-knox.json | 8 + .../service-defs/ranger-servicedef-solr.json | 132 +++++++++ .../service-defs/ranger-servicedef-storm.json | 19 ++ .../service-defs/ranger-servicedef-yarn.json | 8 + .../ranger/plugin/store/TestServiceStore.java | 2 +- embeddedwebserver/scripts/ranger-admin-initd | 42 ++- .../hbase/AuthorizationSession.java | 8 +- .../authorization/hbase/HbaseAuthUtilsImpl.java | 8 - .../hbase/RangerAuthorizationCoprocessor.java | 2 +- .../RangerAuthorizationCoprocessorBase.java | 33 +++ .../services/hbase/client/HBaseResourceMgr.java | 6 +- .../namenode/RangerFSPermissionChecker.java | 2 +- .../agent/HadoopAuthClassTransformer.java | 51 ++-- .../hive/authorizer/RangerHiveAuthorizer.java | 11 +- .../services/hive/client/HiveResourceMgr.java | 10 +- .../main/java/org/apache/util/sql/Jisql.java | 5 +- .../hadoop/crypto/key/RangerKeyStore.java | 5 +- .../crypto/key/RangerKeyStoreProvider.java | 6 +- .../authorization/knox/RangerPDPKnoxFilter.java | 4 +- .../ranger/services/knox/client/KnoxClient.java | 47 +-- .../apache/ranger/knox/client/KnoxClient.java | 28 +- migration-util/bin/import_ranger_to_ambari.py | 34 ++- plugin-solr/.gitignore | 1 + .../conf/ranger-policymgr-ssl-changes.cfg | 23 ++ plugin-solr/conf/ranger-policymgr-ssl.xml | 63 ++++ plugin-solr/conf/ranger-solr-audit-changes.cfg | 36 +++ plugin-solr/conf/ranger-solr-audit.xml | 235 +++++++++++++++ .../conf/ranger-solr-security-changes.cfg | 26 ++ plugin-solr/conf/ranger-solr-security.xml | 67 +++++ plugin-solr/pom.xml | 56 ++++ plugin-solr/scripts/install.properties | 112 +++++++ .../scripts/solr-plugin-install.properties | 23 ++ .../solr/authorizer/RangerSolrAuthorizer.java | 37 +++ .../ranger/services/solr/RangerServiceSolr.java | 78 +++++ .../services/solr/client/ServiceSolrClient.java | 292 +++++++++++++++++++ .../solr/client/ServiceSolrConnectionMgr.java | 60 ++++ .../ranger/services/yarn/client/YarnClient.java | 3 +- .../services/yarn/client/YarnResourceMgr.java | 5 +- pom.xml | 6 +- security-admin/scripts/setup.sh | 8 +- .../java/org/apache/ranger/biz/AssetMgr.java | 44 ++- .../java/org/apache/ranger/biz/ServiceMgr.java | 4 +- .../java/org/apache/ranger/biz/SessionMgr.java | 5 +- .../java/org/apache/ranger/biz/UserMgr.java | 27 +- .../java/org/apache/ranger/biz/XUserMgr.java | 16 +- .../org/apache/ranger/common/SearchGroup.java | 4 +- .../org/apache/ranger/common/SearchUtil.java | 2 +- .../org/apache/ranger/common/ServiceUtil.java | 4 +- .../java/org/apache/ranger/rest/AssetREST.java | 2 +- .../java/org/apache/ranger/rest/PublicAPIs.java | 15 +- .../org/apache/ranger/rest/ServiceREST.java | 28 +- .../RangerSecurityContextFormationFilter.java | 94 +++--- .../ranger/service/RangerPolicyService.java | 16 +- .../service/RangerServiceDefServiceBase.java | 2 +- .../ranger/service/RangerServiceService.java | 4 +- .../apache/ranger/service/XAssetService.java | 6 +- .../apache/ranger/service/XAuditMapService.java | 6 +- .../apache/ranger/service/XPermMapService.java | 8 +- .../ranger/service/XPortalUserService.java | 3 +- .../ranger/service/XRepositoryService.java | 4 +- .../apache/ranger/service/XResourceService.java | 15 +- .../apache/ranger/service/XTrxLogService.java | 2 +- .../org/apache/ranger/service/XUserService.java | 2 +- .../java/org/apache/ranger/solr/SolrMgr.java | 41 +-- .../main/resources/sample.xa_system.properties | 7 + src/main/assembly/plugin-solr.xml | 157 ++++++++++ .../storm/authorizer/RangerStormAuthorizer.java | 4 +- .../services/storm/client/StormResourceMgr.java | 5 + .../process/LdapUserGroupBuilder.java | 3 + .../config/UserGroupSyncConfig.java | 5 +- .../unix/jaas/RemoteUnixLoginModule.java | 9 +- 82 files changed, 2154 insertions(+), 318 deletions(-) ----------------------------------------------------------------------
