OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-15 13:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,590 Commits 55 Branches 1,942 Tags
1e646ff7ee52ecbbca3d7957b65fb4edfd39d653
Commit Graph
32590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Glick 00bf01eb17 Merge branch 'security-stable-2.46' into security-stable-2.60 2018-01-30 12:20:34 -05:00
Jesse Glick 38249b561b [SECURITY-624] Stored XSS vulnerability in tool names. 2018-01-30 12:18:09 -05:00
Jesse Glick eb03a42078 [SECURITY-705] Path traversal vulnerability in Plugin.doDynamic. 2018-01-30 12:16:42 -05:00
Jesse Glick 2d16b45920 [SECURITY-506] Require admin permission to validate proxy config. 2018-01-30 12:15:48 -05:00
Jesse Glick f4396a11d8 Merge branch 'security-stable-2.89' into security-master 2018-01-30 12:13:17 -05:00
Jesse Glick 8923ea137c Merge commit '53b9bdff752b97bece30d450697852cbf8089c6d' into security-master 2018-01-30 12:10:43 -05:00
Jesse Glick 921570c95f Merge branch 'stable-2.89' 2018-01-30 12:10:11 -05:00
Jesse Glick 1977ca2a08 Merge commit '53b9bdff752b97bece30d450697852cbf8089c6d' of git://github.com/jenkinsci/jenkins 2018-01-30 12:10:06 -05:00
Jesse Glick 6819252d4a Merge branch 'stable-2.89' of git://github.com/jenkinsci/jenkins into stable-2.89 2018-01-30 12:09:12 -05:00
Kseniia Nenasheva 2eda7816e8 [JENKINS-47793] - Jenkins master and agent configuration pages do not verify negative executor numbers (#3141) 
* Fixed Regexps for number & positive-number

* Progress saving

* Fix for validation

* bug fixing

* bug fixing

* Address comments

* Address comments

* Address comments from @jglick

* Whitespace cleanup

* Address comment for @jglick
 2018-01-30 17:33:53 +01:00
Oleg Nenashev e86e6f9e42 Merge pull request #3270 from oleg-nenashev/task-reactor/1.5 
[JENKINS-48725] - Update Lib Task Reactor to 1.5
 2018-01-30 17:33:05 +01:00
mike cirioli 5f0f9f2b87 [JENKINS-48463] added try-with-resources to XmlFileTest to ensure proper 
file handle cleanup in the event of failure

Fixed small nits regarding typo's and code cleanup
Added comment explaining why Xpp3 is still included as a dep
 2018-01-30 09:31:15 -05:00
Wadeck Follonier a2377c7476 - fix for test 2018-01-29 16:28:23 +01:00
Wadeck Follonier d0110590fc - add a short-living cache for the hash with just sha256(salt + plainToken) to speed up things after the first "complete" check 2018-01-29 15:58:20 +01:00
Kohsuke Kawaguchi 1a7881ce60 Merge branch 'master' of github.com:jenkinsci/jenkins 2018-01-29 04:38:42 -08:00
Daniel Beck 631ed7a456 Merge pull request #3274 from batmat/JENKINS-48407-disable-test-temporarily 
Disable test temporarily to get the release out
 2018-01-29 13:26:14 +01:00
Kohsuke Kawaguchi 53b9bdff75 [maven-release-plugin] prepare for next development iteration 2018-01-29 03:35:21 -08:00
Kohsuke Kawaguchi 4176b0c05e [maven-release-plugin] prepare release jenkins-2.104 jenkins-2.104 2018-01-29 03:35:21 -08:00
Baptiste Mathus 91237450bc Disable test temporarily to get the release out 
Note: this test is wrong, the production code is correct.
So that is why disabling this test until we fix it is OK.
 2018-01-29 11:55:44 +01:00
Wadeck Follonier 671772bf1c Improvement to keep pure compatibility with legacy system 2018-01-29 09:45:07 +01:00
Oleg Nenashev 66bb3dc6fd Merge pull request #3255 from dtrebbien/JENKINS-49060-include-filename-of-unreadable-file 
[JENKINS-49060] Include the filename of the unreadable file in the exception message
 2018-01-28 16:16:40 +01:00
Oleg Nenashev 839b003261 Merge pull request #1384 from daniel-beck/JENKINS-24452 
[JENKINS-24452] Don't export arbitrary unexportable exceptions
 2018-01-28 11:34:53 +01:00
Oleg Nenashev cd875f0e5a Merge pull request #3264 from jglick/Tomcat-JENKINS-49147 
[JENKINS-49147] Tolerate unusual CodeSource.location format from old versions of Tomcat
 2018-01-28 10:09:11 +01:00
Oleg Nenashev dbc75125c5 Merge pull request #3250 from oleg-nenashev/feature/JENKINS-48766-minimum-remoting-version 
[JENKINS-48766] - Expose information about Remoting versions via API
 2018-01-28 10:08:38 +01:00
Oleg Nenashev 73e2c9fb8f Merge pull request #3258 from daniel-beck/no-unbounded-polling 
Remove support for unbounded number of polling threads
 2018-01-28 10:08:01 +01:00
Oleg Nenashev b074b1aa19 Merge pull request #3261 from Wadeck/OLD_DATA_BOLD_ESCAPED 
[JENKINS-49126] OldDataMonitor: Prevent escaping b-old version
 2018-01-28 10:07:09 +01:00
Daniel Trebbien e798f64854 [JENKINS-49112] Revert use of Files.newBufferedReader() in Util.loadFile() (#3259) 
* [JENKINS-49112] Revert use of Files.newBufferedReader() in Util.loadFile()

This partially reverts 67076834a2.

* Restore the use of StringBuilder and reading into buf
 2018-01-26 18:35:20 +01:00
Oleg Nenashev f9b3b4ddbe Merge pull request #3266 from recena/JENKINS-49129 
[JENKINS-49129] Manage Jenkins dropdown menu no longer works
 2018-01-26 18:28:44 +01:00
Oleg Nenashev 720db118a8 [JENKINS-48725] - Update Lib Task Reactor to 1.5 2018-01-26 17:26:16 +01:00
Wadeck Follonier c87f5fd801 - adapt for new UI style on warning message 
- correct the help file name
 2018-01-26 16:20:50 +01:00
mike cirioli d994e65a9a [JENKINS-48463] Erring on the side of caution and incuding xpp3 libs back 
in, just in case some plugin might be depending on them
 2018-01-26 10:16:34 -05:00
Wadeck Follonier ef52f07eea [JENKINS-32776] API Tokens not more stored in a recoverable format 
- rewrite the groovy view into jelly one
- remove old config_xx.properties
- add capabilities on token: list/generate/revoke
- stored using BCrypt hashes
- migration from Legacy API Token
 2018-01-26 14:56:24 +01:00
Wadeck Follonier 197cf74f80 [JENKINS-32442] Disable API Tokens when user is created 
- admin monitor + configuration
- preparation for rewrite API Token
 2018-01-26 14:55:01 +01:00
Stephen Connolly 884e95e0fa [FIXED JENKINS-45235] When multiple update sites publish different versions, allow those versions to be seen 
- When automatically installing dependent plugins, the first update center with a version meeting the minimum required will win
- Also enhances the CLI command to allow specification of a minimum version
 2018-01-26 11:32:36 +00:00
Oleg Nenashev 1a85ea6388 Merge pull request #3262 from MarcoAurelioWM/patch-2 
Fix Spanish (es) link translation
 2018-01-26 11:04:58 +01:00
Oleg Nenashev bab0dbf914 Merge pull request #3267 from jglick/getEffectiveBrowser-JENKINS-46041 
[JENKINS-46041] If guessBrowser fails, return null and move on
 2018-01-26 11:01:10 +01:00
Jesse Glick 6a3e60ef71 [JENKINS-46041] If guessBrowser fails, return null and move on. 2018-01-25 17:48:02 -05:00
Manuel Recena 18efa58abf [JENKINS-49129] Manage Jenkins dropdown menu no longer works 2018-01-25 23:41:25 +01:00
Jesse Glick 193855d1fb [JENKINS-47142] Simplifying the logic of ArtifactArchiver.perform, making it friendlier to Pipeline. 2018-01-25 17:05:37 -05:00
Jesse Glick 655be64a17 [JENKINS-49147] Tolerate unusual CodeSource.location format from old versions of Tomcat. 2018-01-25 12:21:08 -05:00
Daniel Beck bed6ccd719 Merge pull request #3187 from daniel-beck/JENKINS-34254-v2 
[JENKINS-34254] Fix RequirePOST form

(cherry picked from commit 76c9f8beac)
 2018-01-25 13:44:08 +01:00
Alexander Akbashev e0ea7a648e [JENKINS-48350] Cache estimated duration for execution 
In case of having 1000s of ongoing builds opening main pages can take
some time if list of executors are opened. It happens because for every
queury that comes from jelly we re-calculate the value from scratch. And
calculation needs to load some builds from disk. The worst thing is that it
happens for every user separately.

(cherry picked from commit d7b120fea3)
 2018-01-25 13:32:51 +01:00
Alexander Akbashev eb41a7bb0a [JENKINS-48348] If task can be run only on master, use shortcut 
Currently Jenkins to fire WorkflowJob re-calculates the ConstistentHash
for entire cluster even if there is no nodes were updated. If cluster is
big enough (>100 nodes), it becomes a problem, because MD5 is quite
expensive itself plus all this logic comes with high memory footprint.

Using the knowledge that WorkflowJob can be executed only on Jenkins master,
we can create a shortcut that does not do expensive calculation and just
returns Runnable or `null`.

(cherry picked from commit 00ccd23f64)
 2018-01-25 13:30:05 +01:00
mike cirioli 992100ac42 [JENKINS-48463] - fixed reference to deprecated Xpp3Driver and replaced with 
new default driver
 2018-01-24 09:47:58 -05:00
mike cirioli 17f74fc713 Merge branch 'master' into OSS-2590 2018-01-24 09:27:57 -05:00
mike cirioli 0431cc75fd [JENKINS-48463] - Ignoring test xml1_0_withSpecialCharsShouldFail due to 
KXml2Driver being tolerant of control characters which should be illegal
in an XML v1.0 content.  This test should be revisted if we switch to
another XML driver
 2018-01-24 09:25:34 -05:00
mike cirioli a0f419120b [JENKINS-48463] It appears that the KXml2Driver is more tolerant of 
technically illegal xml (ie. it doesn't complain if an Xml v1.0 file
contains special characters).  Added a unit test that proves this, as well
as fixing silentlyMigrateConfigsTest so that it starts with technically
valid Xml 1.0 content
 2018-01-24 09:25:34 -05:00
mike cirioli b9c2148d6e [JENKINS-48463] Added a unit test that validates jenkins xml v1.0 configs 
are silently migrated to xml v1.1 as they are persisted
 2018-01-24 09:25:33 -05:00
mike cirioli 24a1852fc2 [JENKINS-48463] Added additional unit tests for verifying xml v1.1 compatibility 
- verify can still read xml 1.0
  - verify can read xml 1.1
  - verify can read xml 1.1 with 'special' characters
  - verify that jenkins can start with a config.xml having
    <?xml version='1.1'> and special characters
 2018-01-24 09:25:33 -05:00
mike cirioli 570b52dbcc [JENKINS-48463] refactored XStream2 to default to KXml2Driver by default. 
Changed all explicit references of the hierarchical driver to use a static
convinience method XStream2.getDefaultDriver() to ensure all XML operations
are using the same driver.
 2018-01-24 09:25:32 -05:00