Commit Graph
32590 Commits
Author SHA1 Message Date
Jesse Glick 35ec226588 Merge branch 'stable-2.32' into security-stable-2.32 2017-01-03 14:58:26 -05:00
Jesse Glick 5df2ce9626 Merge branch 'stable-2.32' of git://github.com/jenkinsci/jenkins into stable-2.32 2017-01-03 14:58:21 -05:00
Jesse Glick a81ac59ffc Merge branch 'security-stable-2.7' into security-stable-2.19 2017-01-03 14:58:09 -05:00
Jesse Glick d3bd69243f Merge branch 'security-stable-1.651' into security-stable-2.7 2017-01-03 14:57:55 -05:00
Jesse Glick b05c1dba0a Merge branch 'security-stable-1.642' into security-stable-1.651 2017-01-03 14:57:41 -05:00
Jesse Glick 26406cd16e Merge branch 'security-stable-1.625' into security-stable-1.642 2017-01-03 14:56:09 -05:00
Andrew Bayer 0491ee2c23 [SECURITY-343] Switching to using CONNECT permission. 2017-01-03 11:56:07 -08:00
Jesse Glick fd2e081b94 Merge pull request #95 from jenkinsci-cert/SECURITY-353
[SECURITY-353] Persisted XSS in parameter definition names and value descriptions
2017-01-03 14:46:59 -05:00
Jesse Glick 169056e762 Documenting existence of escapeEntryTitleAndDescription flag as suggested by @daniel-beck. 2017-01-03 12:48:26 -05:00
Jesse Glick 6c69d3e851 Make compilable with JDK 9 javac. 2017-01-03 12:18:55 -05:00
Daniel Beck 246a0fa90a [FIX SECURITY-385] Only suggest visible views in search 2017-01-03 00:02:59 +01:00
Daniel Beck 250ce5b22a [FIX JENKINS-7874] Autocomplete admin links only when admin 2017-01-02 21:38:14 +01:00
Daniel Beck dc384ef0d7 [FIX JENKINS-26977] Use project-specific check URL 2017-01-02 20:15:31 +01:00
Daniel Beck c9b878f488 [FIX JENKINS-38175] Fix various ManagementLink related bugs
- In the context menu, the 'post' flag was set iff 'requiresConfirmation'
  was set, even though they're independent (e.g. Prepare for shutdown
  requires the former but not the latter)
- /manage screen: The icon (t:summary) does not support POST or
  confirmation links, but was set to not link only if no confirmation
  was required (i.e. POST links did not POST when the icon was clicked
  -- now the icon is not clickable as a workaround)
- /manage screen: All links requiring confirmation did POST, which masked
  the fact that the 'Reload from disk' link wasn't set up to require POST
  (it was only broken in the context menu). Now, confirmation and POST are
  separate flags, and 'Reload from disk' link now requests POST.
2017-01-02 19:56:59 +01:00
Daniel Beck 499eadbf31 Noting #2638, #2679 2017-01-02 15:41:04 +01:00
Kohsuke Kawaguchi 22e56edfa5 updated changelog for release 2017-01-02 06:33:27 -08:00
Kohsuke Kawaguchi 9e5ca1786e [maven-release-plugin] prepare for next development iteration 2017-01-02 06:26:24 -08:00
Kohsuke Kawaguchi b89fe642e7 [maven-release-plugin] prepare release jenkins-2.39 jenkins-2.39 2017-01-02 06:26:24 -08:00
Baptiste Mathus fceabf0f0f Fix test failing on Windows because of line feed assumption
The line separator length was assumed to be 1 byte wide, although it
could be 2 on some platforms (aka Windows).
2017-01-01 14:43:07 +01:00
Daniel Beck 9e05e0dec9 Merge pull request #2688 from damianszczepanik/pl
Polish translations
2017-01-01 11:32:07 +01:00
Daniel Beck c63d08423d Merge pull request #2686 from jordimas/master
Fixes to Catalan translation
2017-01-01 00:39:51 +01:00
Damian Szczepanik 4652184766 Polish translations 2016-12-31 01:18:07 +01:00
Jordi Mas e1828d8949 Fixes to Catalan translation 2016-12-30 08:52:25 +01:00
Sam Gleske bcf5b08927 Change insecure to unencrypted 2016-12-28 15:53:22 -08:00
Sam Gleske f47a5ccea7 JNLP3 not recommended 2016-12-27 15:56:24 -08:00
Sam Gleske 5f67d909ba [JENKINS-40700] Enhance slave protocol descriptions
Relates to [JENKINS-40700].  The updated displayNames describe the
protocols by using similar verbiage from:

