HBASE-20605 Excludes Azure's new filesystem from the SecureBulkLoadEndpoint perm check
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
This commit is contained in:
parent
409531209e
commit
c596fb6c3f
|
@ -22,6 +22,7 @@ import com.google.protobuf.RpcCallback;
|
||||||
import com.google.protobuf.RpcController;
|
import com.google.protobuf.RpcController;
|
||||||
import com.google.protobuf.Service;
|
import com.google.protobuf.Service;
|
||||||
|
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.apache.hadoop.hbase.classification.InterfaceAudience;
|
import org.apache.hadoop.hbase.classification.InterfaceAudience;
|
||||||
|
@ -119,7 +120,11 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService
|
||||||
|
|
||||||
private final static FsPermission PERM_ALL_ACCESS = FsPermission.valueOf("-rwxrwxrwx");
|
private final static FsPermission PERM_ALL_ACCESS = FsPermission.valueOf("-rwxrwxrwx");
|
||||||
private final static FsPermission PERM_HIDDEN = FsPermission.valueOf("-rwx--x--x");
|
private final static FsPermission PERM_HIDDEN = FsPermission.valueOf("-rwx--x--x");
|
||||||
private final static String[] FsWithoutSupportPermission = {"s3", "s3a", "s3n", "wasb", "wasbs", "swift"};
|
|
||||||
|
public static final String FS_WITHOUT_SUPPORT_PERMISSION_KEY =
|
||||||
|
"hbase.secure.bulkload.fs.permission.lacking";
|
||||||
|
public static final String FS_WITHOUT_SUPPORT_PERMISSION_DEFAULT =
|
||||||
|
"s3,s3a,s3n,wasb,wasbs,swift,adfs,abfs,viewfs";
|
||||||
|
|
||||||
private SecureRandom random;
|
private SecureRandom random;
|
||||||
private FileSystem fs;
|
private FileSystem fs;
|
||||||
|
@ -143,7 +148,7 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService
|
||||||
conf = env.getConfiguration();
|
conf = env.getConfiguration();
|
||||||
baseStagingDir = SecureBulkLoadUtil.getBaseStagingDir(conf);
|
baseStagingDir = SecureBulkLoadUtil.getBaseStagingDir(conf);
|
||||||
this.userProvider = UserProvider.instantiate(conf);
|
this.userProvider = UserProvider.instantiate(conf);
|
||||||
Set<String> fsSet = new HashSet<String>(Arrays.asList(FsWithoutSupportPermission));
|
Set<String> fsSet = getFileSystemSchemesWithoutPermissionSupport(conf);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
fs = baseStagingDir.getFileSystem(conf);
|
fs = baseStagingDir.getFileSystem(conf);
|
||||||
|
@ -179,6 +184,12 @@ public class SecureBulkLoadEndpoint extends SecureBulkLoadService
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Set<String> getFileSystemSchemesWithoutPermissionSupport(Configuration conf) {
|
||||||
|
final String value = conf.get(
|
||||||
|
FS_WITHOUT_SUPPORT_PERMISSION_KEY, FS_WITHOUT_SUPPORT_PERMISSION_DEFAULT);
|
||||||
|
return new HashSet<String>(Arrays.asList(StringUtils.split(value, ',')));
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void stop(CoprocessorEnvironment env) throws IOException {
|
public void stop(CoprocessorEnvironment env) throws IOException {
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,64 @@
|
||||||
|
/*
|
||||||
|
* 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.hadoop.hbase.security.access;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import org.apache.commons.lang.StringUtils;
|
||||||
|
import org.apache.hadoop.conf.Configuration;
|
||||||
|
import org.apache.hadoop.hbase.HBaseConfiguration;
|
||||||
|
import org.apache.hadoop.hbase.testclassification.SmallTests;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.experimental.categories.Category;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests the SecureBulkLoadEndpoint code.
|
||||||
|
*/
|
||||||
|
@Category(SmallTests.class)
|
||||||
|
public class TestSecureBulkLoadEndpoint {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testFileSystemsWithoutPermissionSupport() {
|
||||||
|
final Configuration emptyConf = new Configuration(false);
|
||||||
|
final Configuration defaultConf = HBaseConfiguration.create();
|
||||||
|
|
||||||
|
final Set<String> expectedDefaultIgnoredSchemes = new HashSet<>(
|
||||||
|
Arrays.asList(
|
||||||
|
StringUtils.split(SecureBulkLoadEndpoint.FS_WITHOUT_SUPPORT_PERMISSION_DEFAULT, ',')));
|
||||||
|
|
||||||
|
final SecureBulkLoadEndpoint endpoint = new SecureBulkLoadEndpoint();
|
||||||
|
|
||||||
|
// Empty configuration should return the default list of schemes
|
||||||
|
Set<String> defaultIgnoredSchemes = endpoint.getFileSystemSchemesWithoutPermissionSupport(
|
||||||
|
emptyConf);
|
||||||
|
assertEquals(defaultIgnoredSchemes, expectedDefaultIgnoredSchemes);
|
||||||
|
|
||||||
|
// Default configuration (unset) should be the default list of schemes
|
||||||
|
defaultIgnoredSchemes = endpoint.getFileSystemSchemesWithoutPermissionSupport(defaultConf);
|
||||||
|
assertEquals(defaultIgnoredSchemes, expectedDefaultIgnoredSchemes);
|
||||||
|
|
||||||
|
defaultConf.set(SecureBulkLoadEndpoint.FS_WITHOUT_SUPPORT_PERMISSION_KEY, "foo,bar");
|
||||||
|
defaultIgnoredSchemes = endpoint.getFileSystemSchemesWithoutPermissionSupport(defaultConf);
|
||||||
|
assertEquals(defaultIgnoredSchemes, new HashSet<String>(Arrays.asList("foo", "bar")));
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue