You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by at...@apache.org on 2013/04/29 20:05:05 UTC
svn commit: r1477237 - in /hadoop/common/trunk/hadoop-hdfs-project:
hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/
hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/
hadoop-hdfs-httpfs/src/main/resources/ hadoop-hdfs-httpf...
Author: atm
Date: Mon Apr 29 18:05:04 2013
New Revision: 1477237
URL: http://svn.apache.org/r1477237
Log:
HDFS-4733. Make HttpFS username pattern configurable. Contributed by Alejandro Abdelnur.
Added:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSCustomUserName.java
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/resources/httpfs-default.xml
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java?rev=1477237&r1=1477236&r2=1477237&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java Mon Apr 29 18:05:04 2013
@@ -193,7 +193,7 @@ public class HttpFSParametersProvider ex
* Constructor.
*/
public DoAsParam() {
- super(NAME, null, UserProvider.USER_PATTERN);
+ super(NAME, null, UserProvider.getUserPattern());
}
/**
@@ -248,7 +248,7 @@ public class HttpFSParametersProvider ex
* Constructor.
*/
public GroupParam() {
- super(NAME, null, UserProvider.USER_PATTERN);
+ super(NAME, null, UserProvider.getUserPattern());
}
}
@@ -344,7 +344,7 @@ public class HttpFSParametersProvider ex
* Constructor.
*/
public OwnerParam() {
- super(NAME, null, UserProvider.USER_PATTERN);
+ super(NAME, null, UserProvider.getUserPattern());
}
}
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java?rev=1477237&r1=1477236&r2=1477237&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java Mon Apr 29 18:05:04 2013
@@ -24,6 +24,7 @@ import org.apache.hadoop.fs.CommonConfig
import org.apache.hadoop.lib.server.ServerException;
import org.apache.hadoop.lib.service.FileSystemAccess;
import org.apache.hadoop.lib.servlet.ServerWebApp;
+import org.apache.hadoop.lib.wsrs.UserProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -102,6 +103,9 @@ public class HttpFSServerWebApp extends
LOG.info("Connects to Namenode [{}]",
get().get(FileSystemAccess.class).getFileSystemConfiguration().
get(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY));
+ String userPattern = getConfig().get(UserProvider.USER_PATTERN_KEY,
+ UserProvider.USER_PATTERN_DEFAULT);
+ UserProvider.setUserPattern(userPattern);
}
/**
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java?rev=1477237&r1=1477236&r2=1477237&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/lib/wsrs/UserProvider.java Mon Apr 29 18:05:04 2013
@@ -41,12 +41,27 @@ public class UserProvider extends Abstra
public static final String USER_NAME_PARAM = "user.name";
- public static final Pattern USER_PATTERN = Pattern.compile("^[A-Za-z_][A-Za-z0-9._-]*[$]?$");
+
+ public static final String USER_PATTERN_KEY
+ = "httpfs.user.provider.user.pattern";
+
+ public static final String USER_PATTERN_DEFAULT
+ = "^[A-Za-z_][A-Za-z0-9._-]*[$]?$";
+
+ private static Pattern userPattern = Pattern.compile(USER_PATTERN_DEFAULT);
+
+ public static void setUserPattern(String pattern) {
+ userPattern = Pattern.compile(pattern);
+ }
+
+ public static Pattern getUserPattern() {
+ return userPattern;
+ }
static class UserParam extends StringParam {
public UserParam(String user) {
- super(USER_NAME_PARAM, user, USER_PATTERN);
+ super(USER_NAME_PARAM, user, getUserPattern());
}
@Override
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/resources/httpfs-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/resources/httpfs-default.xml?rev=1477237&r1=1477236&r2=1477237&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/resources/httpfs-default.xml (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/resources/httpfs-default.xml Mon Apr 29 18:05:04 2013
@@ -226,4 +226,12 @@
</description>
</property>
+ <property>
+ <name>httpfs.user.provider.user.pattern</name>
+ <value>^[A-Za-z_][A-Za-z0-9._-]*[$]?$</value>
+ <description>
+ Valid pattern for user and group names, it must be a valid java regex.
+ </description>
+ </property>
+
</configuration>
Added: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSCustomUserName.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSCustomUserName.java?rev=1477237&view=auto
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSCustomUserName.java (added)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/server/TestHttpFSCustomUserName.java Mon Apr 29 18:05:04 2013
@@ -0,0 +1,94 @@
+/**
+ * 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.fs.http.server;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.http.client.HttpFSKerberosAuthenticator;
+import org.apache.hadoop.lib.server.Service;
+import org.apache.hadoop.lib.server.ServiceException;
+import org.apache.hadoop.lib.service.Groups;
+import org.apache.hadoop.lib.wsrs.UserProvider;
+import org.apache.hadoop.security.authentication.client.AuthenticatedURL;
+import org.apache.hadoop.security.authentication.server.AuthenticationToken;
+import org.apache.hadoop.security.authentication.util.Signer;
+import org.apache.hadoop.test.HFSTestCase;
+import org.apache.hadoop.test.HadoopUsersConfTestHelper;
+import org.apache.hadoop.test.TestDir;
+import org.apache.hadoop.test.TestDirHelper;
+import org.apache.hadoop.test.TestHdfs;
+import org.apache.hadoop.test.TestHdfsHelper;
+import org.apache.hadoop.test.TestJetty;
+import org.apache.hadoop.test.TestJettyHelper;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.webapp.WebAppContext;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Writer;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.Arrays;
+import java.util.List;
+
+public class TestHttpFSCustomUserName extends HFSTestCase {
+
+ @Test
+ @TestDir
+ @TestJetty
+ public void defaultUserName() throws Exception {
+ String dir = TestDirHelper.getTestDir().getAbsolutePath();
+
+ Configuration httpfsConf = new Configuration(false);
+ HttpFSServerWebApp server =
+ new HttpFSServerWebApp(dir, dir, dir, dir, httpfsConf);
+ server.init();
+ Assert.assertEquals(UserProvider.USER_PATTERN_DEFAULT,
+ UserProvider.getUserPattern().pattern());
+ server.destroy();
+ }
+
+ @Test
+ @TestDir
+ @TestJetty
+ public void customUserName() throws Exception {
+ String dir = TestDirHelper.getTestDir().getAbsolutePath();
+
+ Configuration httpfsConf = new Configuration(false);
+ httpfsConf.set(UserProvider.USER_PATTERN_KEY, "1");
+ HttpFSServerWebApp server =
+ new HttpFSServerWebApp(dir, dir, dir, dir, httpfsConf);
+ server.init();
+ Assert.assertEquals("1", UserProvider.getUserPattern().pattern());
+ server.destroy();
+ }
+
+}
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java?rev=1477237&r1=1477236&r2=1477237&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java Mon Apr 29 18:05:04 2013
@@ -104,34 +104,39 @@ public class TestUserProvider {
@Test
@TestException(exception = IllegalArgumentException.class)
public void userNameEmpty() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- userParam.parseParam("");
+ new UserProvider.UserParam("");
}
@Test
@TestException(exception = IllegalArgumentException.class)
public void userNameInvalidStart() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- userParam.parseParam("1x");
+ new UserProvider.UserParam("1x");
}
@Test
@TestException(exception = IllegalArgumentException.class)
public void userNameInvalidDollarSign() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- userParam.parseParam("1$x");
+ new UserProvider.UserParam("1$x");
}
@Test
public void userNameMinLength() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- assertNotNull(userParam.parseParam("a"));
+ new UserProvider.UserParam("a");
}
@Test
public void userNameValidDollarSign() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- assertNotNull(userParam.parseParam("a$"));
+ new UserProvider.UserParam("a$");
+ }
+
+ @Test
+ public void customUserPattern() {
+ try {
+ UserProvider.setUserPattern("1");
+ new UserProvider.UserParam("1");
+ } finally {
+ UserProvider.setUserPattern(UserProvider.USER_PATTERN_DEFAULT);
+ }
}
}
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1477237&r1=1477236&r2=1477237&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Apr 29 18:05:04 2013
@@ -606,6 +606,8 @@ Release 2.0.5-beta - UNRELEASED
HDFS-4748. MiniJournalCluster#restartJournalNode leaks resources, which
causes sporadic test failures. (Chris Nauroth via suresh)
+ HDFS-4733. Make HttpFS username pattern configurable. (tucu via atm)
+
Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES