Commit Graph
32590 Commits
Author SHA1 Message Date
Kohsuke Kawaguchi 839f0ac671 [maven-release-plugin] prepare for next development iteration 2016-11-13 18:43:24 -08:00
Kohsuke Kawaguchi 52f14349ab [maven-release-plugin] prepare release jenkins-2.31 jenkins-2.31 2016-11-13 18:43:24 -08:00
Oleg Nenashev ff31562aa6 Changelog: Noting #2626, #2627, #2612, #2631 and #2630 2016-11-13 23:33:11 +01:00
Oleg Nenashev 777dfe99b5 Noting upgrade to Remoting 3.1 in #2628 2016-11-13 23:06:32 +01:00
Oleg Nenashev 91ad592142 [FIXED JENKINS-38721, JENKINS-37282] - NPE in "CauseOfInterruption.UserInterruption" when user is missing (#2630)
* [FIXED JENKINS-38721] - Prevent NPE during rendering of "CauseOfInterruption.UserInterruption" when user is missing

It is a regression introduced in JENKINS-36594

* [JENKINS-38721] - Fix typo
2016-11-13 22:39:04 +01:00
Jesse Glick 8ebf09f141 Merge branch 'security-stable-1.651' into security-stable-2.7 2016-11-13 20:42:57 +01:00
Jesse Glick e155560459 Merge branch 'security-stable-1.642' into security-stable-1.651 2016-11-13 20:41:02 +01:00
Jesse Glick 29cba7e72a Merge branch 'security-stable-1.625' into security-stable-1.642 2016-11-13 20:39:29 +01:00
Jesse Glick ce8a2d51a5 Merge pull request #73 from jenkinsci-cert/20161116-for-1.625
[SECURITY-360] 2016/11/16 security fix for 1.625
2016-11-13 14:37:34 -05:00
Kohsuke Kawaguchi b379e77356 Released version 2016-11-13 11:23:59 -08:00
Jesse Glick 594b9f715c Stop storing three identical copies of remoting.jar in jenkins.war. 2016-11-13 19:47:43 +01:00
Jesse Glick 120d8b5395 Merge branch 'stable-2.7' into stable-2.19 2016-11-13 18:23:19 +01:00
Jesse Glick 2e90ee86b5 Merge branch 'security-stable-1.651' into security-stable-2.7 2016-11-13 18:21:03 +01:00
Jesse Glick d7a1f8fd07 Merge branch 'stable-2.7' into security-stable-2.7 2016-11-13 18:21:01 +01:00
Jesse Glick 582f6508e5 Merge branch 'stable-1.651' into stable-2.7 2016-11-13 18:20:51 +01:00
Jesse Glick 57722fc94b Merge branch 'stable-1.651' into security-stable-1.651 2016-11-13 18:19:27 +01:00
Jesse Glick b6995f9901 @kohsuke’s 8cde4eb incorrectly resolved a merge conflict, reverting a bit of 7493468. 2016-11-13 18:14:32 +01:00
Kohsuke Kawaguchi f1fd60f74d Remoting jar round #2 2016-11-13 07:01:54 -08:00
Kohsuke Kawaguchi d84d9a2ad3 Preparing the integration commit for Nov 16th release
Merge branch 'SECURITY-360-test' into security-stable-1.625
2016-11-11 18:57:33 -08:00
Kohsuke Kawaguchi e2a70ddff0 Merge branch 'security-stable-1.651' into security-stable-2.7 2016-11-11 18:15:34 -08:00
Kohsuke Kawaguchi 12d8506cf8 Merge (-s ours) stable-1.651 into stable-2.7 2016-11-11 18:11:27 -08:00
Kohsuke Kawaguchi b2eed3002d Because of JENKINS-32273 change in 1.649, exit code changes 2016-11-11 18:02:40 -08:00
Kohsuke Kawaguchi 8cde4eb533 Merge branch 'security-stable-1.642' into security-stable-1.651 2016-11-11 17:45:03 -08:00
Kohsuke Kawaguchi d6bba752b9 Merge branch 'security-stable-1.625' into security-stable-1.642 2016-11-11 17:42:43 -08:00
Kohsuke Kawaguchi e7db526465 Merge pull request #72 from jenkinsci-cert/ysoserialnew
Extend ysoserial coverage for latest cases [SECURITY-317]
2016-11-11 17:39:38 -08:00
Kohsuke Kawaguchi 6078dd7aa0 [SECURITY-360] integration test
Make sure LDAPAttribute gets rejected.
2016-11-11 17:34:28 -08:00
Kohsuke Kawaguchi f574224cae Merge pull request #71 from jenkinsci-cert/SECURITY-360
[SECURITY-360] system property to disable CLI
2016-11-11 16:52:59 -08:00
Sam Van Oort d42c39c93a Add explanation for spring tests 2016-11-11 19:45:01 -05:00
Daniel Beck 79183704af Merge pull request #2631 from damianszczepanik/pl-translate
Polish translations
2016-11-12 01:07:36 +01:00
Sam Van Oort 594ffcec02 Fix quirks in the tests 2016-11-11 18:50:35 -05:00
Sam Van Oort 3ba3a32204 Add entries for the new ysoserial tests and license headers 2016-11-11 18:06:43 -05:00
Sam Van Oort 4fc68251e3 Compileable ysoserial classes 2016-11-11 17:13:07 -05:00
Sam Van Oort 8395b78c83 Mostly working ysoserial updates 2016-11-11 16:50:14 -05:00
Kohsuke Kawaguchi fde9c42fe0 [SECURITY-360] introduce a system switch to kill CLI
This basically is a convenient version of
https://github.com/jenkinsci-cert/SECURITY-218.

During the course of discussing how to fix SECURITY-360, it was agreed
by the CERT team that we provide this switch.
2016-11-11 13:02:24 -08:00
Kohsuke Kawaguchi cfc9491e29 Fixing this back to 2.53.3 as the baseline 2016-11-11 12:42:46 -08:00
Damian Szczepanik fec9c14b8d Polish translations 2016-11-11 12:24:05 +01:00
Oleg Nenashev 7a948d3995 Update remoting to 2.31 in the Jenkins core. (#2628)
The change introduces one serious bugfix (JENKINS-39596) and a bunch of various diagnostics improvements.

Bugfixes:

* [JENKINS-39596](https://issues.jenkins-ci.org/browse/JENKINS-39596) -
Jenkins URL in `hudson.remoting.Engine` was always `null` since `3.0`.
It was causing connection failures of Jenkins JNLP agents when using Java Web Start.
([PR #131](https://github.com/jenkinsci/remoting/pull/131))
* [JENKINS-39617](https://issues.jenkins-ci.org/browse/JENKINS-39617) -
`hudson.remoting.Engine` was failing to establish connection if one of the URLs parameter in parameters was malformed.
([PR #131](https://github.com/jenkinsci/remoting/pull/131))

Improvements:

* [JENKINS-39150](https://issues.jenkins-ci.org/browse/JENKINS-39150) -
Add logic for dumping diagnostics across all the channels.
([PR #122](https://github.com/jenkinsci/remoting/pull/122), [PR #125](https://github.com/jenkinsci/remoting/pull/125))
* [JENKINS-39543](https://issues.jenkins-ci.org/browse/JENKINS-39543) -
Improve the caller/callee correlation diagnostics in thread dumps.
([PR #119](https://github.com/jenkinsci/remoting/pull/119))
* [JENKINS-39290](https://issues.jenkins-ci.org/browse/JENKINS-39290) -
Add the `org.jenkinsci.remoting.nio.NioChannelHub.disabled` flag for disabling NIO (mostly for debugging purposes).
([PR #123](https://github.com/jenkinsci/remoting/pull/123))
* [JENKINS-38692](https://issues.jenkins-ci.org/browse/JENKINS-38692) -
Add extra logging to help diagnosing `IOHub` Thread spikes.
([PR #116](https://github.com/jenkinsci/remoting/pull/116))
* [JENKINS-39289](https://issues.jenkins-ci.org/browse/JENKINS-39289) -
 When a proxy fails, report what caused the channel to go down.
([PR #128](https://github.com/jenkinsci/remoting/pull/128))
2016-11-10 22:14:44 +01:00
Jesse Glick e6db919e5f [JENKINS-39520] ExtensionList.removeAll is unimplemented (#2612)
* Work around SUREFIRE-1226 just like https://github.com/jenkinsci/plugin-pom/pull/33.

* [JENKINS-39520] Implement ExtensionList.removeAll.

* @oleg-nenashev suggests not notifying listeners unless we are actually removing something.
2016-11-10 20:00:18 +01:00
Oliver Gondža 8533fb628c Skip irrelevant test 2016-11-10 11:55:17 +01:00
Oleg Nenashev e0bfe6ee79 [FIXED JENKINS-39604] - ResourceBundleUtil#getBundle() should report resource misses on the low level
I propose the FINER level.

(cherry picked from commit 500cefddbc)
2016-11-09 20:08:25 +01:00
Thorsten Scherler 288a66dfab [FIX JENKINS-35845] Internationalisation for Blue Ocean and JDL (#2586)
* Load i18n resource bundles from plugins if not found in jenkins core

Signed-off-by: Thorsten Scherler <scherler@gmail.com>

* Issue 404 response for missing i18n resource bundles

Currently issues a 200 with an "error" response payload. This change still issues the error response payload, but also sets the HTTP response.

Signed-off-by: Thorsten Scherler <scherler@gmail.com>

* [JENKINS-35845] Fix test since we return now a 404

* [JENKINS-35845] add test for getting locale from plugin. fix comments from oleg.

* [JENKINS-35845] Fix description

* [JENKINS-35845] Update PR with comments from Oleg

* [JENKINS-35845] Add feedback from tom

* eslint - formating changes and fix offences

* eslint - formating changes and fix offences

* [JENKINS-35845] remove code concerning 404 response. Fix resourceBundle test by prevent NPE to happen

* [JENKINS-35845] Link to issue on which we introduced the test

(cherry picked from commit ab16e52519)
2016-11-09 20:07:54 +01:00
Lee Lavery 643442a480 [JENKINS-39172] - Add viewport meta tag (#2626)
* Add viewport meta tag

Enables better responsiveness on mobile devices

* fix: Use self-closing tag

* Remove minimum-scale for best accessibility

* Add viewport meta tag
2016-11-09 15:07:55 +01:00
Daniel Beck 72ee9e072d Merge pull request #2627 from oleg-nenashev/bug/JENKINS-39604
[FIXED JENKINS-39604] - ResourceBundleUtil#getBundle() should report misses on the low level
2016-11-09 15:07:36 +01:00
Daniel Beck 457bf2b6e7 Merge pull request #2625 from batmat/add-since
Add @since on Util.isSafeToRedirectTo()
2016-11-09 15:05:45 +01:00
Baptiste Mathus 5588df315d Add @since on Util.isSafeToRedirectTo() 2016-11-09 09:36:52 +01:00
Oleg Nenashev 500cefddbc [FIXED JENKINS-39604] - ResourceBundleUtil#getBundle() should report resource misses on the low level
I propose the FINER level.
2016-11-09 00:25:50 +01:00
Daniel Beck 2b39a3839b [FIX JENKINS-38615] Add user to restart log message
(cherry picked from commit 4462eda829)
2016-11-08 15:40:08 +01:00
Oleg Nenashev 47a1682d8e [JENKINS-39465] - Fix the AgentProtocol settings persistency handling (#2621)
* [JENKINS-39465] - Tweak processing of enabled and disabled protocols in Jenkins instance

Due to whatever reason, without a definition of an array recipient field the data goes to the disk in the following way:

```
<enabledAgentProtocol>JNLP3-connect</enabledAgentProtocol>
<enabledAgentProtocol>JNLP4-connect</enabledAgentProtocol>
```

It is supposed to processed by Implicit array correctly, but it does not actually happen.
With a fix the data is being stored in another format:

```
  <enabledAgentProtocols>
    <string>JNLP3-connect</string>
    <string>JNLP4-connect</string>
  </enabledAgentProtocols>
```

This data now works correctly and gets deserialized correctly. readResolve() just adds a fallback for the case when Implicit array handling starts behaving correctly (?).

* [JENKINS-39465] - Add configuration roundtrip tests

* [JENKINS-39465] - Jenkins#agentProtocols cache must be invalidated when we reload the configuration

* [JENKINS-39465] - Remove obsolete comment from Tests

(cherry picked from commit 3e2e017179)
2016-11-08 15:14:50 +01:00
Felix Belzunce Arcos d2514bbe08 [FIXED JENKINS-31871] Properly handle single quotes in item names (#1943)
(cherry picked from commit bee66ede31)
2016-11-08 15:08:39 +01:00
gusreiber 936091b42c [JENKINS-35263] displaying codeMirror as table to fix page sizing (#2575)
(cherry picked from commit 67df10db2d)
2016-11-08 15:00:47 +01:00