[JEP-224] System read permissions

pom.xml

@@ -44,6 +44,7 @@
   <properties>
     <jenkins.version>2.176.4</jenkins.version>
     <java.level>8</java.level>
+    <useBeta>true</useBeta>
   </properties>
 
   <licenses>
@@ -97,6 +98,14 @@
     </pluginRepository>
   </pluginRepositories>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.jvnet.hudson.plugins</groupId>
+      <artifactId>extended-read-permission</artifactId>
+      <version>3.2</version>
+    </dependency>
+  </dependencies>
+
   <build>
     <pluginManagement>
       <plugins>

src/main/java/com/cloudbees/simplediskusage/QuickDiskUsageInitializer.java

@@ -37,7 +37,7 @@ public class QuickDiskUsageInitializer {
      */
     @Initializer(after = InitMilestone.JOB_LOADED)
     public static void initialize() {
-        Jenkins jenkins = Jenkins.getInstance();
+        Jenkins jenkins = Jenkins.get();
         QuickDiskUsagePlugin plugin = jenkins.getPlugin(QuickDiskUsagePlugin.class);
         if (plugin == null) return;
         plugin.refreshDataOnStartup();

src/main/java/com/cloudbees/simplediskusage/QuickDiskUsageManagementLink.java

@@ -25,6 +25,8 @@
 
 import hudson.Extension;
 import hudson.model.ManagementLink;
+import hudson.plugins.extendedread.SystemReadPermission;
+import hudson.security.Permission;
 import jenkins.model.Jenkins;
 import org.kohsuke.stapler.StaplerProxy;
 
@@ -50,6 +52,12 @@ public String getUrlName() {
         return "disk-usage-simple";
     }
 
+    @Override
+    public Permission getRequiredPermission() {
+        // replace with Jenkins.SYSTEM_READ after baseline >= 2.222
+        return SystemReadPermission.SYSTEM_READ;
+    }
+
     /**
      * Name of the category for this management link. Exists so that plugins with core dependency pre-dating the version
      * when this was introduced can define a category.
@@ -68,8 +76,8 @@ public String getCategoryName() {
      */
     @Override
     public Object getTarget() {
-        Jenkins jenkins = Jenkins.getInstance();
-        jenkins.checkPermission(Jenkins.ADMINISTER);
+        Jenkins jenkins = Jenkins.get();
+        jenkins.checkPermission(SystemReadPermission.SYSTEM_READ);
         return jenkins.getPlugin(QuickDiskUsagePlugin.class);
     }
 }

src/main/java/com/cloudbees/simplediskusage/QuickDiskUsagePlugin.java

@@ -140,7 +140,7 @@ public void doRefresh(StaplerRequest req, StaplerResponse res) throws IOExceptio
 
     @RequirePOST
     public void doClean(StaplerRequest req, StaplerResponse res) throws IOException, ServletException {
-        Jenkins jenkins = Jenkins.getInstance();
+        Jenkins jenkins = Jenkins.get();
         final Job job = jenkins.getItemByFullName(req.getParameter("job"), Job.class);
         Timer.get().submit(new Runnable() {
             @Override
@@ -188,7 +188,7 @@ public void onCompleted(Path dir, long usage) {
     }
 
     private void registerJobs(UsageComputation uc) throws IOException, InterruptedException {
-        Jenkins jenkins = Jenkins.getInstance();
+        Jenkins jenkins = Jenkins.get();
 
         // Remove useless entries for jobs
         for (JobDiskItem item : jobsUsages) {
@@ -206,7 +206,7 @@ private void registerJobs(UsageComputation uc) throws IOException, InterruptedEx
     }
 
     private void registerDirectories(UsageComputation uc) throws IOException, InterruptedException {
-        Jenkins jenkins = Jenkins.getInstance();
+        Jenkins jenkins = Jenkins.get();
         Map<File, String> directoriesToProcess = new HashMap<>();
         // Display JENKINS_HOME size
         directoriesToProcess.put(jenkins.getRootDir(), "JENKINS_HOME");
@@ -249,7 +249,7 @@ public void run() {
             logger.info("Re-estimating disk usage");
             progress.set(0);
             lastRunStart = System.currentTimeMillis();
-            Jenkins jenkins = Jenkins.getInstance();
+            Jenkins jenkins = Jenkins.get();
             try (ACLContext old = ACL.as(ACL.SYSTEM)) {
                 UsageComputation uc = new UsageComputation(Arrays.asList(Paths.get(System.getProperty("java.io.tmpdir")), jenkins.getRootDir().toPath()));
                 registerJobs(uc);
@@ -273,7 +273,7 @@ public void run() {
 
     private transient final Runnable computeDiskUsageOnStartup = new Runnable() {
         public void run() {
-            Jenkins jenkins = Jenkins.getInstance();
+            Jenkins jenkins = Jenkins.get();
             while (jenkins.getInitLevel() != InitMilestone.COMPLETED) {
                 try {
                     logger.log(Level.INFO, "Waiting for Jenkins to be up before computing disk usage");

src/main/java/com/cloudbees/simplediskusage/UsageComputation.java

@@ -74,7 +74,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
                 // this is to speed up the FS freeze operation which is otherwise slowed down
                 if (System.currentTimeMillis() - writableLastCheckTime.get() > 10000) {
                     writableLastCheckTime.set(System.currentTimeMillis());
-                    FilePath jenkinsHome = Jenkins.getInstance().getRootPath();
+                    FilePath jenkinsHome = Jenkins.get().getRootPath();
                     try {
                         jenkinsHome.touch(System.currentTimeMillis());
                     } catch (InterruptedException e) {

src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/directories.jelly

@@ -25,7 +25,7 @@
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
-    <l:layout title="${%Disk usage}" permission="${app.ADMINISTER}">
+    <l:layout title="${%Disk usage}" permission="${app.SYSTEM_READ}">
         <l:breadcrumb title="${%Disk usage}" href="./directories"/>
         <st:include page="sidepanel.jelly" />
         <l:main-panel>

src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/index.jelly

@@ -25,7 +25,7 @@
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:s="/lib/form">
-    <l:layout title="${%Disk usage}" permission="${app.ADMINISTER}">
+    <l:layout title="${%Disk usage}" permission="${app.SYSTEM_READ}">
         <l:breadcrumb title="${%Disk usage}" href="."/>
         <st:include page="sidepanel.jelly" />
         <l:main-panel>