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/af8377f2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/af8377f2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/af8377f2 Branch: refs/heads/master Commit: af8377f27d281c5c769d8ee0ede6e3e441658c30 Parents: 90b7f0b a733b7c Author: rmani <[email protected]> Authored: Wed Dec 2 15:32:12 2015 -0800 Committer: rmani <[email protected]> Committed: Wed Dec 2 15:32:12 2015 -0800 ---------------------------------------------------------------------- .../RangerAbstractConditionEvaluator.java | 3 + .../RangerConditionEvaluator.java | 1 - .../contextenricher/RangerTagEnricher.java | 50 +- .../ranger/plugin/model/RangerTagDef.java | 1 + .../policyengine/RangerPolicyEngineImpl.java | 62 +- .../policyengine/RangerPolicyRepository.java | 25 + .../RangerAbstractPolicyEvaluator.java | 6 +- .../RangerAbstractPolicyItemEvaluator.java | 9 +- .../RangerCachedPolicyEvaluator.java | 26 +- .../RangerDefaultPolicyEvaluator.java | 96 ++- .../RangerDefaultPolicyItemEvaluator.java | 40 +- .../RangerOptimizedPolicyEvaluator.java | 79 ++- .../RangerPolicyItemEvaluator.java | 2 + .../RangerAbstractResourceMatcher.java | 6 +- .../ranger/plugin/store/AbstractTagStore.java | 45 ++ .../apache/ranger/plugin/store/TagStore.java | 1 + .../ranger/plugin/util/PolicyRefresher.java | 11 +- .../plugin/policyengine/TestPolicyEngine.java | 2 +- .../src/test/resources/log4j.properties | 35 -- agents-common/src/test/resources/log4j.xml | 53 ++ kms/scripts/dba_script.py | 8 +- kms/scripts/exportKeysToJCEKS.sh | 19 + kms/scripts/importJCEKSKeys.sh | 2 +- .../hadoop/crypto/key/Ranger2JKSUtil.java | 134 +++++ .../hadoop/crypto/key/RangerKeyStore.java | 40 +- .../kafka/authorizer/RangerKafkaAuthorizer.java | 7 +- pom.xml | 2 +- .../kafka/authorizer/RangerKafkaAuthorizer.java | 22 +- security-admin/.gitignore | 2 - security-admin/scripts/dba_script.py | 26 +- security-admin/scripts/install.properties | 23 +- security-admin/scripts/setup.sh | 110 ++-- .../ranger/biz/RangerPolicyRetriever.java | 7 +- .../apache/ranger/biz/RangerTagDBRetriever.java | 597 +++++++++++++++++++ .../java/org/apache/ranger/biz/TagDBStore.java | 24 +- .../java/org/apache/ranger/biz/UserMgr.java | 67 ++- .../java/org/apache/ranger/biz/XUserMgr.java | 51 +- .../ranger/db/XXServiceResourceElementDao.java | 12 + .../db/XXServiceResourceElementValueDao.java | 25 + .../org/apache/ranger/db/XXTagAttributeDao.java | 23 + .../apache/ranger/db/XXTagAttributeDefDao.java | 23 + .../java/org/apache/ranger/db/XXTagDefDao.java | 13 + .../org/apache/ranger/rest/ServiceREST.java | 198 +++--- .../ranger/rest/ServiceTagsProcessor.java | 27 +- .../handler/RangerAuthenticationProvider.java | 28 +- .../java/org/apache/ranger/solr/SolrMgr.java | 2 +- .../resources/META-INF/jpa_named_queries.xml | 77 ++- .../conf.dist/security-applicationContext.xml | 1 - .../src/test/resources/log4j.properties | 35 -- security-admin/src/test/resources/log4j.xml | 53 ++ src/main/assembly/kms.xml | 1 + .../ldapconfigcheck/scripts/run.sh | 8 +- .../ldapconfigcheck/CommandLineOptions.java | 14 +- .../process/LdapUserGroupBuilder.java | 388 ++++++------ unixauthservice/scripts/setup.py | 4 +- 55 files changed, 2014 insertions(+), 612 deletions(-) ----------------------------------------------------------------------
