Do not show disabled permissions in permission errors (#4482)

core/src/main/java/hudson/security/ACL.java

@@ -69,8 +69,12 @@ public abstract class ACL {
         if (a == SYSTEM) {
             return;
         }
-        if(!hasPermission(a,p))
+        if (!hasPermission(a,p)) {
+            while (!p.enabled && p.impliedBy != null) {
+                p = p.impliedBy;
+            }
             throw new AccessDeniedException2(a,p);
+        }
     }
 
     /**

test/src/test/java/hudson/cli/GetNodeCommandTest.java

@@ -60,7 +60,7 @@ public class GetNodeCommandTest {
                 .invokeWithArgs("MySlave")
         ;
 
-        assertThat(result.stderr(), containsString("ERROR: user is missing the Agent/ExtendedRead permission"));
+        assertThat(result.stderr(), containsString("ERROR: user is missing the Agent/Configure permission"));
         assertThat(result, failedWith(6));
         assertThat(result, hasNoStandardOutput());
     }