Merge branch 'security-stable-2.7' into security-stable-2.19

This commit is contained in:
Jesse Glick committed 2017-04-13 13:58:44 -04:00
commit 44c4c1cc0c
25 files changed
+426 -17

No files matched your search

@@ -1288,6 +1288,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
return hudson.util.HttpResponses.okJSON(response);
}
@RequirePOST
public HttpResponse doUpdateSources(StaplerRequest req) throws IOException {
Jenkins.getInstance().checkPermission(CONFIGURE_UPDATECENTER);
@@ -1322,6 +1323,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
/**
* Performs the installation of the plugins.
*/
@RequirePOST
public void doInstall(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
Set<String> plugins = new LinkedHashSet<>();