Merge branch 'master' into akolb-cli
Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/b8cc95a0 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/b8cc95a0 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/b8cc95a0 Branch: refs/heads/master Commit: b8cc95a0b62bf0e4bc1c6463849940baa72bc4c9 Parents: 332bc1b 9fd29f9 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Nov 22 15:19:39 2017 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Nov 22 15:19:39 2017 +0000 ---------------------------------------------------------------------- .../binding/hive/HiveAuthzBindingHook.java | 4 +- sentry-binding/sentry-binding-solr/pom.xml | 1 - .../solr/authz/SentrySolrPluginImpl.java | 54 ++- .../core/common/utils/PolicyFileConstants.java | 8 + .../sentry/core/common/utils/PolicyFiles.java | 48 +++ .../common/utils/StrictStringTokenizer.java | 59 +++ .../sentry/core/common/utils/Version.java | 239 ++++++++++++ .../sentry/policy/common/PrivilegeUtils.java | 11 +- .../tools/PermissionsMigrationToolCommon.java | 343 ++++++++++++++++++ .../tools/PermissionsMigrationToolSolr.java | 109 ++++++ .../db/service/persistent/SentryStore.java | 17 + .../sentry/service/thrift/HMSFollower.java | 11 +- .../tools/TestPermissionsMigrationToolSolr.java | 362 +++++++++++++++++++ .../db/service/persistent/TestSentryStore.java | 18 +- .../sentry/service/thrift/TestHMSFollower.java | 95 +++++ .../TestDbSentryOnFailureHookLoading.java | 15 +- .../tests/e2e/hdfs/TestHDFSIntegrationBase.java | 2 +- .../AbstractTestWithStaticConfiguration.java | 4 +- sentry-tests/sentry-tests-solr/pom.xml | 4 +- .../e2e/solr/AbstractSolrSentryTestCase.java | 265 ++++---------- .../e2e/solr/SolrSentryServiceTestBase.java | 211 +++++++++++ .../tests/e2e/solr/TestDocLevelOperations.java | 2 +- .../tests/e2e/solr/TestSolrAdminOperations.java | 19 +- .../e2e/solr/TestSolrCollectionOperations.java | 57 +-- .../e2e/solr/TestSolrConfigOperations.java | 2 +- .../e2e/solr/TestSolrSchemaOperations.java | 2 +- .../TestSolrWithSimpleFileProviderBackend.java | 127 +++++++ .../solr/sentry/test-authz-provider.ini | 104 +----- 28 files changed, 1785 insertions(+), 408 deletions(-) ----------------------------------------------------------------------
