Commit Graph
24004 Commits
Author SHA1 Message Date
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
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 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 f39c6b7b80 Merge branch 'security-stable-2.7' into security-stable-2.19 2016-12-20 15:21:13 -05:00
Jesse Glick 2cdabc1dec Merge branch 'security-stable-1.651' into security-stable-2.7 2016-12-20 15:20:24 -05:00
Jesse Glick 92839acc4b Merge branch 'security-stable-1.642' into security-stable-1.651 2016-12-20 15:19:11 -05:00
Jesse Glick 733e7a454d Merge branch 'security-stable-1.625' into security-stable-1.642 2016-12-20 15:18:25 -05:00
Jesse Glick 767a919b5d Merge pull request #83 from jenkinsci-cert/SECURITY-354
[SECURITY-354] Using jBCrypt 0.4
2016-12-20 15:16:46 -05:00
Jesse Glick 6efcf6c2ac Merge pull request #85 from jenkinsci-cert/security-371-staplerproxy
[SECURITY-371] Secure all administrative monitors
2016-12-20 15:16:05 -05:00
Jesse Glick 09cfbc9cd5 Merge pull request #86 from jenkinsci-cert/SECURITY-380
[FIX SECURITY-380] Don't optimize permission check in getItems()
2016-12-20 15:12:04 -05:00
Jesse Glick 4753091384 Merge branch 'stable-2.19' of git://github.com/jenkinsci/jenkins into stable-2.19 2016-12-20 15:06:12 -05:00
Andrew Bayer 17b98d6246 Responding to review comments. 2016-12-16 13:44:36 -05:00
Andrew Bayer 8126525582 [SECURITY-371] Ensure admin access for all AdministrativeMonitor actions. 2016-12-16 13:36:47 -05:00
Daniel Beck 8de0056065 [FIX SECURITY-380] Don't optimize permission check in getItems() 2016-12-07 21:48:38 +01:00
Kohsuke Kawaguchi 52a3a77a75 [maven-release-plugin] prepare for next development iteration 2016-11-28 09:58:56 -08:00
Kohsuke Kawaguchi a7520ef4da [maven-release-plugin] prepare release jenkins-2.19.4 jenkins-2.19.4 2016-11-28 09:58:56 -08:00
Jesse Glick 578298e70d [SECURITY-354] Using jBCrypt 0.4. 2016-11-21 16:20:38 -05:00
Oleg Nenashev 0399037f84 [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

(cherry picked from commit 91ad592142)
2016-11-18 08:54:08 +01:00
Kohsuke Kawaguchi df1f2b2ba4 Merge branch 'stable-2.19' of github.com:jenkinsci/jenkins into stable-2.19 2016-11-16 07:57:53 -08:00
Kohsuke Kawaguchi b4b0815300 updated changelog for release 2016-11-16 07:56:52 -08:00
Kohsuke Kawaguchi b1d7e0ee3c [maven-release-plugin] prepare for next development iteration 2016-11-16 07:50:00 -08:00
Kohsuke Kawaguchi 4bbf611a7c [maven-release-plugin] prepare release jenkins-2.19.3 jenkins-2.19.3 2016-11-16 07:50:00 -08:00
Jesse Glick 555a863886 Merge branch 'security-stable-2.7' into security-stable-2.19 2016-11-15 09:54:14 +01:00
Jesse Glick 7886b73c1c Merge (-s ours) stable-2.7 into stable-2.19 2016-11-15 09:53:17 +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 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