From 47a0be9eda79a181e67d2c977ef767ff74a722fd Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1+github@gmail.com>
Date: Thu, 27 Feb 2020 07:47:54 +0000
Subject: [PATCH] JENKINS-61201 JEP-224 System read - about jenkins (#4520)

---
 core/src/main/java/hudson/AboutJenkins.java               | 8 ++++++++
 core/src/main/java/hudson/PluginWrapper.java              | 2 +-
 core/src/main/resources/hudson/AboutJenkins/index.jelly   | 5 ++---
 .../hudson/PluginWrapper/thirdPartyLicenses.jelly         | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/hudson/AboutJenkins.java b/core/src/main/java/hudson/AboutJenkins.java
index 34fc120e57..e1712e040a 100644
--- a/core/src/main/java/hudson/AboutJenkins.java
+++ b/core/src/main/java/hudson/AboutJenkins.java
@@ -1,8 +1,11 @@
 package hudson;
 
 import hudson.model.ManagementLink;
+import hudson.security.Permission;
 import java.net.URL;
 
+import javax.annotation.Nonnull;
+import jenkins.model.Jenkins;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -38,4 +41,9 @@ public class AboutJenkins extends ManagementLink {
         return AboutJenkins.class.getResource("/META-INF/licenses.xml");
     }
 
+    @Nonnull
+    @Override
+    public Permission getRequiredPermission() {
+        return Jenkins.SYSTEM_READ;
+    }
 }
diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java
index b5b1b9c712..271df060ff 100644
--- a/core/src/main/java/hudson/PluginWrapper.java
+++ b/core/src/main/java/hudson/PluginWrapper.java
@@ -439,7 +439,7 @@ public class PluginWrapper implements Comparable<PluginWrapper>, ModelObject {
     }
 
     public Api getApi() {
-        Jenkins.get().checkPermission(Jenkins.ADMINISTER);
+        Jenkins.get().checkPermission(Jenkins.SYSTEM_READ);
         return new Api(this);
     }
 
diff --git a/core/src/main/resources/hudson/AboutJenkins/index.jelly b/core/src/main/resources/hudson/AboutJenkins/index.jelly
index 929bb4915c..e9f6032ba5 100644
--- a/core/src/main/resources/hudson/AboutJenkins/index.jelly
+++ b/core/src/main/resources/hudson/AboutJenkins/index.jelly
@@ -26,8 +26,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
 
-  <l:layout permission="${app.ADMINISTER}" type="one-column" title="${%about(app.VERSION)}">
-
+  <l:layout permission="${app.SYSTEM_READ}" type="one-column" title="${%about(app.VERSION)}">
     <l:main-panel>
     <div class="container-fluid">
       <div class="row">
@@ -56,7 +55,7 @@ THE SOFTWARE.
           <ul>
             <j:forEach var="p" items="${app.pluginManager.plugins}"> <!-- TODO sort -->
             <li>
-              <a href="${rootURL}/pluginManager/plugin/${p.shortName}/thirdPartyLicenses">
+              <a href="${rootURL}/plugin/${p.shortName}/wrapper/thirdPartyLicenses">
                 <j:choose>
                   <j:when test="${p.active}">
                     ${p.displayName}
diff --git a/core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses.jelly b/core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses.jelly
index acdbbb6b9e..5162ea977c 100644
--- a/core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses.jelly
+++ b/core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses.jelly
@@ -25,7 +25,7 @@ THE SOFTWARE.
 <!-- 3rd party license acknowledgements and  -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
-  <l:layout title="${%about(it.longName)}" permission="${app.ADMINISTER}">
+  <l:layout title="${%about(it.longName)}" permission="${app.SYSTEM_READ}">
     <l:main-panel>
       <h1>${%about(it.longName+' '+it.version)}</h1>