Author: bobby
Date: Wed Nov 14 17:32:55 2012
New Revision: 1409266
URL: http://svn.apache.org/viewvc?rev=1409266&view=rev
Log:
svn merge -r 1409087:1409086 reverting HDFS-4171 until test failures can be
fixed.
Modified:
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/test/java/org/apache/hadoop/lib/wsrs/TestUserProvider.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/resources/TestParam.java
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=1409266&r1=1409265&r2=1409266&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
Wed Nov 14 17:32:55 2012
@@ -31,7 +31,6 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.ext.Provider;
import java.lang.reflect.Type;
import java.security.Principal;
-import java.text.MessageFormat;
import java.util.regex.Pattern;
@Provider
@@ -41,26 +40,13 @@ public class UserProvider extends Abstra
public static final String USER_NAME_PARAM = "user.name";
- public static final Pattern USER_PATTERN =
Pattern.compile("^[a-z_][a-z0-9_-]*[$]?$");
+ public static final Pattern USER_PATTERN = Pattern.compile("[_a-zA-Z0-9]+");
- static class UserParam extends StringParam {
+ private static class UserParam extends StringParam {
public UserParam(String user) {
super(USER_NAME_PARAM, user, USER_PATTERN);
}
-
- @Override
- public String parseParam(String str) {
- if (str != null) {
- int len = str.length();
- if (len < 1 || len > 31) {
- throw new IllegalArgumentException(MessageFormat.format(
- "Parameter [{0}], invalid value [{1}], it's length must be between
1 and 31",
- getName(), str));
- }
- }
- return super.parseParam(str);
- }
}
@Override
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=1409266&r1=1409265&r2=1409266&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
Wed Nov 14 17:32:55 2012
@@ -19,18 +19,13 @@
package org.apache.hadoop.lib.wsrs;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import java.security.Principal;
import javax.ws.rs.core.MultivaluedMap;
-import org.apache.hadoop.test.TestException;
-import org.apache.hadoop.test.TestExceptionHelper;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.MethodRule;
import org.mockito.Mockito;
import org.slf4j.MDC;
@@ -40,9 +35,6 @@ import com.sun.jersey.core.spi.component
public class TestUserProvider {
- @Rule
- public MethodRule exceptionHelper = new TestExceptionHelper();
-
@Test
@SuppressWarnings("unchecked")
public void noUser() {
@@ -100,51 +92,4 @@ public class TestUserProvider {
assertEquals(up.getInjectable(null, null, Principal.class), up);
assertNull(up.getInjectable(null, null, String.class));
}
-
- @Test
- @TestException(exception = IllegalArgumentException.class)
- public void userNameEmpty() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- userParam.parseParam("");
- }
-
- @Test
- @TestException(exception = IllegalArgumentException.class)
- public void userNameTooLong() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- userParam.parseParam("a123456789012345678901234567890x");
- }
-
- @Test
- @TestException(exception = IllegalArgumentException.class)
- public void userNameInvalidStart() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- userParam.parseParam("1x");
- }
-
- @Test
- @TestException(exception = IllegalArgumentException.class)
- public void userNameInvalidDollarSign() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- userParam.parseParam("1$x");
- }
-
- @Test
- public void userNameMinLength() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- assertNotNull(userParam.parseParam("a"));
- }
-
- @Test
- public void userNameMaxLength() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- assertNotNull(userParam.parseParam("a123456789012345678901234567890"));
- }
-
- @Test
- public void userNameValidDollarSign() {
- UserProvider.UserParam userParam = new UserProvider.UserParam("username");
- assertNotNull(userParam.parseParam("a$"));
- }
-
}
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=1409266&r1=1409265&r2=1409266&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Nov 14
17:32:55 2012
@@ -589,8 +589,6 @@ Release 2.0.3-alpha - Unreleased
HDFS-4106. BPServiceActor#lastHeartbeat, lastBlockReport and
lastDeletedReport should be volatile. (Jing Zhao via suresh)
- HDFS-4171. WebHDFS and HttpFs should accept only valid Unix user names.
(tucu)
-
HDFS-4139. fuse-dfs RO mode still allows file truncation.
(Colin Patrick McCabe via eli)
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java?rev=1409266&r1=1409265&r2=1409266&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java
Wed Nov 14 17:32:55 2012
@@ -19,9 +19,6 @@ package org.apache.hadoop.hdfs.web.resou
import org.apache.hadoop.security.UserGroupInformation;
-import java.text.MessageFormat;
-import java.util.regex.Pattern;
-
/** User parameter. */
public class UserParam extends StringParam {
/** Parameter name. */
@@ -29,29 +26,14 @@ public class UserParam extends StringPar
/** Default parameter value. */
public static final String DEFAULT = "";
- private static final Domain DOMAIN = new Domain(NAME,
- Pattern.compile("^[a-z_][a-z0-9_-]*[$]?$"));
-
- private static String validateLength(String str) {
- if (str == null) {
- throw new IllegalArgumentException(
- MessageFormat.format("Parameter [{0}], cannot be NULL", NAME));
- }
- int len = str.length();
- if (len < 1 || len > 31) {
- throw new IllegalArgumentException(MessageFormat.format(
- "Parameter [{0}], invalid value [{1}], it's length must be between 1
and 31",
- NAME, str));
- }
- return str;
- }
+ private static final Domain DOMAIN = new Domain(NAME, null);
/**
* Constructor.
* @param str a string representation of the parameter value.
*/
public UserParam(final String str) {
- super(DOMAIN, (str == null) ? null: validateLength(str));
+ super(DOMAIN, str == null || str.equals(DEFAULT)? null: str);
}
/**
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/resources/TestParam.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/resources/TestParam.java?rev=1409266&r1=1409265&r2=1409266&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/resources/TestParam.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/resources/TestParam.java
Wed Nov 14 17:32:55 2012
@@ -26,8 +26,6 @@ import org.apache.hadoop.hdfs.DFSConfigK
import org.junit.Assert;
import org.junit.Test;
-import static org.junit.Assert.assertNotNull;
-
public class TestParam {
public static final Log LOG = LogFactory.getLog(TestParam.class);
@@ -236,42 +234,4 @@ public class TestParam {
final String actual = Param.toSortedString(sep, equalParam, ampParam);
Assert.assertEquals(expected, actual);
}
-
- @Test(expected = IllegalArgumentException.class)
- public void userNameEmpty() {
- UserParam userParam = new UserParam("");
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void userNameTooLong() {
- UserParam userParam = new UserParam("a123456789012345678901234567890x");
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void userNameInvalidStart() {
- UserParam userParam = new UserParam("1x");
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void userNameInvalidDollarSign() {
- UserParam userParam = new UserParam("1$x");
- }
-
- @Test
- public void userNameMinLength() {
- UserParam userParam = new UserParam("a");
- assertNotNull(userParam.getValue());
- }
-
- @Test
- public void userNameMaxLength() {
- UserParam userParam = new UserParam("a123456789012345678901234567890");
- assertNotNull(userParam.getValue());
- }
-
- @Test
- public void userNameValidDollarSign() {
- UserParam userParam = new UserParam("a$");
- assertNotNull(userParam.getValue());
- }
}
