+
-
diff --git a/core/src/main/resources/hudson/PluginManager/table.properties b/core/src/main/resources/hudson/PluginManager/table.properties
index cc7af60893..35dffc1144 100644
--- a/core/src/main/resources/hudson/PluginManager/table.properties
+++ b/core/src/main/resources/hudson/PluginManager/table.properties
@@ -25,13 +25,14 @@ compatWarning=\
Consult the plugin release notes for details.
coreWarning=\
Warning: This plugin is built for Jenkins {0} or newer. \
- It may or may not work in your Jenkins.
+ Jenkins will refuse to load this plugin if installed.
depCompatWarning=\
Warning: This plugin requires dependent plugins be upgraded and at least one of these dependent plugins claims to use a different settings format than the installed version. \
Jobs using that plugin may need to be reconfigured, and/or you may not be able to cleanly revert to the prior version without manually restoring old settings. \
Consult the plugin release notes for details.
depCoreWarning=\
- Warning: This plugin requires dependent plugins that are \
- built for Jenkins {0} or newer. The dependent plugins may \
- or may not work in your Jenkins and consequently this \
- plugin may or may not work in your Jenkins.
+ Warning: This plugin requires dependent plugins that require Jenkins {0} or newer. \
+ Jenkins will refuse to load the dependent plugins requiring a newer version of Jenkins, \
+ and in turn loading this plugin will fail.
+securityWarning=\
+ Warning: This plugin version may not be safe to use. Please review the following security notices:
diff --git a/core/src/main/resources/jenkins/security/Messages.properties b/core/src/main/resources/jenkins/security/Messages.properties
index e09dca3e79..f0a98fb4a2 100644
--- a/core/src/main/resources/jenkins/security/Messages.properties
+++ b/core/src/main/resources/jenkins/security/Messages.properties
@@ -24,4 +24,5 @@ ApiTokenProperty.DisplayName=API Token
ApiTokenProperty.ChangeToken.TokenIsHidden=Token is hidden
ApiTokenProperty.ChangeToken.Success=
Updated. See the new token in the field above
ApiTokenProperty.ChangeToken.SuccessHidden=
Updated. You need to login as the user to see the token
-RekeySecretAdminMonitor.DisplayName=Re-keying
\ No newline at end of file
+RekeySecretAdminMonitor.DisplayName=Re-keying
+UpdateSiteWarningsMonitor.DisplayName=Update Site Warnings
diff --git a/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/config.groovy b/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/config.groovy
new file mode 100644
index 0000000000..ac82bf1891
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/config.groovy
@@ -0,0 +1,70 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.security.UpdateSiteWarningsConfiguration
+
+f = namespace(lib.FormTagLib)
+st = namespace("jelly:stapler")
+
+st.adjunct(includes: "jenkins.security.UpdateSiteWarningsConfiguration.style")
+
+def printEntry(warning, title, checked) {
+ f.block {
+ f.checkbox(name: warning.id,
+ title: title,
+ checked: checked,
+ class: 'hideWarnings');
+ div(class: "setting-description") {
+ a(warning.url, href: warning.url)
+ }
+ }
+}
+
+f.section(title:_("Hidden security warnings")) {
+
+ f.advanced(title: _("Security warnings"), align:"left") {
+ f.block {
+ text(_("blurb"))
+ }
+ f.entry(title: _("Security warnings"),
+ help: '/descriptorByName/UpdateSiteWarningsConfiguration/help') {
+ table(width:"100%") {
+
+ descriptor.applicableWarnings.each { warning ->
+ if (warning.type == hudson.model.UpdateSite.Warning.Type.CORE) {
+ printEntry(warning,
+ _("warning.core", warning.message),
+ !descriptor.isIgnored(warning))
+ }
+ else if (warning.type == hudson.model.UpdateSite.Warning.Type.PLUGIN) {
+ def plugin = descriptor.getPlugin(warning)
+ printEntry(warning,
+ _("warning.plugin", plugin.displayName, warning.message),
+ !descriptor.isIgnored(warning))
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/config.properties b/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/config.properties
new file mode 100644
index 0000000000..333445cd3f
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/config.properties
@@ -0,0 +1,27 @@
+# The MIT License
+#
+# Copyright (c) 2016, CloudBees, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+warning.core = Jenkins core: {0}
+warning.plugin = {0}: {1}
+
+blurb = This section allows you to disable warnings published on the update site. \
+ Checked warnings are visible (the default), unchecked warnings are hidden.
diff --git a/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/help.html b/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/help.html
new file mode 100644
index 0000000000..1cb7b1df5d
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/help.html
@@ -0,0 +1,14 @@
+
+ This list contains all warnings relevant to currently installed components published by the configured update sites.
+ These are typically security-related.
+ Warnings that have been published but are not relevant to currently installed components (either because the affected component isn't installed, or an unaffected version is installed) are not shown here.
+
+
+ Checked entries (the default) are active, i.e. they're shown to administrators in an administrative monitor.
+ Entries can be unchecked to hide them.
+ This can be useful if you've evaluated a specific warning and are confident it does not apply to your environment or configuration, and continued use of the specified component does not constitute a security problem.
+
+
+ Please note that only specific warnings can be disabled; it is not possible to disable all warnings about a certain component.
+ If you wish to disable the display of warnings entirely, then you can disable the administrative monitor in Configure System.
+
diff --git a/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/style.css b/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/style.css
new file mode 100644
index 0000000000..ff1dd9bb5e
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/UpdateSiteWarningsConfiguration/style.css
@@ -0,0 +1,4 @@
+.hideWarnings:not(:checked) + label {
+ color: grey;
+ text-decoration: line-through;
+}
diff --git a/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy b/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy
new file mode 100644
index 0000000000..09e9bfe161
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.groovy
@@ -0,0 +1,77 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package jenkins.security.UpdateSiteWarningsMonitor
+
+def f = namespace(lib.FormTagLib)
+
+def listWarnings(warnings) {
+ warnings.each { warning ->
+ li {
+ a(warning.message, href: warning.url)
+ }
+ }
+}
+
+def coreWarnings = my.activeCoreWarnings
+def pluginWarnings = my.activePluginWarningsByPlugin
+
+div(class: "error") {
+ text(_("blurb"))
+ ul {
+ if (!coreWarnings.isEmpty()) {
+ li {
+ text(_("coreTitle", jenkins.model.Jenkins.version))
+ ul {
+ listWarnings(coreWarnings)
+ }
+ }
+ }
+
+ if (!pluginWarnings.isEmpty()) {
+ li {
+ pluginWarnings.each { plugin, warnings ->
+ a(_("pluginTitle", plugin.displayName, plugin.version), href: plugin.url)
+
+ ul {
+ listWarnings(warnings)
+ }
+ }
+ }
+ }
+ }
+
+ if (my.hasApplicableHiddenWarnings()) {
+ text(_("more"))
+ }
+}
+
+form(method: "post", action: "${rootURL}/${it.url}/forward") {
+ div {
+ if (!pluginWarnings.isEmpty()) {
+ f.submit(name: 'fix', value: _("pluginManager.link"))
+ }
+ f.submit(name: 'configure', value: _("configureSecurity.link"))
+ }
+}
diff --git a/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.properties b/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.properties
new file mode 100644
index 0000000000..35d33182f2
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/UpdateSiteWarningsMonitor/message.properties
@@ -0,0 +1,31 @@
+# The MIT License
+#
+# Copyright (c) 2016, CloudBees, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+pluginTitle = {0} {1}:
+coreTitle = Jenkins {0} core and libraries:
+
+blurb = Warnings have been published for the following currently installed components:
+more = Additional warnings are hidden due to the current security configuration.
+
+
+pluginManager.link = Go to plugin manager
+configureSecurity.link = Configure which of these warnings are shown
diff --git a/pom.xml b/pom.xml
index bf7e674ac5..124fdb4d06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,7 +180,7 @@ THE SOFTWARE.
org.jenkins-ci.main
remoting
- 3.2
+ 3.4
diff --git a/test/src/test/java/hudson/model/UpdateSiteTest.java b/test/src/test/java/hudson/model/UpdateSiteTest.java
index 8e22d43f76..8e49e20f2d 100644
--- a/test/src/test/java/hudson/model/UpdateSiteTest.java
+++ b/test/src/test/java/hudson/model/UpdateSiteTest.java
@@ -33,6 +33,7 @@ import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import javax.servlet.ServletException;
@@ -41,6 +42,8 @@ import javax.servlet.http.HttpServletResponse;
import static org.junit.Assert.*;
+import jenkins.security.UpdateSiteWarningsConfiguration;
+import jenkins.security.UpdateSiteWarningsMonitor;
import org.apache.commons.io.FileUtils;
import org.eclipse.jetty.server.HttpConnection;
import org.eclipse.jetty.server.Request;
@@ -52,6 +55,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.recipes.LocalData;
public class UpdateSiteTest {
@@ -127,5 +131,24 @@ public class UpdateSiteTest {
assertEquals(FormValidation.ok(), us.updateDirectly(/* TODO the certificate is now expired, and downloading a fresh copy did not seem to help */false).get());
assertNotNull(us.getPlugin("AdaptivePlugin"));
}
-
+
+ @Test public void lackOfDataDoesNotFailWarningsCode() throws Exception {
+ assertNull("plugin data is not present", j.jenkins.getUpdateCenter().getSite("default").getData());
+
+ // nothing breaking?
+ j.jenkins.getExtensionList(UpdateSiteWarningsMonitor.class).get(0).getActivePluginWarningsByPlugin();
+ j.jenkins.getExtensionList(UpdateSiteWarningsMonitor.class).get(0).getActiveCoreWarnings();
+ j.jenkins.getExtensionList(UpdateSiteWarningsConfiguration.class).get(0).getAllWarnings();
+ }
+
+ @Test public void incompleteWarningsJson() throws Exception {
+ PersistedList sites = j.jenkins.getUpdateCenter().getSites();
+ sites.clear();
+ URL url = new URL(baseUrl, "/plugins/warnings-update-center-malformed.json");
+ UpdateSite site = new UpdateSite(UpdateCenter.ID_DEFAULT, url.toString());
+ sites.add(site);
+ assertEquals(FormValidation.ok(), site.updateDirectly(false).get());
+ assertEquals("number of warnings", 7, site.getData().getWarnings().size());
+ assertNotEquals("plugin data is present", Collections.emptyMap(), site.getData().plugins);
+ }
}
diff --git a/test/src/test/java/hudson/tasks/MavenTest.java b/test/src/test/java/hudson/tasks/MavenTest.java
index 5a61b3f5dc..bbc3d804a4 100644
--- a/test/src/test/java/hudson/tasks/MavenTest.java
+++ b/test/src/test/java/hudson/tasks/MavenTest.java
@@ -45,10 +45,8 @@ import hudson.tasks.Maven.MavenInstallation.DescriptorImpl;
import hudson.tools.ToolProperty;
import hudson.tools.ToolPropertyDescriptor;
import hudson.tools.InstallSourceProperty;
-import hudson.tools.ToolInstallation;
import hudson.util.DescribableList;
-import java.io.IOException;
import java.util.Collections;
import javax.xml.transform.Source;
@@ -63,13 +61,11 @@ import hudson.model.PasswordParameterDefinition;
import org.jvnet.hudson.test.Issue;
import static org.junit.Assert.*;
-import org.apache.tools.ant.filters.TokenFilter.ContainsString;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.ExtractResourceSCM;
import org.jvnet.hudson.test.JenkinsRule;
import org.jvnet.hudson.test.ToolInstallations;
-import org.jvnet.hudson.test.SingleFileSCM;
/**
* @author Kohsuke Kawaguchi
@@ -323,21 +319,41 @@ public class MavenTest {
FreeStyleProject p = j.createFreeStyleProject();
p.updateByXml((Source) new StreamSource(getClass().getResourceAsStream("MavenTest/doPassBuildVariablesOptionally.xml")));
String log = j.buildAndAssertSuccess(p).getLog();
- assertTrue(p.getBuildersList().get(Maven.class).isInjectBuildVariables());
- assertTrue("Build variables are injected", log.contains("-DNAME=VALUE"));
+ assertTrue("Build variables injection should be enabled by default when loading from XML", p.getBuildersList().get(Maven.class).isInjectBuildVariables());
+ assertTrue("Build variables should be injected by default when loading from XML", log.contains("-DNAME=VALUE"));
p.getBuildersList().clear();
p.getBuildersList().add(new Maven("--help", maven.getName(), null, null, null, false, null, null, false/*do not inject*/));
log = j.buildAndAssertSuccess(p).getLog();
- assertFalse("Build variables are not injected", log.contains("-DNAME=VALUE"));
+ assertFalse("Build variables should not be injected", log.contains("-DNAME=VALUE"));
p.getBuildersList().clear();
p.getBuildersList().add(new Maven("--help", maven.getName(), null, null, null, false, null, null, true/*do inject*/));
log = j.buildAndAssertSuccess(p).getLog();
- assertTrue("Build variables are injected", log.contains("-DNAME=VALUE"));
+ assertTrue("Build variables should be injected", log.contains("-DNAME=VALUE"));
- assertFalse(new Maven("", "").isInjectBuildVariables());
+ assertFalse("Build variables injection should be disabled by default", new Maven("", "").isInjectBuildVariables());
+ }
+
+ @Test public void doAlwaysPassProperties() throws Exception {
+ MavenInstallation maven = ToolInstallations.configureMaven3();
+
+ FreeStyleProject p = j.createFreeStyleProject();
+ String properties = "TEST_PROP1=VAL1\nTEST_PROP2=VAL2";
+
+ p.getBuildersList().add(new Maven("--help", maven.getName(), null, properties, null, false, null,
+ null, false/*do not inject build variables*/));
+ String log = j.buildAndAssertSuccess(p).getLog();
+ assertTrue("Properties should always be injected, even when build variables injection is disabled",
+ log.contains("-DTEST_PROP1=VAL1") && log.contains("-DTEST_PROP2=VAL2"));
+
+ p.getBuildersList().clear();
+ p.getBuildersList().add(new Maven("--help", maven.getName(), null, properties, null, false, null,
+ null, true/*do inject build variables*/));
+ log = j.buildAndAssertSuccess(p).getLog();
+ assertTrue("Properties should always be injected, even when build variables injection is enabled",
+ log.contains("-DTEST_PROP1=VAL1") && log.contains("-DTEST_PROP2=VAL2"));
}
}
diff --git a/test/src/test/resources/plugins/warnings-update-center-malformed.json b/test/src/test/resources/plugins/warnings-update-center-malformed.json
new file mode 100644
index 0000000000..ba99e7aa55
--- /dev/null
+++ b/test/src/test/resources/plugins/warnings-update-center-malformed.json
@@ -0,0 +1,264 @@
+{
+ "connectionCheckUrl": "http://www.google.com/",
+ "core": {
+ "buildDate": "Dec 18, 2016",
+ "name": "core",
+ "sha1": "x4rDgtNYm9l7zJ16RVuxMRgGoQE=",
+ "url": "http://updates.jenkins-ci.org/download/war/2.37/jenkins.war",
+ "version": "2.37"
+ },
+ "id": "jenkins40494",
+ "plugins": {
+ "display-url-api": {
+ "buildDate": "Sep 22, 2016",
+ "dependencies": [
+ {
+ "name": "junit",
+ "optional": false,
+ "version": "1.3"
+ }
+ ],
+ "developers": [
+ {
+ "developerId": "jdumay",
+ "email": "jdumay@cloudbees.com",
+ "name": "James Dumay"
+ }
+ ],
+ "excerpt": "\\\\ Provides the DisplayURLProvider extension point to provide alternate URLs for use in notifications. URLs can be requested/extended for these UI locations: * Root page. * Job. * Run. * Run changes. * Test result. ",
+ "gav": "org.jenkins-ci.plugins:display-url-api:0.5",
+ "labels": [],
+ "name": "display-url-api",
+ "previousTimestamp": "2016-09-22T09:35:08.00Z",
+ "previousVersion": "0.4",
+ "releaseTimestamp": "2016-09-22T10:42:00.00Z",
+ "requiredCore": "1.625.3",
+ "scm": "github.com",
+ "sha1": "QEykyLSFuZTnFyHrzZEOgzSsYcU=",
+ "title": "Display URL API",
+ "url": "http://updates.jenkins-ci.org/download/plugins/display-url-api/0.5/display-url-api.hpi",
+ "version": "0.5",
+ "wiki": "https://wiki.jenkins-ci.org/display/JENKINS/Display+URL+API+Plugin"
+ },
+ "junit": {
+ "buildDate": "Oct 17, 2016",
+ "dependencies": [
+ {
+ "name": "structs",
+ "optional": false,
+ "version": "1.2"
+ }
+ ],
+ "developers": [
+ {
+ "developerId": "ogondza"
+ }
+ ],
+ "excerpt": "Allows JUnit-format test results to be published.",
+ "gav": "org.jenkins-ci.plugins:junit:1.19",
+ "labels": [
+ "report"
+ ],
+ "name": "junit",
+ "previousTimestamp": "2016-08-08T15:10:34.00Z",
+ "previousVersion": "1.18",
+ "releaseTimestamp": "2016-10-17T12:15:20.00Z",
+ "requiredCore": "1.580.1",
+ "scm": "github.com",
+ "sha1": "f3jcYlxz6/8PK43W3KL5LFtz7ro=",
+ "title": "JUnit Plugin",
+ "url": "http://updates.jenkins-ci.org/download/plugins/junit/1.19/junit.hpi",
+ "version": "1.19",
+ "wiki": "https://wiki.jenkins-ci.org/display/JENKINS/JUnit+Plugin"
+ },
+ "mailer": {
+ "buildDate": "Sep 04, 2016",
+ "dependencies": [
+ {
+ "name": "display-url-api",
+ "optional": false,
+ "version": "0.2"
+ }
+ ],
+ "developers": [
+ {
+ "developerId": "andresrc"
+ }
+ ],
+ "excerpt": "This plugin allows you to configure email notifications for build results. This is a break-out of the original core based email component. ",
+ "gav": "org.jenkins-ci.plugins:mailer:1.18",
+ "labels": [],
+ "name": "mailer",
+ "previousTimestamp": "2016-04-20T08:46:22.00Z",
+ "previousVersion": "1.17",
+ "releaseTimestamp": "2016-09-04T09:14:16.00Z",
+ "requiredCore": "1.625.3",
+ "scm": "github.com",
+ "sha1": "poG1EauZFM5lZE5hCBx5mqr/mMA=",
+ "title": "Jenkins Mailer Plugin",
+ "url": "http://updates.jenkins-ci.org/download/plugins/mailer/1.18/mailer.hpi",
+ "version": "1.18",
+ "wiki": "https://wiki.jenkins-ci.org/display/JENKINS/Mailer"
+ },
+ "extra-columns": {
+ "buildDate": "Apr 11, 2016",
+ "dependencies": [
+ {
+ "name": "junit",
+ "optional": false,
+ "version": "1.11"
+ }
+ ],
+ "developers": [
+ {
+ "developerId": "fredg",
+ "name": "Fred G."
+ }
+ ],
+ "excerpt": "This is a general listview-column plugin that currently contains the following columns: Test Result, Configure Project button, Disable/Enable Project button, Project Description, Build Description, SCM Type, Last/Current Build Console output, Job Type, Build Duration, Build Parameters.",
+ "gav": "org.jenkins-ci.plugins:extra-columns:1.17",
+ "labels": [
+ "listview-column"
+ ],
+ "name": "extra-columns",
+ "previousTimestamp": "2015-12-11T01:18:48.00Z",
+ "previousVersion": "1.16",
+ "releaseTimestamp": "2016-04-11T22:36:22.00Z",
+ "requiredCore": "1.475",
+ "scm": "github.com",
+ "sha1": "8y9Y91n7/Aw47G3pCxzJzTd94J0=",
+ "title": "Extra Columns Plugin",
+ "url": "http://updates.jenkins-ci.org/download/plugins/extra-columns/1.17/extra-columns.hpi",
+ "version": "1.17",
+ "wiki": "https://wiki.jenkins-ci.org/display/JENKINS/Extra+Columns+Plugin"
+ },
+ "structs": {
+ "buildDate": "Aug 30, 2016",
+ "dependencies": [],
+ "developers": [
+ {
+ "developerId": "jglick"
+ }
+ ],
+ "excerpt": "Library plugin for DSL plugins that need concise names for Jenkins extensions",
+ "gav": "org.jenkins-ci.plugins:structs:1.5",
+ "labels": [],
+ "name": "structs",
+ "previousTimestamp": "2016-08-26T14:11:44.00Z",
+ "previousVersion": "1.4",
+ "releaseTimestamp": "2016-08-30T14:10:10.00Z",
+ "requiredCore": "1.580.1",
+ "scm": "github.com",
+ "sha1": "fK+F0PEfSS//DOqmNJvX2rQYabo=",
+ "title": "Structs Plugin",
+ "url": "http://updates.jenkins-ci.org/download/plugins/structs/1.5/structs.hpi",
+ "version": "1.5",
+ "wiki": "https://wiki.jenkins-ci.org/display/JENKINS/Structs+plugin"
+ }
+ },
+ "warnings": [
+ {
+ "id": "SECURITY-208",
+ "type": "plugin",
+ "name": "google-login",
+ "message": "Authentication bypass vulnerability",
+ "url": "https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-10-12",
+ "versions": [
+ {
+ "lastVersion": "1.1",
+ "pattern": "1[.][01](|[.-].*)"
+ }
+ ]
+ },
+ {
+ "id": "SECURITY-136",
+ "type": "plugin",
+ "name": "extra-columns",
+ "message": "Stored XSS vulnerability",
+ "url": "https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2016-04-11",
+ "versions": [
+ {
+ "lastVersion": "1.16",
+ "pattern": "1[.](\\d|1[0123456])(|[.-].*)"
+ }
+ ]
+ },
+ {
+ "id": "SECURITY-258",
+ "type": "plugin",
+ "name": "extra-columns",
+ "message": "Groovy sandbox protection incomplete",
+ "url": "https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2016-04-11",
+ "versions": [
+ {
+ "lastVersion": "1.18",
+ "pattern": "1[.](\\d|1[012345678])(|[.-].*)"
+ }
+ ]
+ },
+ {
+ "id": "SECURITY-85",
+ "type": "plugin",
+ "name": "tap",
+ "message": "Path traversal vulnerability",
+ "url": "https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2016-06-20",
+ "versions": [
+ {
+ "lastVersion": "1.24",
+ "pattern": "1[.](\\d|1\\d|2[01234])(|[.-].*)"
+ }
+ ]
+ },
+ {
+ "id": "SECURITY-278",
+ "type": "plugin",
+ "name": "image-gallery",
+ "message": "Path traversal vulnerability",
+ "url": "https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2016-06-20",
+ "versions": [
+ {
+ "lastVersion": "1.3",
+ "pattern": "(0[.].*|1[.][0123])(|[.-].*)"
+ }
+ ]
+ },
+ {
+ "id": "SECURITY-290",
+ "type": "plugin",
+ "name": "build-failure-analyzer",
+ "message": "Cross-site scripting vulnerability",
+ "url": "https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2016-06-20",
+ "versions": [
+ {
+ "lastVersion": "1.15.0",
+ "pattern": "1[.](\\d|1[012345])[.]\\d+(|[.-].*)"
+ }
+ ]
+ },
+ {
+ "id": "SECURITY-305",
+ "type": "plugin",
+ "versions": [
+ {
+ "lastVersion": "1.7.24",
+ "pattern": "1[.]7[.](\\d(|[.-].*)|24)"
+ }
+ ]
+ },
+ {
+ "id": "SECURITY-309",
+ "type": "plugin",
+ "name": "cucumber-reports",
+ "message": "Plugin disables Content-Security-Policy for files served by Jenkins",
+ "url": "https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2016-07-27",
+ "versions": [
+ {
+ "firstVersion": "1.3.0",
+ "lastVersion": "2.5.1",
+ "pattern": "(1[.][34]|2[.][012345])(|[.-].*)"
+ }
+ ]
+ }
+ ],
+ "updateCenterVersion": "1"
+}
\ No newline at end of file
diff --git a/war/pom.xml b/war/pom.xml
index 57c54b16a6..0c274318ac 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -93,7 +93,7 @@ THE SOFTWARE.
-->
org.jenkins-ci
winstone
- 3.1
+ 3.2
test
@@ -134,7 +134,7 @@ THE SOFTWARE.
org.jenkins-ci.modules
sshd
- 1.7
+ 1.9
org.jenkins-ci.ui
diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css
index 9491f28afb..3f2812f2cb 100644
--- a/war/src/main/webapp/css/style.css
+++ b/war/src/main/webapp/css/style.css
@@ -1580,6 +1580,13 @@ TEXTAREA.rich-editor {
color: #FF0000;
}
+#plugins .securityWarning {
+ white-space: normal;
+ margin-top: 0.5em;
+ padding-left: 2em;
+ color: #FF0000;
+}
+
/* ========================= progress bar ========================= */
table.progress-bar {