Merge pull request #78 from amuniz/JENKINS-62275

[JENKINS-62275] Jenkins.MANAGE has access to global config

Author: ikedam

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.35</version>
+    <version>4.1</version>
   </parent>
 
   <artifactId>build-timeout</artifactId>
@@ -31,8 +31,10 @@
   </scm>
 
   <properties>
-    <jenkins.version>1.625.1</jenkins.version>
-    <java.level>7</java.level>
+    <jenkins.version>2.222.1</jenkins.version>
+    <java.level>8</java.level>
+    <!-- To be removed once Jenkins.MANAGE permission gets out of beta -->
+    <useBeta>true</useBeta>
   </properties>
 
   <dependencies>

src/main/java/hudson/plugins/build_timeout/operations/BuildStepOperation.java

@@ -26,11 +26,18 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import hudson.model.Node;
+import hudson.model.TaskListener;
+import hudson.security.Permission;
+import hudson.util.LogTaskListener;
+import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -111,8 +118,11 @@ public BuildStepOperation(BuildStep buildstep, boolean continueEvenFailed) {
      * {@link Launcher} that cannot launch anything.
      */
     private static class DummyLauncher extends Launcher {
+
+        private static Logger LOG = Logger.getLogger(BuildStepOperation.DummyLauncher.class.getName());
+
         public DummyLauncher() {
-            super(null, null);
+            super(new LogTaskListener(LOG, Level.INFO), null);
         }
 
         @Override
@@ -131,7 +141,7 @@ public Channel launchChannel(String[] arg0, OutputStream arg1,
             throw new UnsupportedOperationException("Launcher does not supported in BuildStep timeout operation");
         }
     }
-    
+
     /**
      * @return launcher specified with launcherOption.
      */
@@ -240,5 +250,11 @@ public List<Descriptor<?>> getBuildStepDescriptors(AbstractProject<?,?> project)
 
             return buildsteps;
         }
+
+        @Nonnull
+        @Override
+        public Permission getRequiredGlobalConfigPagePermission() {
+            return Jenkins.MANAGE;
+        }
     }
 }

src/test/java/hudson/plugins/build_timeout/impl/AbsoluteTimeOutStrategyTest.java

@@ -26,10 +26,12 @@
 
 import java.util.Arrays;
 
+import hudson.model.ParametersDefinitionProperty;
 import hudson.model.Result;
 import hudson.model.Cause;
 import hudson.model.FreeStyleProject;
 import hudson.model.ParametersAction;
+import hudson.model.StringParameterDefinition;
 import hudson.model.StringParameterValue;
 import hudson.plugins.build_timeout.BuildTimeOutJenkinsRule;
 import hudson.plugins.build_timeout.BuildTimeOutOperation;
