Author: cnauroth
Date: Thu Jul 10 16:57:17 2014
New Revision: 1609503
URL: http://svn.apache.org/r1609503
Log:
HADOOP-10507. FsShell setfacl can throw ArrayIndexOutOfBoundsException when no
perm is specified. Contributed by Stephen Chu and Sathish Gurram.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1609503&r1=1609502&r2=1609503&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jul
10 16:57:17 2014
@@ -398,6 +398,9 @@ Release 2.6.0 - UNRELEASED
HADOOP-10781. Unportable getgrouplist() usage breaks FreeBSD (Dmitry
Sivachenko via Colin Patrick McCabe)
+ HADOOP-10507. FsShell setfacl can throw ArrayIndexOutOfBoundsException when
+ no perm is specified. (Stephen Chu and Sathish Gurram via cnauroth)
+
Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java?rev=1609503&r1=1609502&r2=1609503&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AclEntry.java
Thu Jul 10 16:57:17 2014
@@ -278,7 +278,7 @@ public class AclEntry {
}
if (includePermission) {
- if (split.length < index) {
+ if (split.length <= index) {
throw new HadoopIllegalArgumentException("Invalid <aclSpec> : "
+ aclStr);
}
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java?rev=1609503&r1=1609502&r2=1609503&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java
Thu Jul 10 16:57:17 2014
@@ -84,6 +84,19 @@ public class TestAclCommands {
}
@Test
+ public void testSetfaclValidationsWithoutPermissions() throws Exception {
+ List<AclEntry> parsedList = new ArrayList<AclEntry>();
+ try {
+ parsedList = AclEntry.parseAclSpec("user:user1:", true);
+ } catch (IllegalArgumentException e) {
+ }
+ assertTrue(parsedList.size() == 0);
+ assertFalse("setfacl should fail with less arguments",
+ 0 == runCommand(new String[] { "-setfacl", "-m", "user:user1:",
+ "/path" }));
+ }
+
+ @Test
public void testMultipleAclSpecParsing() throws Exception {
List<AclEntry> parsedList = AclEntry.parseAclSpec(
"group::rwx,user:user1:rwx,user:user2:rw-,"
