Render /manage using ManageJenkinsAction, handle links using StaplerF… (

jenkinsci#6126) Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com> Co-authored-by: Basil Crow <me@basilcrow.com> Co-authored-by: Tim Jacomb <timjacomb1+github@gmail.com> Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
janfaracik · Jul 12, 2022 · a990ebc · a990ebc
1 parent 788aaad
commit a990ebc
Show file tree

Hide file tree

Showing 44 changed files with 51 additions and 12 deletions.
diff --git a/core/src/main/java/hudson/model/ManageJenkinsAction.java b/core/src/main/java/hudson/model/ManageJenkinsAction.java
@@ -25,16 +25,26 @@
 package hudson.model;
 
 import hudson.Extension;
+import hudson.Util;
+import java.io.IOException;
 import jenkins.model.Jenkins;
+import jenkins.model.ModelObjectWithContextMenu;
+import org.apache.commons.jelly.JellyException;
 import org.jenkinsci.Symbol;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
+import org.kohsuke.stapler.Stapler;
+import org.kohsuke.stapler.StaplerFallback;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
 
 /**
  * Adds the "Manage Jenkins" link to the top page.
  *
  * @author Kohsuke Kawaguchi
  */
 @Extension(ordinal = 100) @Symbol("manageJenkins")
-public class ManageJenkinsAction implements RootAction {
+public class ManageJenkinsAction implements RootAction, StaplerFallback, ModelObjectWithContextMenu {
     @Override
     public String getIconFileName() {
         if (Jenkins.get().hasAnyPermission(Jenkins.MANAGE, Jenkins.SYSTEM_READ))
@@ -52,4 +62,29 @@ public String getDisplayName() {
     public String getUrlName() {
         return "/manage";
     }
+
+    @Override
+    public Object getStaplerFallback() {
+        return Jenkins.get();
+    }
+
+    @Override
+    public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse response) throws JellyException, IOException {
+        return new ContextMenu().from(this, request, response, "index");
+    }
+
+    /**
+     * Workaround to ensuring that links in context menus resolve correctly in the submenu of the top-level 'Dashboard'
+     * menu.
+     */
+    @Restricted(NoExternalUse.class)
+    public void addContextMenuItem(ContextMenu menu, String url, String icon, String iconXml, String text, boolean post, boolean requiresConfirmation) {
+        if (Stapler.getCurrentRequest().findAncestorObject(this.getClass()) != null || !Util.isSafeToRedirectTo(url)) {
+            // Default behavior if the URL is absolute or scheme-relative, or the current object is an ancestor (i.e. would resolve correctly)
+            menu.add(url, icon, iconXml, text, post, requiresConfirmation);
+            return;
+        }
+        // If neither is the case, rewrite the relative URL to point to inside the /manage/ URL space
+        menu.add("manage/" + url, icon, iconXml, text, post, requiresConfirmation);
+    }
 }
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
@@ -115,6 +115,7 @@
 import hudson.model.ListView;
 import hudson.model.LoadBalancer;
 import hudson.model.LoadStatistics;
+import hudson.model.ManageJenkinsAction;
 import hudson.model.ManagementLink;
 import hudson.model.Messages;
 import hudson.model.ModifiableViewGroup;
@@ -4415,7 +4416,7 @@ public ContextMenu doContextMenu(StaplerRequest request, StaplerResponse respons
         for (MenuItem i : menu.items) {
             if (i.url.equals(request.getContextPath() + "/manage")) {
                 // add "Manage Jenkins" subitems
-                i.subMenu = new ContextMenu().from(this, request, response, "manage");
+                i.subMenu = new ContextMenu().from(ExtensionList.lookupSingleton(ManageJenkinsAction.class), request, response, "index");
             }
         }
         return menu;

diff --git a/core/src/main/resources/hudson/PluginManager/sidepanel.groovy b/core/src/main/resources/hudson/PluginManager/sidepanel.groovy
@@ -30,7 +30,7 @@ l.side_panel {
         l.task(icon:"icon-up icon-md", href:rootURL+'/', title:_("Back to Dashboard"))
         l.task(icon:"symbol-settings", href:"${rootURL}/manage", title:_("Manage Jenkins"))
         if (!app.updateCenter.jobs.isEmpty()) {
-            l.task(icon: "symbol-download", href:"${rootURL}/updateCenter/", title:_("Update Center"))
+            l.task(icon: "symbol-download", href:"../updateCenter/", title:_("Update Center"))
         }
     }
 }
diff --git a/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly b/core/src/main/resources/hudson/model/ComputerSet/sidepanel.jelly
@@ -34,7 +34,7 @@ THE SOFTWARE.
       <l:task href="${rootURL}/" icon="icon-up icon-md" title="${%Back to Dashboard}"/>
       <l:task href="${rootURL}/manage" icon="symbol-settings" permissions="${app.MANAGE_AND_SYSTEM_READ}" title="${%Manage Jenkins}"/>
       <l:task href="new" icon="symbol-add" permission="${createPermission}" title="${%New Node}"/>
-      <l:task href="${rootURL}/configureClouds" icon="symbol-cloud" permission="${app.SYSTEM_READ}"
+      <l:task href="../configureClouds" icon="symbol-cloud" permission="${app.SYSTEM_READ}"
               title="${app.hasPermission(app.ADMINISTER) ? '%Configure Clouds' : '%View Clouds'}"/>
       <l:task href="configure" icon="symbol-settings" permissions="${app.MANAGE_AND_SYSTEM_READ}" title="${%Node Monitoring}"/>
     </l:tasks>

diff --git a/...ources/jenkins/model/Jenkins/manage.jelly → ...son/model/ManageJenkinsAction/index.jelly b/...ources/jenkins/model/Jenkins/manage.jelly → ...son/model/ManageJenkinsAction/index.jelly
@@ -31,18 +31,18 @@ THE SOFTWARE.
     <l:app-bar title="${%Manage Jenkins}" />
 
     <j:if test="${taskTags==null}">
-      <st:include page="sidepanel.jelly" />
+      <st:include page="sidepanel.jelly" it="${app}" />
     </j:if>
 
     <l:main-panel>
       <section class="manage-messages">
         <j:forEach var="am" items="${app.activeAdministrativeMonitors}">
           <st:include page="message.jelly" it="${am}" />
         </j:forEach>
-        <st:include page="downgrade.jelly" />
+        <st:include page="downgrade.jelly" it="${app}" />
       </section>
 
-      <j:forEach var="category" items="${it.categorizedManagementLinks.entrySet()}">
+      <j:forEach var="category" items="${app.categorizedManagementLinks.entrySet()}">
         <section class="jenkins-section jenkins-section--bottom-padding">
           <h2 class="jenkins-section__title">${category.key.label}</h2>
           ${taskTags!=null and attrs.contextMenu!='false' ? taskTags.addHeader(category.key.label) : null}
@@ -55,7 +55,7 @@ THE SOFTWARE.
               <j:set var="iconXml">
                 <l:icon src="${m.iconFileName}" />
               </j:set>
-              ${taskTags!=null and attrs.contextMenu!='false' ? taskTags.add(m.urlName, iconSrc, iconXml, m.displayName, m.requiresPOST, m.requiresConfirmation) : null}
+              ${taskTags!=null and attrs.contextMenu!='false' ? it.addContextMenuItem(taskTags, m.urlName, iconSrc, iconXml, m.displayName, m.requiresPOST, m.requiresConfirmation) : null}
               <j:choose>
                 <j:when test="${m.requiresConfirmation}">
                   <l:confirmationLink href="${m.urlName}" post="${m.requiresPOST}" message="${%are.you.sure(m.displayName)}">

diff --git a/...s/jenkins/model/Jenkins/manage.properties → ...odel/ManageJenkinsAction/index.properties b/...s/jenkins/model/Jenkins/manage.properties → ...odel/ManageJenkinsAction/index.properties
diff --git a/...enkins/model/Jenkins/manage_bg.properties → ...l/ManageJenkinsAction/index_bg.properties b/...enkins/model/Jenkins/manage_bg.properties → ...l/ManageJenkinsAction/index_bg.properties
diff --git a/...enkins/model/Jenkins/manage_ca.properties → ...l/ManageJenkinsAction/index_ca.properties b/...enkins/model/Jenkins/manage_ca.properties → ...l/ManageJenkinsAction/index_ca.properties
diff --git a/...enkins/model/Jenkins/manage_cs.properties → ...l/ManageJenkinsAction/index_cs.properties b/...enkins/model/Jenkins/manage_cs.properties → ...l/ManageJenkinsAction/index_cs.properties
diff --git a/...enkins/model/Jenkins/manage_da.properties → ...l/ManageJenkinsAction/index_da.properties b/...enkins/model/Jenkins/manage_da.properties → ...l/ManageJenkinsAction/index_da.properties
diff --git a/...enkins/model/Jenkins/manage_de.properties → ...l/ManageJenkinsAction/index_de.properties b/...enkins/model/Jenkins/manage_de.properties → ...l/ManageJenkinsAction/index_de.properties
diff --git a/...enkins/model/Jenkins/manage_el.properties → ...l/ManageJenkinsAction/index_el.properties b/...enkins/model/Jenkins/manage_el.properties → ...l/ManageJenkinsAction/index_el.properties
diff --git a/...enkins/model/Jenkins/manage_es.properties → ...l/ManageJenkinsAction/index_es.properties b/...enkins/model/Jenkins/manage_es.properties → ...l/ManageJenkinsAction/index_es.properties
diff --git a/...ins/model/Jenkins/manage_es_AR.properties → ...anageJenkinsAction/index_es_AR.properties b/...ins/model/Jenkins/manage_es_AR.properties → ...anageJenkinsAction/index_es_AR.properties
diff --git a/...enkins/model/Jenkins/manage_et.properties → ...l/ManageJenkinsAction/index_et.properties b/...enkins/model/Jenkins/manage_et.properties → ...l/ManageJenkinsAction/index_et.properties
diff --git a/...enkins/model/Jenkins/manage_fi.properties → ...l/ManageJenkinsAction/index_fi.properties b/...enkins/model/Jenkins/manage_fi.properties → ...l/ManageJenkinsAction/index_fi.properties
diff --git a/...enkins/model/Jenkins/manage_fr.properties → ...l/ManageJenkinsAction/index_fr.properties b/...enkins/model/Jenkins/manage_fr.properties → ...l/ManageJenkinsAction/index_fr.properties
diff --git a/...enkins/model/Jenkins/manage_he.properties → ...l/ManageJenkinsAction/index_he.properties b/...enkins/model/Jenkins/manage_he.properties → ...l/ManageJenkinsAction/index_he.properties
diff --git a/...enkins/model/Jenkins/manage_hu.properties → ...l/ManageJenkinsAction/index_hu.properties b/...enkins/model/Jenkins/manage_hu.properties → ...l/ManageJenkinsAction/index_hu.properties
diff --git a/...enkins/model/Jenkins/manage_it.properties → ...l/ManageJenkinsAction/index_it.properties b/...enkins/model/Jenkins/manage_it.properties → ...l/ManageJenkinsAction/index_it.properties
diff --git a/...enkins/model/Jenkins/manage_ja.properties → ...l/ManageJenkinsAction/index_ja.properties b/...enkins/model/Jenkins/manage_ja.properties → ...l/ManageJenkinsAction/index_ja.properties
diff --git a/...enkins/model/Jenkins/manage_ko.properties → ...l/ManageJenkinsAction/index_ko.properties b/...enkins/model/Jenkins/manage_ko.properties → ...l/ManageJenkinsAction/index_ko.properties
diff --git a/...enkins/model/Jenkins/manage_lt.properties → ...l/ManageJenkinsAction/index_lt.properties b/...enkins/model/Jenkins/manage_lt.properties → ...l/ManageJenkinsAction/index_lt.properties
diff --git a/...enkins/model/Jenkins/manage_lv.properties → ...l/ManageJenkinsAction/index_lv.properties b/...enkins/model/Jenkins/manage_lv.properties → ...l/ManageJenkinsAction/index_lv.properties
diff --git a/...ins/model/Jenkins/manage_nb_NO.properties → ...anageJenkinsAction/index_nb_NO.properties b/...ins/model/Jenkins/manage_nb_NO.properties → ...anageJenkinsAction/index_nb_NO.properties
diff --git a/...enkins/model/Jenkins/manage_nl.properties → ...l/ManageJenkinsAction/index_nl.properties b/...enkins/model/Jenkins/manage_nl.properties → ...l/ManageJenkinsAction/index_nl.properties
diff --git a/...enkins/model/Jenkins/manage_pl.properties → ...l/ManageJenkinsAction/index_pl.properties b/...enkins/model/Jenkins/manage_pl.properties → ...l/ManageJenkinsAction/index_pl.properties
diff --git a/...ins/model/Jenkins/manage_pt_BR.properties → ...anageJenkinsAction/index_pt_BR.properties b/...ins/model/Jenkins/manage_pt_BR.properties → ...anageJenkinsAction/index_pt_BR.properties
diff --git a/...ins/model/Jenkins/manage_pt_PT.properties → ...anageJenkinsAction/index_pt_PT.properties b/...ins/model/Jenkins/manage_pt_PT.properties → ...anageJenkinsAction/index_pt_PT.properties
diff --git a/...enkins/model/Jenkins/manage_ro.properties → ...l/ManageJenkinsAction/index_ro.properties b/...enkins/model/Jenkins/manage_ro.properties → ...l/ManageJenkinsAction/index_ro.properties
diff --git a/...enkins/model/Jenkins/manage_ru.properties → ...l/ManageJenkinsAction/index_ru.properties b/...enkins/model/Jenkins/manage_ru.properties → ...l/ManageJenkinsAction/index_ru.properties
diff --git a/...enkins/model/Jenkins/manage_sk.properties → ...l/ManageJenkinsAction/index_sk.properties b/...enkins/model/Jenkins/manage_sk.properties → ...l/ManageJenkinsAction/index_sk.properties
diff --git a/...enkins/model/Jenkins/manage_sl.properties → ...l/ManageJenkinsAction/index_sl.properties b/...enkins/model/Jenkins/manage_sl.properties → ...l/ManageJenkinsAction/index_sl.properties
diff --git a/...enkins/model/Jenkins/manage_sr.properties → ...l/ManageJenkinsAction/index_sr.properties b/...enkins/model/Jenkins/manage_sr.properties → ...l/ManageJenkinsAction/index_sr.properties
diff --git a/...ins/model/Jenkins/manage_sv_SE.properties → ...anageJenkinsAction/index_sv_SE.properties b/...ins/model/Jenkins/manage_sv_SE.properties → ...anageJenkinsAction/index_sv_SE.properties
diff --git a/...enkins/model/Jenkins/manage_tr.properties → ...l/ManageJenkinsAction/index_tr.properties b/...enkins/model/Jenkins/manage_tr.properties → ...l/ManageJenkinsAction/index_tr.properties
diff --git a/...enkins/model/Jenkins/manage_uk.properties → ...l/ManageJenkinsAction/index_uk.properties b/...enkins/model/Jenkins/manage_uk.properties → ...l/ManageJenkinsAction/index_uk.properties
diff --git a/...ins/model/Jenkins/manage_zh_TW.properties → ...anageJenkinsAction/index_zh_TW.properties b/...ins/model/Jenkins/manage_zh_TW.properties → ...anageJenkinsAction/index_zh_TW.properties
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/sidepanel.jelly b/core/src/main/resources/hudson/model/UpdateCenter/sidepanel.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
     <l:tasks>
       <l:task href="${rootURL}/" icon="icon-up icon-md" title="${%Back to Dashboard}"/>
       <l:task href="${rootURL}/manage" icon="symbol-settings" title="${%Manage Jenkins}"/>
-      <l:task href="${rootURL}/pluginManager/" icon="icon-plugin icon-lg" title="${%Manage Plugins}"/>
+      <l:task href="../pluginManager/" icon="icon-plugin icon-lg" title="${%Manage Plugins}"/>
     </l:tasks>
   </l:side-panel>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/model/GlobalCloudConfiguration/index.groovy b/core/src/main/resources/jenkins/model/GlobalCloudConfiguration/index.groovy
@@ -13,7 +13,7 @@ l.layout(norefresh:true, permission:app.SYSTEM_READ, title:my.displayName) {
     l.side_panel {
         l.tasks {
             l.task(icon:"icon-up icon-md", href:rootURL+'/', title:_("Back to Dashboard"))
-            l.task(icon:"symbol-settings", href:"${rootURL}/computer/", title:_("Manage Nodes"))
+            l.task(icon:"symbol-settings", href: "../computer/", title:_("Manage Nodes"))
         }
     }
     l.app_bar(title: my.displayName)

diff --git a/core/src/main/resources/jenkins/model/Jenkins/load-statistics.jelly b/core/src/main/resources/jenkins/model/Jenkins/load-statistics.jelly
@@ -26,9 +26,10 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
   <l:layout title="${it.displayName} ${%Load Statistics}">
     <st:include page="sidepanel.jelly" />
+    <l:breadcrumb title="${%Load Statistics}"/>
     <l:main-panel>
       <j:set var="prefix" value="overallLoad" />
       <st:include page="main.jelly" from="${it.overallLoad}" />
     </l:main-panel>
   </l:layout>
-</j:jelly>
+</j:jelly>
diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly
@@ -29,6 +29,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <l:layout permissions="${app.MANAGE_AND_SYSTEM_READ}" title="${%System Information}">
     <st:include page="sidepanel.jelly" />
+    <l:breadcrumb title="${%System Information}"/>
     <l:main-panel>
       <l:hasPermission permission="${app.SYSTEM_READ}">
         <div class="jenkins-app-bar">

diff --git a/core/src/main/resources/lib/hudson/scriptConsole.jelly b/core/src/main/resources/lib/hudson/scriptConsole.jelly
@@ -30,6 +30,7 @@ THE SOFTWARE.
   <l:layout permission="${h.ADMINISTER}" title="${%Script Console}">
     <st:include page="sidepanel.jelly" />
 
+    <l:breadcrumb title="${%Script Console}"/>
     <l:main-panel>
       <h1>${%Script Console}</h1>
 

diff --git a/test/src/test/java/jenkins/bugs/Jenkins64991Test.java b/test/src/test/java/jenkins/bugs/Jenkins64991Test.java
@@ -86,7 +86,7 @@ public void test403Redirect() throws Exception {
 
         final Page redirectedPage = HtmlFormUtil.submit(loginPage.getFormByName("login"));
         assertTrue(redirectedPage.isHtmlPage());
-        assertEquals(j.getURL() + "manage", redirectedPage.getUrl().toExternalForm());
+        assertEquals(j.getURL() + "manage/", redirectedPage.getUrl().toExternalForm());
         assertThat(redirectedPage.getWebResponse().getContentAsString(), containsStringIgnoringCase(Messages.GlobalSecurityConfiguration_DisplayName()));
     }