@@ -68,6 +70,8 @@ public void after() {
     @Test
     public void testConfigurationWithParameter() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("TIMEOUT", null)));
         p.getBuildWrappersList().add(
                 new BuildTimeoutWrapper(
                         new AbsoluteTimeOutStrategy("${TIMEOUT}"),

src/test/java/hudson/plugins/build_timeout/impl/DeadlineTimeOutStrategyTest.java

@@ -24,10 +24,12 @@
 
 package hudson.plugins.build_timeout.impl;
 
+import hudson.model.ParametersDefinitionProperty;
 import hudson.model.Result;
 import hudson.model.Cause;
 import hudson.model.FreeStyleProject;
 import hudson.model.ParametersAction;
+import hudson.model.StringParameterDefinition;
 import hudson.model.StringParameterValue;
 import hudson.plugins.build_timeout.BuildTimeOutJenkinsRule;
 import hudson.plugins.build_timeout.BuildTimeOutOperation;
@@ -87,6 +89,8 @@ private void testWithParam(int timeToDeadlineInSecondsFromNow, Result expectedRe
         String deadline = getDeadlineTimeFromNow(timeToDeadlineInSecondsFromNow);
 
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("DEADLINE", null)));
         p.getBuildWrappersList().add(
                 new BuildTimeoutWrapper(new DeadlineTimeOutStrategy("${DEADLINE}",
                         TOLERANCE_PERIOD_IN_MINUTES), Arrays

src/test/java/hudson/plugins/build_timeout/impl/ElasticTimeOutStrategyJenkinsTest.java

@@ -32,6 +32,8 @@
 import hudson.model.Cause;
 import hudson.model.FreeStyleProject;
 import hudson.model.ParametersAction;
+import hudson.model.ParametersDefinitionProperty;
+import hudson.model.StringParameterDefinition;
 import hudson.model.StringParameterValue;
 import hudson.plugins.build_timeout.BuildTimeOutJenkinsRule;
 import hudson.plugins.build_timeout.BuildTimeOutOperation;
@@ -95,6 +97,8 @@ public void testCanConfigureWithWebPage() throws Exception {
     @Test
     public void testFailSafeTimeoutWithVariable() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("FailSafeTimeout", null)));
         p.getBuildWrappersList().add(new BuildTimeoutWrapper(
                 new ElasticTimeOutStrategy("200", "${FailSafeTimeout}", "3", true),
                 null,

src/test/java/hudson/plugins/build_timeout/impl/NoActivityTimeOutStrategyTest.java

@@ -31,6 +31,8 @@
 import java.util.Arrays;
 import java.util.Date;
 
+import hudson.model.ParametersDefinitionProperty;
+import hudson.model.StringParameterDefinition;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -252,6 +254,8 @@ public void testCanConfigureWithWebPageUsingStringExpression() throws Exception
     @Test
     public void testConfigurationWithParameter() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("TIMEOUT", null)));
         p.getBuildWrappersList().add(
                 new BuildTimeoutWrapper(
                         new NoActivityTimeOutStrategy("${TIMEOUT}"),

src/test/java/hudson/plugins/build_timeout/operations/AbortAndRestartOperationTest.java

@@ -32,6 +32,8 @@
 import java.util.Arrays;
 import java.util.LinkedList;
 
+import hudson.model.ParametersDefinitionProperty;
+import hudson.model.StringParameterDefinition;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.SleepBuilder;
@@ -116,6 +118,8 @@ public void testAbortAndRestartTwice() throws Exception {
     @Test
     public void testUsingVariable() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("RESTART", null)));
         p.getBuildWrappersList().add(new BuildTimeoutWrapper(
                      new QuickBuildTimeOutStrategy(1000),
                      Arrays.<BuildTimeOutOperation>asList(new AbortAndRestartOperation("${RESTART}")),

src/test/java/hudson/plugins/build_timeout/operations/BuildStepOperationTest.java

@@ -28,6 +28,8 @@
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
 
 import hudson.Extension;
 import hudson.Functions;
@@ -37,29 +39,38 @@
 import hudson.model.AbstractProject;
 import hudson.model.Cause;
 import hudson.model.BuildListener;
+import hudson.model.Descriptor;
 import hudson.model.FreeStyleProject;
 import hudson.model.ParametersAction;
+import hudson.model.ParametersDefinitionProperty;
+import hudson.model.StringParameterDefinition;
 import hudson.model.StringParameterValue;
 import hudson.model.Result;
+import hudson.model.User;
 import hudson.plugins.build_timeout.BuildTimeOutJenkinsRule;
 import hudson.plugins.build_timeout.BuildTimeOutOperation;
 import hudson.plugins.build_timeout.BuildTimeOutOperationDescriptor;
 import hudson.plugins.build_timeout.QuickBuildTimeOutStrategy;
 import hudson.plugins.build_timeout.BuildTimeoutWrapper;
 import hudson.plugins.build_timeout.impl.AbsoluteTimeOutStrategy;
+import hudson.security.ACL;
+import hudson.security.ACLContext;
 import hudson.tasks.BuildStepDescriptor;
 import hudson.tasks.BuildStepMonitor;
 import hudson.tasks.Builder;
 import hudson.tasks.Recorder;
 import hudson.tasks.ArtifactArchiver;
 import hudson.tasks.BatchFile;
 import hudson.tasks.Shell;
+import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.JenkinsRule.WebClient;
+import org.jvnet.hudson.test.MockAuthorizationStrategy;
 import org.jvnet.hudson.test.SleepBuilder;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.StaplerRequest;
@@ -308,6 +319,8 @@ public void testConfigurationWithoutDbc() throws Exception {
     @Test
     public void testLauncher() throws Exception {
         FreeStyleProject p = j.createFreeStyleProject();
+        // needed since Jenkins 2.3
+        p.addProperty(new ParametersDefinitionProperty(new StringParameterDefinition("TESTSTRING", null)));
 
         String TESTSTRING = "***THIS IS OUTPUT IN TIMEOUT***";
 
@@ -363,6 +376,31 @@ public void testNoLauncher() throws Exception {
                 new ParametersAction(new StringParameterValue("TESTSTRING", TESTSTRING))
         ).get());
     }
+
+    @Test
+    public void managePermissionShouldAccess() {
+        final String USER = "user";
+        final String MANAGER = "manager";
+        j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
+        j.jenkins.setAuthorizationStrategy(new MockAuthorizationStrategy()
+                // Read access
+                .grant(Jenkins.READ).everywhere().to(USER)
+
+                // Read and Manage
+                .grant(Jenkins.READ).everywhere().to(MANAGER)
+                .grant(Jenkins.MANAGE).everywhere().to(MANAGER)
+        );
+
+        try (ACLContext c = ACL.as(User.getById(USER, true))) {
+            Collection<Descriptor> descriptors = Functions.getSortedDescriptorsForGlobalConfigUnclassified();
+            assertTrue("Global configuration should not be accessible to READ users", descriptors.size() == 0);
+        }
+        try (ACLContext c = ACL.as(User.getById(MANAGER, true))) {
+            Collection<Descriptor> descriptors = Functions.getSortedDescriptorsForGlobalConfigUnclassified();
+            Optional<Descriptor> found = descriptors.stream().filter(descriptor -> descriptor instanceof BuildStepOperation.DescriptorImpl).findFirst();
+            assertTrue("Global configuration should be accessible to MANAGE users", found.isPresent());
+        }
+    }
 
     /**
      * A builder without {@link DataBoundConstructor}.