Repository: sentry Updated Branches: refs/heads/master 3bff594d8 -> 9da220abc
SENTRY-1436: Move PolicyFiles from sentry-provider-file to sentry-core-common(Colin Ma, reviewed by Dapeng Sun) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/9da220ab Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/9da220ab Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/9da220ab Branch: refs/heads/master Commit: 9da220abce69fbb2bb4e4467edab59622f96a241 Parents: 3bff594 Author: Colin Ma <[email protected]> Authored: Wed Aug 3 11:14:25 2016 +0800 Committer: Colin Ma <[email protected]> Committed: Wed Aug 3 11:14:25 2016 +0800 ---------------------------------------------------------------------- .../hive/SentryIniPolicyFileFormatter.java | 2 +- .../binding/hive/TestHiveAuthzBindings.java | 2 +- ...sourceAuthorizationProviderGeneralCases.java | 2 +- .../hive/TestSimpleDBPolicyEngineDFS.java | 2 +- .../hive/TestSimpleDBPolicyEngineLocalFS.java | 2 +- ...tKafkaAuthorizationProviderGeneralCases.java | 2 +- .../policy/kafka/TestKafkaPolicyEngineDFS.java | 2 +- .../kafka/TestKafkaPolicyEngineLocalFS.java | 2 +- .../binding/solr/TestSolrAuthzBinding.java | 2 +- ...SearchAuthorizationProviderGeneralCases.java | 2 +- .../policy/solr/TestSearchPolicyEngineDFS.java | 2 +- .../solr/TestSearchPolicyEngineLocalFS.java | 2 +- ...tSqoopAuthorizationProviderGeneralCases.java | 2 +- .../policy/sqoop/TestSqoopPolicyEngineDFS.java | 2 +- .../sqoop/TestSqoopPolicyEngineLocalFS.java | 2 +- .../sqoop/TestSentryAuthorizationHander.java | 2 +- .../sentry/core/common/utils/PolicyFiles.java | 96 ++++++++++++++++++++ ...ndexerAuthorizationProviderGeneralCases.java | 2 +- .../indexer/TestIndexerPolicyEngineDFS.java | 2 +- .../indexer/TestIndexerPolicyEngineLocalFS.java | 2 +- .../provider/cache/PrivilegeCacheTestImpl.java | 2 +- .../provider/file/LocalGroupMappingService.java | 1 + .../sentry/provider/file/PolicyFiles.java | 96 -------------------- .../file/SimpleFileProviderBackend.java | 1 + .../provider/file/TestLocalGroupMapping.java | 1 + .../file/TestSimpleFileProvderBackend.java | 1 + .../sentry/tests/e2e/hive/TestSandboxOps.java | 2 +- 27 files changed, 121 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-hive-common/src/main/java/org/apache/sentry/binding/hive/SentryIniPolicyFileFormatter.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-hive-common/src/main/java/org/apache/sentry/binding/hive/SentryIniPolicyFileFormatter.java b/sentry-binding/sentry-binding-hive-common/src/main/java/org/apache/sentry/binding/hive/SentryIniPolicyFileFormatter.java index 29b3192..b8ec8a1 100644 --- a/sentry-binding/sentry-binding-hive-common/src/main/java/org/apache/sentry/binding/hive/SentryIniPolicyFileFormatter.java +++ b/sentry-binding/sentry-binding-hive-common/src/main/java/org/apache/sentry/binding/hive/SentryIniPolicyFileFormatter.java @@ -30,7 +30,7 @@ import org.apache.hadoop.fs.Path; import org.apache.sentry.core.common.exception.SentryConfigurationException; import org.apache.sentry.core.common.utils.SentryConstants; import org.apache.sentry.core.common.utils.PolicyFileConstants; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.apache.shiro.config.Ini; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindings.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindings.java b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindings.java index 2ad7dc4..a41d1bd 100644 --- a/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindings.java +++ b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindings.java @@ -43,7 +43,7 @@ import org.apache.sentry.core.model.db.Database; import org.apache.sentry.core.model.db.Server; import org.apache.sentry.core.model.db.Table; import org.apache.sentry.core.common.exception.SentryGroupNotFoundException; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.After; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestResourceAuthorizationProviderGeneralCases.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestResourceAuthorizationProviderGeneralCases.java b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestResourceAuthorizationProviderGeneralCases.java index 2ace656..5d005f7 100644 --- a/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestResourceAuthorizationProviderGeneralCases.java +++ b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestResourceAuthorizationProviderGeneralCases.java @@ -40,7 +40,7 @@ import org.apache.sentry.core.model.db.Table; import org.apache.sentry.core.common.service.GroupMappingService; import org.apache.sentry.provider.common.ResourceAuthorizationProvider; import org.apache.sentry.provider.file.HadoopGroupResourceAuthorizationProvider; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.After; import org.junit.Test; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestSimpleDBPolicyEngineDFS.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestSimpleDBPolicyEngineDFS.java b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestSimpleDBPolicyEngineDFS.java index f86516f..de77d74 100644 --- a/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestSimpleDBPolicyEngineDFS.java +++ b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestSimpleDBPolicyEngineDFS.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.sentry.core.common.ActiveRoleSet; import org.apache.sentry.policy.common.PolicyEngine; import org.apache.sentry.core.common.utils.PolicyFile; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestSimpleDBPolicyEngineLocalFS.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestSimpleDBPolicyEngineLocalFS.java b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestSimpleDBPolicyEngineLocalFS.java index c986d7e..61e8c4a 100644 --- a/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestSimpleDBPolicyEngineLocalFS.java +++ b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/policy/hive/TestSimpleDBPolicyEngineLocalFS.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.junit.Assert; import org.apache.commons.io.FileUtils; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; public class TestSimpleDBPolicyEngineLocalFS extends AbstractTestSimplePolicyEngine { http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaAuthorizationProviderGeneralCases.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaAuthorizationProviderGeneralCases.java b/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaAuthorizationProviderGeneralCases.java index 07f4d7d..af92659 100644 --- a/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaAuthorizationProviderGeneralCases.java +++ b/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaAuthorizationProviderGeneralCases.java @@ -40,7 +40,7 @@ import org.apache.sentry.core.model.kafka.KafkaPrivilegeModel; import org.apache.sentry.core.model.kafka.Topic; import org.apache.sentry.provider.common.HadoopGroupResourceAuthorizationProvider; import org.apache.sentry.provider.common.ResourceAuthorizationProvider; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.After; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaPolicyEngineDFS.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaPolicyEngineDFS.java b/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaPolicyEngineDFS.java index 4299b1f..1555b89 100644 --- a/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaPolicyEngineDFS.java +++ b/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaPolicyEngineDFS.java @@ -27,7 +27,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.AfterClass; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaPolicyEngineLocalFS.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaPolicyEngineLocalFS.java b/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaPolicyEngineLocalFS.java index 9a69f1c..682b6c7 100644 --- a/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaPolicyEngineLocalFS.java +++ b/sentry-binding/sentry-binding-kafka/src/test/java/org/apache/sentry/policy/kafka/TestKafkaPolicyEngineLocalFS.java @@ -24,7 +24,7 @@ import java.io.IOException; import junit.framework.Assert; import org.apache.commons.io.FileUtils; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; public class TestKafkaPolicyEngineLocalFS extends AbstractTestKafkaPolicyEngine { http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/binding/solr/TestSolrAuthzBinding.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/binding/solr/TestSolrAuthzBinding.java b/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/binding/solr/TestSolrAuthzBinding.java index c88ac94..7a88d90 100644 --- a/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/binding/solr/TestSolrAuthzBinding.java +++ b/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/binding/solr/TestSolrAuthzBinding.java @@ -44,7 +44,7 @@ import org.apache.sentry.core.common.Subject; import org.apache.sentry.core.model.search.Collection; import org.apache.sentry.core.model.search.SearchModelAction; import org.apache.sentry.core.common.exception.SentryGroupNotFoundException; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.After; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchAuthorizationProviderGeneralCases.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchAuthorizationProviderGeneralCases.java b/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchAuthorizationProviderGeneralCases.java index 2c82dc7..1f28f64 100644 --- a/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchAuthorizationProviderGeneralCases.java +++ b/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchAuthorizationProviderGeneralCases.java @@ -37,7 +37,7 @@ import org.apache.sentry.core.model.search.SearchPrivilegeModel; import org.apache.sentry.core.common.service.GroupMappingService; import org.apache.sentry.provider.common.ResourceAuthorizationProvider; import org.apache.sentry.provider.file.HadoopGroupResourceAuthorizationProvider; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.After; import org.junit.Test; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchPolicyEngineDFS.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchPolicyEngineDFS.java b/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchPolicyEngineDFS.java index 3e3aa47..59283ea 100644 --- a/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchPolicyEngineDFS.java +++ b/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchPolicyEngineDFS.java @@ -25,7 +25,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.AfterClass; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchPolicyEngineLocalFS.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchPolicyEngineLocalFS.java b/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchPolicyEngineLocalFS.java index a7928b5..0ff4502 100644 --- a/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchPolicyEngineLocalFS.java +++ b/sentry-binding/sentry-binding-solr/src/test/java/org/apache/sentry/policy/solr/TestSearchPolicyEngineLocalFS.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.junit.Assert; import org.apache.commons.io.FileUtils; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; public class TestSearchPolicyEngineLocalFS extends AbstractTestSearchPolicyEngine { http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopAuthorizationProviderGeneralCases.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopAuthorizationProviderGeneralCases.java b/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopAuthorizationProviderGeneralCases.java index a3d96fe..aa734f0 100644 --- a/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopAuthorizationProviderGeneralCases.java +++ b/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopAuthorizationProviderGeneralCases.java @@ -41,7 +41,7 @@ import org.apache.sentry.core.model.sqoop.SqoopPrivilegeModel; import org.apache.sentry.core.common.service.GroupMappingService; import org.apache.sentry.provider.common.ResourceAuthorizationProvider; import org.apache.sentry.provider.common.HadoopGroupResourceAuthorizationProvider; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.After; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopPolicyEngineDFS.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopPolicyEngineDFS.java b/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopPolicyEngineDFS.java index c156ed0..5025dce 100644 --- a/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopPolicyEngineDFS.java +++ b/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopPolicyEngineDFS.java @@ -27,7 +27,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.AfterClass; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopPolicyEngineLocalFS.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopPolicyEngineLocalFS.java b/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopPolicyEngineLocalFS.java index b30d04b..beba6cd 100644 --- a/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopPolicyEngineLocalFS.java +++ b/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/policy/sqoop/TestSqoopPolicyEngineLocalFS.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.junit.Assert; import org.apache.commons.io.FileUtils; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; public class TestSqoopPolicyEngineLocalFS extends AbstractTestSqoopPolicyEngine { @Override http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/sqoop/TestSentryAuthorizationHander.java ---------------------------------------------------------------------- diff --git a/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/sqoop/TestSentryAuthorizationHander.java b/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/sqoop/TestSentryAuthorizationHander.java index c7cca54..2c6d61c 100644 --- a/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/sqoop/TestSentryAuthorizationHander.java +++ b/sentry-binding/sentry-binding-sqoop/src/test/java/org/apache/sentry/sqoop/TestSentryAuthorizationHander.java @@ -21,7 +21,7 @@ import static org.junit.Assert.fail; import java.io.File; import org.apache.commons.io.FileUtils; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.apache.sentry.sqoop.conf.SqoopAuthConf; import org.apache.sentry.sqoop.conf.SqoopAuthConf.AuthzConfVars; import org.apache.sqoop.security.SecurityFactory; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-core/sentry-core-common/src/main/java/org/apache/sentry/core/common/utils/PolicyFiles.java ---------------------------------------------------------------------- diff --git a/sentry-core/sentry-core-common/src/main/java/org/apache/sentry/core/common/utils/PolicyFiles.java b/sentry-core/sentry-core-common/src/main/java/org/apache/sentry/core/common/utils/PolicyFiles.java new file mode 100644 index 0000000..4a632bc --- /dev/null +++ b/sentry-core/sentry-core-common/src/main/java/org/apache/sentry/core/common/utils/PolicyFiles.java @@ -0,0 +1,96 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sentry.core.common.utils; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; + +import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.shiro.config.Ini; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.io.ByteStreams; +import com.google.common.io.Resources; + +public final class PolicyFiles { + + private static final Logger LOGGER = LoggerFactory + .getLogger(PolicyFiles.class); + + public static void copyToDir(File dest, String... resources) + throws FileNotFoundException, IOException { + for(String resource : resources) { + LOGGER.debug("Copying " + resource + " to " + dest); + Resources.copy(Resources.getResource(resource), new FileOutputStream(new File(dest, resource))); + } + } + + public static void copyToDir(FileSystem fs, Path dest, String... resources) + throws FileNotFoundException, IOException { + for(String resource : resources) { + InputStream in = Resources.getResource(resource).openStream(); + FSDataOutputStream out = fs.create(new Path(dest, resource)); + long bytes = ByteStreams.copy(in, out); + in.close(); + out.hflush(); + out.close(); + LOGGER.debug("Copying " + resource + " to " + dest + ", bytes " + bytes); + } + } + + public static void copyFilesToDir(FileSystem fs, Path dest, File inputFile) + throws IOException { + try (InputStream input = new FileInputStream(inputFile.getPath()); + FSDataOutputStream out = fs.create(new Path(dest, inputFile.getName()))) { + ByteStreams.copy(input, out); + input.close(); + out.hflush(); + out.close(); + } + } + + + public static Ini loadFromPath(FileSystem fileSystem, Path path) throws IOException { + InputStream inputStream = null; + try { + LOGGER.debug("Opening " + path); + inputStream = fileSystem.open(path); + Ini ini = new Ini(); + ini.load(inputStream); + return ini; + } finally { + if(inputStream != null) { + try { + inputStream.close(); + } catch (IOException e) { + LOGGER.warn("Error closing " + inputStream); + } + } + } + } + + private PolicyFiles() { + // Make constructor private to avoid instantiation + } +} http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerAuthorizationProviderGeneralCases.java ---------------------------------------------------------------------- diff --git a/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerAuthorizationProviderGeneralCases.java b/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerAuthorizationProviderGeneralCases.java index 62942dc..8ab33ce 100644 --- a/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerAuthorizationProviderGeneralCases.java +++ b/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerAuthorizationProviderGeneralCases.java @@ -36,7 +36,7 @@ import org.apache.sentry.core.model.indexer.IndexerModelAction; import org.apache.sentry.core.model.indexer.IndexerPrivilegeModel; import org.apache.sentry.provider.common.ResourceAuthorizationProvider; import org.apache.sentry.provider.file.HadoopGroupResourceAuthorizationProvider; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.After; import org.junit.Test; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerPolicyEngineDFS.java ---------------------------------------------------------------------- diff --git a/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerPolicyEngineDFS.java b/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerPolicyEngineDFS.java index e644827..d166f0f 100644 --- a/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerPolicyEngineDFS.java +++ b/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerPolicyEngineDFS.java @@ -25,7 +25,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.AfterClass; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerPolicyEngineLocalFS.java ---------------------------------------------------------------------- diff --git a/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerPolicyEngineLocalFS.java b/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerPolicyEngineLocalFS.java index bd827fc..19ddefb 100644 --- a/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerPolicyEngineLocalFS.java +++ b/sentry-policy/sentry-policy-indexer/src/test/java/org/apache/sentry/policy/indexer/TestIndexerPolicyEngineLocalFS.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.junit.Assert; import org.apache.commons.io.FileUtils; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; public class TestIndexerPolicyEngineLocalFS extends AbstractTestIndexerPolicyEngine { http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-provider/sentry-provider-cache/src/test/java/org/apache/sentry/provider/cache/PrivilegeCacheTestImpl.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-cache/src/test/java/org/apache/sentry/provider/cache/PrivilegeCacheTestImpl.java b/sentry-provider/sentry-provider-cache/src/test/java/org/apache/sentry/provider/cache/PrivilegeCacheTestImpl.java index 361f273..f2f735b 100644 --- a/sentry-provider/sentry-provider-cache/src/test/java/org/apache/sentry/provider/cache/PrivilegeCacheTestImpl.java +++ b/sentry-provider/sentry-provider-cache/src/test/java/org/apache/sentry/provider/cache/PrivilegeCacheTestImpl.java @@ -27,7 +27,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.sentry.core.common.ActiveRoleSet; import org.apache.sentry.core.common.Authorizable; import org.apache.sentry.provider.common.ProviderBackendContext; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.apache.sentry.provider.file.SimpleFileProviderBackend; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/LocalGroupMappingService.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/LocalGroupMappingService.java b/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/LocalGroupMappingService.java index eb23ff1..7e570ae 100644 --- a/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/LocalGroupMappingService.java +++ b/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/LocalGroupMappingService.java @@ -27,6 +27,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.sentry.core.common.service.GroupMappingService; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.apache.sentry.core.common.utils.SentryConstants; import org.apache.sentry.core.common.utils.PolicyFileConstants; import org.apache.sentry.core.common.exception.SentryGroupNotFoundException; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/PolicyFiles.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/PolicyFiles.java b/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/PolicyFiles.java deleted file mode 100644 index f8be739..0000000 --- a/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/PolicyFiles.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.sentry.provider.file; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; - -import org.apache.hadoop.fs.FSDataOutputStream; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; -import org.apache.shiro.config.Ini; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.io.ByteStreams; -import com.google.common.io.Resources; - -public final class PolicyFiles { - - private static final Logger LOGGER = LoggerFactory - .getLogger(PolicyFiles.class); - - public static void copyToDir(File dest, String... resources) - throws FileNotFoundException, IOException { - for(String resource : resources) { - LOGGER.debug("Copying " + resource + " to " + dest); - Resources.copy(Resources.getResource(resource), new FileOutputStream(new File(dest, resource))); - } - } - - public static void copyToDir(FileSystem fs, Path dest, String... resources) - throws FileNotFoundException, IOException { - for(String resource : resources) { - InputStream in = Resources.getResource(resource).openStream(); - FSDataOutputStream out = fs.create(new Path(dest, resource)); - long bytes = ByteStreams.copy(in, out); - in.close(); - out.hflush(); - out.close(); - LOGGER.debug("Copying " + resource + " to " + dest + ", bytes " + bytes); - } - } - - public static void copyFilesToDir(FileSystem fs, Path dest, File inputFile) - throws IOException { - try (InputStream input = new FileInputStream(inputFile.getPath()); - FSDataOutputStream out = fs.create(new Path(dest, inputFile.getName()))) { - ByteStreams.copy(input, out); - input.close(); - out.hflush(); - out.close(); - } - } - - - public static Ini loadFromPath(FileSystem fileSystem, Path path) throws IOException { - InputStream inputStream = null; - try { - LOGGER.debug("Opening " + path); - inputStream = fileSystem.open(path); - Ini ini = new Ini(); - ini.load(inputStream); - return ini; - } finally { - if(inputStream != null) { - try { - inputStream.close(); - } catch (IOException e) { - LOGGER.warn("Error closing " + inputStream); - } - } - } - } - - private PolicyFiles() { - // Make constructor private to avoid instantiation - } -} http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/SimpleFileProviderBackend.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/SimpleFileProviderBackend.java b/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/SimpleFileProviderBackend.java index 00648da..69ab260 100644 --- a/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/SimpleFileProviderBackend.java +++ b/sentry-provider/sentry-provider-file/src/main/java/org/apache/sentry/provider/file/SimpleFileProviderBackend.java @@ -33,6 +33,7 @@ import org.apache.hadoop.fs.Path; import org.apache.sentry.core.common.ActiveRoleSet; import org.apache.sentry.core.common.Authorizable; import org.apache.sentry.core.common.exception.SentryConfigurationException; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.apache.sentry.policy.common.PrivilegeUtils; import org.apache.sentry.core.common.validator.PrivilegeValidator; import org.apache.sentry.core.common.validator.PrivilegeValidatorContext; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-provider/sentry-provider-file/src/test/java/org/apache/sentry/provider/file/TestLocalGroupMapping.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-file/src/test/java/org/apache/sentry/provider/file/TestLocalGroupMapping.java b/sentry-provider/sentry-provider-file/src/test/java/org/apache/sentry/provider/file/TestLocalGroupMapping.java index bf2eb10..9864b82 100644 --- a/sentry-provider/sentry-provider-file/src/test/java/org/apache/sentry/provider/file/TestLocalGroupMapping.java +++ b/sentry-provider/sentry-provider-file/src/test/java/org/apache/sentry/provider/file/TestLocalGroupMapping.java @@ -24,6 +24,7 @@ import java.util.Set; import org.apache.commons.io.FileUtils; import org.apache.hadoop.fs.Path; import org.apache.sentry.core.common.exception.SentryGroupNotFoundException; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.After; import org.junit.Assert; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-provider/sentry-provider-file/src/test/java/org/apache/sentry/provider/file/TestSimpleFileProvderBackend.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-file/src/test/java/org/apache/sentry/provider/file/TestSimpleFileProvderBackend.java b/sentry-provider/sentry-provider-file/src/test/java/org/apache/sentry/provider/file/TestSimpleFileProvderBackend.java index 20d5664..e35ccfd 100644 --- a/sentry-provider/sentry-provider-file/src/test/java/org/apache/sentry/provider/file/TestSimpleFileProvderBackend.java +++ b/sentry-provider/sentry-provider-file/src/test/java/org/apache/sentry/provider/file/TestSimpleFileProvderBackend.java @@ -27,6 +27,7 @@ import java.util.HashSet; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.sentry.core.common.ActiveRoleSet; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.apache.sentry.provider.common.ProviderBackendContext; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/sentry/blob/9da220ab/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java index 79f1792..202173c 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestSandboxOps.java @@ -28,7 +28,7 @@ import java.sql.Statement; import org.apache.hadoop.fs.Path; import org.apache.sentry.core.common.utils.PolicyFile; -import org.apache.sentry.provider.file.PolicyFiles; +import org.apache.sentry.core.common.utils.PolicyFiles; import org.junit.Before; import org.junit.Test;