core/src/main/resources/hudson/cli/CliProtocol/description.jelly
core/src/main/resources/hudson/cli/CliProtocol2/description.jelly
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.jelly
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description.jelly
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description.jelly
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol4/description.jelly

At a high level, I wanted to expose to the user, from a security
perspective, whether or not the protocols were secure and how.
2016-12-27 15:31:24 -08:00
Oleg Nenashev 7c2e1b2ece [FIXED JENKINS-39835] - Update remoting to 3.4 (#2679) 2016-12-27 12:06:26 +01:00
Victor 138ce3d8d1 [FIX JENKINS-39268] Properties are not passed to Maven command by Maven build step (#2638)
* [FIX JENKINS-39268] Properties are not passed to Maven command by Maven build step

* [FIX JENKINS-39268] Properties are not passed to Maven command by Maven build step

* [FIX JENKINS-39268] Properties are not passed to Maven command by Maven build step

* [FIX JENKINS-39268] Changed order in which properties are appended to command line: properties appended later win in case of conflicts

* [FIX JENKINS-39268] More precise messages in some assertions

* [FIX JENKINS-39268] Cleanup unused imports

* [FIX JENKINS-39268] Added functional tests for Maven task.
2016-12-27 10:47:18 +01:00
Daniel Beck 6ad91b9799 Typo 2016-12-25 21:01:48 +01:00
Daniel Beck 25e2df6977 Noting #2673, #2674, #2677 2016-12-25 20:42:13 +01:00
Kohsuke Kawaguchi 09215f131c Merge branch 'master' of github.com:jenkinsci/jenkins 2016-12-25 08:42:41 -08:00
Kohsuke Kawaguchi 289c7fb2dd updated changelog for release 2016-12-25 08:42:36 -08:00
Kohsuke Kawaguchi fb501134f4 [maven-release-plugin] prepare for next development iteration 2016-12-25 08:35:24 -08:00
Kohsuke Kawaguchi cde0363260 [maven-release-plugin] prepare release jenkins-2.38 jenkins-2.38 2016-12-25 08:35:24 -08:00
Daniel Beck 65e45861fa Merge pull request #2676 from damianszczepanik/pl
Polish translations
2016-12-25 16:48:20 +01:00
Daniel Beck d05752a032 [FIXED JENKINS-40666] - Correctly state that Jenkins will refuse to load plugins. (#2677)
[JENKINS-40666] - Correctly state that Jenkins will refuse to load plugins.
2016-12-25 16:37:18 +01:00
Oleg Nenashev 2612298f75 Merge pull request #2674 from jglick/InstallPluginCommand
[FIX JENKINS-32358] Correctly compute plugin name when multiple sources are passed to install-plugin CLI command
2016-12-25 16:36:26 +01:00
Kohsuke Kawaguchi 6996049da7 [maven-release-plugin] prepare for next development iteration 2016-12-24 11:50:38 -08:00
Kohsuke Kawaguchi 936cd2826e [maven-release-plugin] prepare release jenkins-2.32.1 jenkins-2.32.1 2016-12-24 11:50:38 -08:00
Jesse Glick 4f814c0a9f [FIXED JENKINS-25333] Update to Winstone 3.2. (#2673) 2016-12-24 15:09:58 +01:00
Damian Szczepanik eaa4c5c477 Polish translations 2016-12-22 23:36:15 +01:00
Jesse Glick ea2ca1c5cb Extended markup formatter fix to other core parameter types. 2016-12-21 18:10:10 -05:00
Jesse Glick 0b471b7b69 [SECURITY-353] Fixed markup formatter for StringParameterDefinition/Value. 2016-12-21 18:01:46 -05:00
Jesse Glick bedf304cd1 Merge branch 'security-stable-1.625' into SECURITY-353 2016-12-21 17:58:52 -05:00
Jesse Glick 2c1c1ecef9 Placate the JDK 9 compiler.
(cherry picked from commit 441bf1c255)
2016-12-21 17:57:05 -05:00
Jesse Glick b561ca5696 [SECURITY-353] Solved XSS, at the cost of markup formatters. 2016-12-21 17:49:16 -05:00
Jesse Glick 2e8837527d We also expect descriptions to be formatted, not merely escaped. 2016-12-21 17:36:09 -05:00
Jesse Glick c8aa949ff5 Noting need for escapes. 2016-12-21 17:04:20 -05:00
Jesse Glick 336751615c [SECURITY-353] Reproduced problem in test. 2016-12-21 17:04:10 -05:00
Jesse Glick a572450f03 [SECURITY-376] Remove backup directory for RekeySecretAdminMonitor. 2016-12-21 16:21:38 -05:00