[JENKINS-21173] Anonymous Users Can Configure Priorities

Optionally only Administrators are now allowed to edit Job Priorities
jenkinsci · Jan 1, 2014 · 8d41a04 · 8d41a04
1 parent 197347b
commit 8d41a04
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/main/java/jenkins/advancedqueue/PriorityConfiguration.java b/src/main/java/jenkins/advancedqueue/PriorityConfiguration.java
@@ -34,6 +34,7 @@
 import hudson.model.RootAction;
 import hudson.model.TopLevelItem;
 import hudson.model.View;
+import hudson.security.Permission;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 
@@ -98,7 +99,7 @@ public int compare(JobGroup.PriorityStrategyHolder o1, JobGroup.PriorityStrategy
 	}
 
 	public String getIconFileName() {
-		if (PrioritySorterConfiguration.get().getLegacyMode()) {
+		if (!checkActive()) {
 			return null;
 		}
 		return "/plugin/PrioritySorter/advqueue.png";
@@ -110,11 +111,22 @@ public String getDisplayName() {
 	}
 
 	public String getUrlName() {
-		if (PrioritySorterConfiguration.get().getLegacyMode()) {
+		if (!checkActive()) {
 			return null;
 		}
 		return "advanced-build-queue";
 	}
+
+	private boolean checkActive() {
+		PrioritySorterConfiguration configuration = PrioritySorterConfiguration.get();
+		if(configuration.getLegacyMode()) {
+			return false;
+		}
+		if(configuration.getOnlyAdminsMayEditPriorityConfiguration()) {
+			return Jenkins.getInstance().getACL().hasPermission(Jenkins.ADMINISTER);
+		}
+		return true;
+	}
 
 	public List<JobGroup> getJobGroups() {
 		return jobGroups;

diff --git a/src/main/java/jenkins/advancedqueue/PrioritySorterConfiguration.java b/src/main/java/jenkins/advancedqueue/PrioritySorterConfiguration.java
@@ -66,6 +66,8 @@ public class PrioritySorterConfiguration extends GlobalConfiguration {
 
 	private boolean allowPriorityOnJobs;
 
+	private boolean onlyAdminsMayEditPriorityConfiguration = false;
+
 	private SorterStrategy strategy;
 
 	public PrioritySorterConfiguration() {
@@ -95,6 +97,7 @@ public boolean configure(StaplerRequest req, JSONObject json) throws FormExcepti
 			throw new FormException(numberOfPrioritiesCheck.getMessage(), "numberOfPriorities");
 		}
 		//
+		onlyAdminsMayEditPriorityConfiguration = json.getBoolean("onlyAdminsMayEditPriorityConfiguration");
 		allowPriorityOnJobs = json.getBoolean("allowPriorityOnJobs");
 		if (getLegacyMode()) {
 			Boolean advanced = json.getBoolean("advanced");
@@ -116,6 +119,10 @@ public boolean getAllowPriorityOnJobs() {
 		return allowPriorityOnJobs;
 	}
 
+	public boolean getOnlyAdminsMayEditPriorityConfiguration() {
+		return onlyAdminsMayEditPriorityConfiguration;
+	}
+
 	public SorterStrategy getStrategy() {
 		return strategy;
 	}

diff --git a/src/main/resources/jenkins/advancedqueue/PrioritySorterConfiguration/config.jelly b/src/main/resources/jenkins/advancedqueue/PrioritySorterConfiguration/config.jelly
@@ -13,6 +13,9 @@
                 <f:dropdownDescriptorSelector field="strategy" title="${%Strategy}"/>
                 <f:entry title="Allow priorities directly on Jobs" description="Check if you still want to have the ability to set priority directly on Jobs" field="allowPriorityOnJobs">
                     <f:checkbox id="ps_allowPriorityOnJobs" name="allowPriorityOnJobs" checked="${allowPriorityOnJobs}"/>
+                </f:entry>
+                <f:entry title="Only Admins can edit Job Priorities" description="Check if only Administrators should be allowed to view and edit the Job Priorities" field="onlyAdminsMayEditPriorityConfiguration">
+                    <f:checkbox name="onlyAdminsMayEditPriorityConfiguration" checked="${onlyAdminsMayEditPriorityConfiguration}"/>
                 </f:entry>               
             </f:optionalBlock>
         </j:if>
@@ -22,6 +25,9 @@
             <f:entry title="Allow priorities directly on Jobs" description="Check if you still want to have the ability to set priority directly on Jobs" field="allowPriorityOnJobs">
                 <f:checkbox id="ps_allowPriorityOnJobs" name="allowPriorityOnJobs" checked="${allowPriorityOnJobs}"/>
             </f:entry>          
+            <f:entry title="Only Admins can edit Job Priorities" description="Check if only Administrators should be allowed to view and edit the Job Priorities" field="onlyAdminsMayEditPriorityConfiguration">
+                <f:checkbox name="onlyAdminsMayEditPriorityConfiguration" checked="${onlyAdminsMayEditPriorityConfiguration}"/>
+            </f:entry>               
         </j:if>
 
     </f:section>