From 382bcf21e7f7f752ba901f856abf080e8700e890 Mon Sep 17 00:00:00 2001
From: Chris Nauroth <cnauroth@apache.org>
Date: Thu, 21 Jul 2016 14:12:31 -0700
Subject: [PATCH] HADOOP-13240. TestAclCommands.testSetfaclValidations fail.
 Contributed by John Zhuge.

(cherry picked from commit 43cf6b101dacd96bacfd199826b717f6946109af)
---
 .../apache/hadoop/fs/shell/AclCommands.java   |  4 +++
 .../hadoop/fs/shell/TestAclCommands.java      | 34 +++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
index 51a2255fe24..9a5404032b0 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
@@ -213,6 +213,10 @@ class AclCommands extends FsCommand {
               "Missing either <acl_spec> or <path>");
         }
         aclEntries = AclEntry.parseAclSpec(args.removeFirst(), !cf.getOpt("x"));
+        if (aclEntries.isEmpty()) {
+          throw new HadoopIllegalArgumentException(
+              "Missing <acl_spec> entry");
+        }
       }
 
       if (args.isEmpty()) {
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java
index 3b9d3977732..5637e70f32f 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestAclCommands.java
@@ -43,48 +43,54 @@ import org.apache.hadoop.ipc.RpcNoSuchMethodException;
 import org.apache.hadoop.util.Progressable;
 import org.apache.hadoop.util.ToolRunner;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 public class TestAclCommands {
+  @Rule
+  public TemporaryFolder testFolder = new TemporaryFolder();
+
+  private String path;
 
   private Configuration conf = null;
 
   @Before
   public void setup() throws IOException {
     conf = new Configuration();
+    path = testFolder.newFile("file").getPath();
   }
 
   @Test
   public void testGetfaclValidations() throws Exception {
     assertFalse("getfacl should fail without path",
-        0 == runCommand(new String[] { "-getfacl" }));
+        0 == runCommand(new String[] {"-getfacl"}));
     assertFalse("getfacl should fail with extra argument",
-        0 == runCommand(new String[] { "-getfacl", "/test", "extraArg" }));
+        0 == runCommand(new String[] {"-getfacl", path, "extraArg"}));
   }
 
   @Test
   public void testSetfaclValidations() throws Exception {
     assertFalse("setfacl should fail without options",
-        0 == runCommand(new String[] { "-setfacl", "/" }));
+        0 == runCommand(new String[] {"-setfacl", path}));
     assertFalse("setfacl should fail without options -b, -k, -m, -x or --set",
-        0 == runCommand(new String[] { "-setfacl", "-R", "/" }));
+        0 == runCommand(new String[] {"-setfacl", "-R", path}));
     assertFalse("setfacl should fail without path",
-        0 == runCommand(new String[] { "-setfacl" }));
+        0 == runCommand(new String[] {"-setfacl"}));
     assertFalse("setfacl should fail without aclSpec",
-        0 == runCommand(new String[] { "-setfacl", "-m", "/path" }));
+        0 == runCommand(new String[] {"-setfacl", "-m", path}));
     assertFalse("setfacl should fail with conflicting options",
-        0 == runCommand(new String[] { "-setfacl", "-m", "/path" }));
+        0 == runCommand(new String[] {"-setfacl", "-m", path}));
     assertFalse("setfacl should fail with extra arguments",
-        0 == runCommand(new String[] { "-setfacl", "/path", "extra" }));
+        0 == runCommand(new String[] {"-setfacl", path, "extra"}));
     assertFalse("setfacl should fail with extra arguments",
-        0 == runCommand(new String[] { "-setfacl", "--set",
-            "default:user::rwx", "/path", "extra" }));
+        0 == runCommand(new String[] {"-setfacl", "--set",
+            "default:user::rwx", path, "extra"}));
     assertFalse("setfacl should fail with permissions for -x",
-        0 == runCommand(new String[] { "-setfacl", "-x", "user:user1:rwx",
-            "/path" }));
+        0 == runCommand(new String[] {"-setfacl", "-x", "user:user1:rwx",
+            path}));
     assertFalse("setfacl should fail ACL spec missing",
-        0 == runCommand(new String[] { "-setfacl", "-m",
-            "", "/path" }));
+        0 == runCommand(new String[] {"-setfacl", "-m", "", path}));
   }
 
   @Test