Merge branch 'master' into tag-policy
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/3e4af58f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3e4af58f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3e4af58f Branch: refs/heads/tag-policy Commit: 3e4af58f53a31da151cad1b1d91602861db88f26 Parents: 0247590 f31274b Author: Madhan Neethiraj <[email protected]> Authored: Fri May 22 18:20:19 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Fri May 22 18:20:19 2015 -0700 ---------------------------------------------------------------------- .../RangerAbstractConditionEvaluator.java | 43 +++ .../RangerConditionEvaluator.java | 7 +- .../conditionevaluator/RangerIpMatcher.java | 8 +- .../conditionevaluator/RangerSimpleMatcher.java | 8 +- .../RangerTimeOfDayMatcher.java | 8 +- .../RangerAbstractContextEnricher.java | 10 +- .../contextenricher/RangerContextEnricher.java | 4 +- .../contextenricher/RangerCountryProvider.java | 5 +- .../contextenricher/RangerProjectProvider.java | 5 +- .../policyengine/RangerPolicyRepository.java | 3 +- .../RangerDefaultPolicyEvaluator.java | 8 +- .../RangerAbstractResourceMatcher.java | 26 +- .../RangerPathResourceMatcher.java | 10 +- .../resourcematcher/RangerResourceMatcher.java | 9 +- .../conditionevaluator/RangerIpMatcherTest.java | 8 +- .../RangerSimpleMatcherTest.java | 36 +- .../RangerTimeOfDayMatcherTest.java | 4 +- .../RangerDefaultPolicyEvaluatorTest.java | 13 +- .../resourcematcher/TestResourceMatcher.java | 15 +- .../test_resourcematcher_default.json | 78 +++-- .../test_resourcematcher_path.json | 84 +++-- .../scripts/ranger-admin-services.sh | 10 +- kms/scripts/ranger-kms | 10 +- .../ranger/services/kms/client/KMSClient.java | 306 +++++++++++------ security-admin/scripts/db_setup.py | 17 +- security-admin/scripts/dba_script.py | 13 +- security-admin/scripts/install.properties | 5 +- .../scripts/ranger-admin-site-template.xml | 2 +- security-admin/scripts/setup.sh | 63 +++- security-admin/scripts/upgrade_admin.py | 2 +- .../java/org/apache/ranger/biz/KmsKeyMgr.java | 331 ++++++++++++++----- .../apache/ranger/common/PropertiesUtil.java | 19 ++ .../conf.dist/ranger-admin-default-site.xml | 6 +- .../resources/conf.dist/ranger-admin-site.xml | 18 +- .../scripts/ranger-usersync-services.sh | 10 +- 35 files changed, 867 insertions(+), 337 deletions(-) ----------------------------------------------------------------------
