|
|
@@ -17,9 +17,11 @@
|
|
|
*/
|
|
|
package org.apache.hadoop.fs.http.server;
|
|
|
|
|
|
-import java.io.BufferedReader;
|
|
|
import java.io.File;
|
|
|
+import java.io.FileOutputStream;
|
|
|
+import java.io.BufferedReader;
|
|
|
import java.io.InputStreamReader;
|
|
|
+import java.io.IOException;
|
|
|
import java.net.HttpURLConnection;
|
|
|
import java.net.URL;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
@@ -27,17 +29,23 @@ import java.text.MessageFormat;
|
|
|
|
|
|
import org.apache.commons.io.FileUtils;
|
|
|
import org.apache.hadoop.conf.Configuration;
|
|
|
+import org.apache.hadoop.http.HttpServer2;
|
|
|
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
|
|
|
+import org.apache.hadoop.security.authentication.util.FileSignerSecretProvider;
|
|
|
+import org.apache.hadoop.security.authentication.util.RandomSignerSecretProvider;
|
|
|
+import org.apache.hadoop.security.authentication.util.SignerSecretProvider;
|
|
|
import org.apache.hadoop.test.GenericTestUtils;
|
|
|
import org.apache.hadoop.test.HadoopUsersConfTestHelper;
|
|
|
import org.apache.hadoop.util.Shell;
|
|
|
import org.junit.Assert;
|
|
|
import org.junit.Before;
|
|
|
-import org.junit.BeforeClass;
|
|
|
+import org.junit.After;
|
|
|
import org.junit.Rule;
|
|
|
import org.junit.Test;
|
|
|
import org.junit.rules.Timeout;
|
|
|
|
|
|
+import static org.apache.hadoop.security.authentication.server.AuthenticationFilter.SIGNER_SECRET_PROVIDER_ATTRIBUTE;
|
|
|
+
|
|
|
/**
|
|
|
* Test {@link HttpFSServerWebServer}.
|
|
|
*/
|
|
|
@@ -45,11 +53,13 @@ public class TestHttpFSServerWebServer {
|
|
|
|
|
|
@Rule
|
|
|
public Timeout timeout = new Timeout(30000);
|
|
|
+
|
|
|
+ private File secretFile;
|
|
|
private HttpFSServerWebServer webServer;
|
|
|
|
|
|
- @BeforeClass
|
|
|
- public static void beforeClass() throws Exception {
|
|
|
- File homeDir = GenericTestUtils.getTestDir();
|
|
|
+ @Before
|
|
|
+ public void init() throws Exception {
|
|
|
+ File homeDir = GenericTestUtils.setupTestRootDir(TestHttpFSServerWebServer.class);
|
|
|
File confDir = new File(homeDir, "etc/hadoop");
|
|
|
File logsDir = new File(homeDir, "logs");
|
|
|
File tempDir = new File(homeDir, "temp");
|
|
|
@@ -71,43 +81,33 @@ public class TestHttpFSServerWebServer {
|
|
|
System.setProperty("httpfs.home.dir", homeDir.getAbsolutePath());
|
|
|
System.setProperty("httpfs.log.dir", logsDir.getAbsolutePath());
|
|
|
System.setProperty("httpfs.config.dir", confDir.getAbsolutePath());
|
|
|
- FileUtils.writeStringToFile(new File(confDir, "httpfs-signature.secret"),
|
|
|
- "foo", StandardCharsets.UTF_8);
|
|
|
+ secretFile = new File(System.getProperty("httpfs.config.dir"),
|
|
|
+ "httpfs-signature-custom.secret");
|
|
|
}
|
|
|
|
|
|
- @Before
|
|
|
- public void setUp() throws Exception {
|
|
|
- Configuration conf = new Configuration();
|
|
|
- conf.set(HttpFSServerWebServer.HTTP_HOSTNAME_KEY, "localhost");
|
|
|
- conf.setInt(HttpFSServerWebServer.HTTP_PORT_KEY, 0);
|
|
|
- conf.set(AuthenticationFilter.SIGNATURE_SECRET_FILE,
|
|
|
- "httpfs-signature.secret");
|
|
|
- Configuration sslConf = new Configuration();
|
|
|
- webServer = new HttpFSServerWebServer(conf, sslConf);
|
|
|
+ @After
|
|
|
+ public void teardown() throws Exception {
|
|
|
+ if (webServer != null) {
|
|
|
+ webServer.stop();
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
public void testStartStop() throws Exception {
|
|
|
+ webServer = createWebServer(createConfigurationWithRandomSecret());
|
|
|
webServer.start();
|
|
|
- String user = HadoopUsersConfTestHelper.getHadoopUsers()[0];
|
|
|
- URL url = new URL(webServer.getUrl(), MessageFormat.format(
|
|
|
- "/webhdfs/v1/?user.name={0}&op=liststatus", user));
|
|
|
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
|
|
|
- Assert.assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode());
|
|
|
- BufferedReader reader = new BufferedReader(
|
|
|
- new InputStreamReader(conn.getInputStream()));
|
|
|
- reader.readLine();
|
|
|
- reader.close();
|
|
|
webServer.stop();
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
public void testJustStop() throws Exception {
|
|
|
+ webServer = createWebServer(createConfigurationWithRandomSecret());
|
|
|
webServer.stop();
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
public void testDoubleStop() throws Exception {
|
|
|
+ webServer = createWebServer(createConfigurationWithRandomSecret());
|
|
|
webServer.start();
|
|
|
webServer.stop();
|
|
|
webServer.stop();
|
|
|
@@ -115,9 +115,140 @@ public class TestHttpFSServerWebServer {
|
|
|
|
|
|
@Test
|
|
|
public void testDoubleStart() throws Exception {
|
|
|
+ webServer = createWebServer(createConfigurationWithRandomSecret());
|
|
|
+ webServer.start();
|
|
|
+ webServer.start();
|
|
|
+ webServer.stop();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Test
|
|
|
+ public void testServiceWithSecretFile() throws Exception {
|
|
|
+ createSecretFile("foo");
|
|
|
+ webServer = createWebServer(createConfigurationWithSecretFile());
|
|
|
+ webServer.start();
|
|
|
+ assertServiceRespondsWithOK(webServer.getUrl());
|
|
|
+ assertSignerSecretProviderType(webServer.getHttpServer(),
|
|
|
+ FileSignerSecretProvider.class);
|
|
|
+ webServer.stop();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Test
|
|
|
+ public void testServiceWithSecretFileWithDeprecatedConfigOnly()
|
|
|
+ throws Exception {
|
|
|
+ createSecretFile("foo");
|
|
|
+ Configuration conf = createConfiguration();
|
|
|
+ setDeprecatedSecretFile(conf, secretFile.getAbsolutePath());
|
|
|
+ webServer = createWebServer(conf);
|
|
|
+ webServer.start();
|
|
|
+ assertServiceRespondsWithOK(webServer.getUrl());
|
|
|
+ assertSignerSecretProviderType(webServer.getHttpServer(),
|
|
|
+ FileSignerSecretProvider.class);
|
|
|
+ webServer.stop();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Test
|
|
|
+ public void testServiceWithSecretFileWithBothConfigOptions() throws Exception {
|
|
|
+ createSecretFile("foo");
|
|
|
+ Configuration conf = createConfigurationWithSecretFile();
|
|
|
+ setDeprecatedSecretFile(conf, secretFile.getAbsolutePath());
|
|
|
+ webServer = createWebServer(conf);
|
|
|
+ webServer.start();
|
|
|
+ assertServiceRespondsWithOK(webServer.getUrl());
|
|
|
+ assertSignerSecretProviderType(webServer.getHttpServer(),
|
|
|
+ FileSignerSecretProvider.class);
|
|
|
+ webServer.stop();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Test
|
|
|
+ public void testServiceWithMissingSecretFile() throws Exception {
|
|
|
+ webServer = createWebServer(createConfigurationWithSecretFile());
|
|
|
webServer.start();
|
|
|
+ assertServiceRespondsWithOK(webServer.getUrl());
|
|
|
+ assertSignerSecretProviderType(webServer.getHttpServer(),
|
|
|
+ RandomSignerSecretProvider.class);
|
|
|
+ webServer.stop();
|
|
|
+ }
|
|
|
+
|
|
|
+ @Test
|
|
|
+ public void testServiceWithEmptySecretFile() throws Exception {
|
|
|
+ // The AuthenticationFilter.constructSecretProvider will do the fallback
|
|
|
+ // to the random secrets not the HttpFSAuthenticationFilter.
|
|
|
+ createSecretFile("");
|
|
|
+ webServer = createWebServer(createConfigurationWithSecretFile());
|
|
|
webServer.start();
|
|
|
+ assertServiceRespondsWithOK(webServer.getUrl());
|
|
|
+ assertSignerSecretProviderType(webServer.getHttpServer(),
|
|
|
+ RandomSignerSecretProvider.class);
|
|
|
webServer.stop();
|
|
|
}
|
|
|
|
|
|
+ private <T extends SignerSecretProvider> void assertSignerSecretProviderType(
|
|
|
+ HttpServer2 server, Class<T> expected) {
|
|
|
+ SignerSecretProvider secretProvider = (SignerSecretProvider)
|
|
|
+ server.getWebAppContext().getServletContext()
|
|
|
+ .getAttribute(SIGNER_SECRET_PROVIDER_ATTRIBUTE);
|
|
|
+ Assert.assertNotNull("The secret provider must not be null", secretProvider);
|
|
|
+ Assert.assertEquals("The secret provider must match the following", expected, secretProvider.getClass());
|
|
|
+ }
|
|
|
+
|
|
|
+ private void assertServiceRespondsWithOK(URL serviceURL)
|
|
|
+ throws Exception {
|
|
|
+ String user = HadoopUsersConfTestHelper.getHadoopUsers()[0];
|
|
|
+ URL url = new URL(serviceURL, MessageFormat.format(
|
|
|
+ "/webhdfs/v1/?user.name={0}&op=liststatus", user));
|
|
|
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
|
|
|
+ Assert.assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode());
|
|
|
+ try (BufferedReader reader = new BufferedReader(
|
|
|
+ new InputStreamReader(conn.getInputStream()))) {
|
|
|
+ reader.readLine();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ private void setDeprecatedSecretFile(Configuration conf, String path) {
|
|
|
+ conf.set(HttpFSAuthenticationFilter.CONF_PREFIX +
|
|
|
+ AuthenticationFilter.SIGNATURE_SECRET_FILE,
|
|
|
+ path);
|
|
|
+ }
|
|
|
+
|
|
|
+ private Configuration createConfigurationWithRandomSecret() {
|
|
|
+ Configuration conf = createConfiguration();
|
|
|
+ conf.set(HttpFSAuthenticationFilter.HADOOP_HTTP_CONF_PREFIX +
|
|
|
+ AuthenticationFilter.SIGNER_SECRET_PROVIDER, "random");
|
|
|
+ return conf;
|
|
|
+ }
|
|
|
+
|
|
|
+ private Configuration createConfigurationWithSecretFile() {
|
|
|
+ Configuration conf = createConfiguration();
|
|
|
+ conf.set(HttpFSAuthenticationFilter.HADOOP_HTTP_CONF_PREFIX +
|
|
|
+ AuthenticationFilter.SIGNATURE_SECRET_FILE,
|
|
|
+ secretFile.getAbsolutePath());
|
|
|
+ return conf;
|
|
|
+ }
|
|
|
+
|
|
|
+ private Configuration createConfiguration() {
|
|
|
+ Configuration conf = new Configuration(false);
|
|
|
+ conf.set(HttpFSServerWebServer.HTTP_HOSTNAME_KEY, "localhost");
|
|
|
+ conf.setInt(HttpFSServerWebServer.HTTP_PORT_KEY, 0);
|
|
|
+ return conf;
|
|
|
+ }
|
|
|
+
|
|
|
+ private HttpFSServerWebServer createWebServer(Configuration conf)
|
|
|
+ throws Exception {
|
|
|
+ Configuration sslConf = new Configuration(false);
|
|
|
+
|
|
|
+ // The configuration must be stored for the HttpFSAuthenticatorFilter, because
|
|
|
+ // it accesses the configuration from the webapp: HttpFSServerWebApp.get().getConfig()
|
|
|
+ try (FileOutputStream os = new FileOutputStream(
|
|
|
+ new File(System.getProperty("httpfs.config.dir"), "httpfs-site.xml"))) {
|
|
|
+ conf.writeXml(os);
|
|
|
+ }
|
|
|
+
|
|
|
+ return new HttpFSServerWebServer(conf, sslConf);
|
|
|
+ }
|
|
|
+
|
|
|
+ private void createSecretFile(String content) throws IOException {
|
|
|
+ Assert.assertTrue(secretFile.createNewFile());
|
|
|
+ FileUtils.writeStringToFile(secretFile, content, StandardCharsets.UTF_8);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
Tamas Domok