Migrate UpdateSiteWarningsMonitor

Author: Vlatombe

core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java

@@ -42,7 +42,6 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -144,17 +143,15 @@ private Set<UpdateSite.Warning> getActiveWarnings() {
      * Redirects the user to the plugin manager or security configuration
      */
     @RequirePOST
-    public HttpResponse doForward(@QueryParameter String fix, @QueryParameter String configure) {
+    public HttpResponse doFix() {
         Jenkins.get().checkPermission(Jenkins.ADMINISTER);
-        if (fix != null) {
-            return HttpResponses.redirectViaContextPath("pluginManager");
-        }
-        if (configure != null) {
-            return HttpResponses.redirectViaContextPath("configureSecurity");
-        }
+        return HttpResponses.redirectViaContextPath("pluginManager");
+    }
 
-        // shouldn't happen
-        return HttpResponses.redirectViaContextPath("/");
+    @RequirePOST
+    public HttpResponse doConfigure() {
+        Jenkins.get().checkPermission(Jenkins.ADMINISTER);
+        return HttpResponses.redirectViaContextPath("configureSecurity");
     }
 
     /**

core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy

@@ -67,11 +67,11 @@ def pluginWarnings = my.activePluginWarningsByPlugin
 div(class: "jenkins-alert jenkins-alert-danger", role: "alert") {
 
     l.isAdmin() {
-        form(method: "post", action: "${rootURL}/${my.url}/forward") {
+        form(method: "post") {
             if (!pluginWarnings.isEmpty()) {
-                f.submit(name: 'fix', value: _("pluginManager.link"))
+                f.submit(value: _("pluginManager.link"), action: "${rootURL}/${my.url}/fix")
             }
-            f.submit(name: 'configure', value: _("configureSecurity.link"))
+            f.submit(value: _("configureSecurity.link"), action: "${rootURL}/${my.url}/configure")
         }
     }