Commit Graph
4154 Commits
Author SHA1 Message Date
Oleg Nenashev 260a2576f2 [JENKINS-48946] - Move whitelist ordering test to core to fail fast 2018-01-15 20:02:58 +01:00
Kohsuke Kawaguchi d50004fa4e [maven-release-plugin] prepare for next development iteration 2018-01-14 18:13:39 -08:00
Kohsuke Kawaguchi 066252ee56 [maven-release-plugin] prepare release jenkins-2.102 2018-01-14 18:13:39 -08:00
Jesse Glick 3a99c2c6fd Merge branch 'master' of github.com:jenkinsci/jenkins 2018-01-12 17:40:48 -05:00
Baptiste Mathus 438e9296f0 Merge pull request #3170 from batmat/JENKINS-34855
[FIX JENKINS-34855] Create a FileChannelWriter and use it for AtomicFileWriter "enforced" flushing
2018-01-12 10:30:32 +01:00
Jesse Glick 5a24186d3c Merge branch 'master' into whitelist-JENKINS-47736 2018-01-08 10:48:06 -05:00
Kohsuke Kawaguchi 4dbe772a0b [maven-release-plugin] prepare for next development iteration 2018-01-07 18:20:10 -08:00
Kohsuke Kawaguchi 235a9bad68 [maven-release-plugin] prepare release jenkins-2.101 2018-01-07 18:20:10 -08:00
Oleg Nenashev a79fdaa4b3 Revert "[JENKINS-46911] createProjectFromXML not recognizing unsafe character…" (#3218)
* Revert "[JENKINS-48447] Fixed HTTP 404 error when clicking on newView sidebar link from an other view. (#3178)"

This reverts commit 6df06fc19a.

* Revert "[JENKINS-46911] createProjectFromXML not recognizing unsafe character… (#3057)"

This reverts commit ac2a1aaf89.
2018-01-07 18:26:57 +01:00
godfath3r ac2a1aaf89 [JENKINS-46911] createProjectFromXML not recognizing unsafe character… (#3057)
* [JENKINS-46911] createProjectFromXML not recognizing unsafe character '/'

* Better place for testCreateProjectCheckGoodName()

* Fix failed test

* Make changes suggested on PR review.

* Remove Failure exception, instead throw IOException. Add javadoc

* [JENKINS-46911] - Add TODO according to the comment from @jtnord.
2018-01-07 14:39:10 +01:00
Jesse Glick ba5516aa7c Merge branch 'master' into whitelist-JENKINS-47736 2018-01-04 14:03:26 -05:00
Kohsuke Kawaguchi c4e912900b [maven-release-plugin] prepare for next development iteration 2018-01-03 15:48:04 -08:00
Kohsuke Kawaguchi 5707ff1766 [maven-release-plugin] prepare release jenkins-2.100 2018-01-03 15:48:04 -08:00
Jesse Glick 710c6e4b30 Merge branch 'master' into whitelist-JENKINS-47736 2018-01-03 17:54:45 -05:00
Oleg Nenashev 8eb4254b0f Merge pull request #3212 from oleg-nenashev/bug/JENKINS-48761-remoting-API
[JENKINS-48761] - Restore binary compatibility with agents running old Remoting versions
2018-01-03 23:35:56 +01:00
Oleg Nenashev 01b8ed8c71 [JENKINS-48761] - Address review comments from @jglick 2018-01-03 20:59:11 +01:00
Oleg Nenashev 8a34983d45 [JENKINS-48761] - Create a smoke test for old agents 2018-01-03 13:19:48 +01:00
Jesse Glick a544cb79f8 Merge branch 'master' into whitelist-JENKINS-47736 2018-01-02 10:12:28 -05:00
Kohsuke Kawaguchi 99ca101143 [maven-release-plugin] prepare for next development iteration 2017-12-31 18:15:37 -08:00
Kohsuke Kawaguchi 7975ee0cf9 [maven-release-plugin] prepare release jenkins-2.99 2017-12-31 18:15:37 -08:00
Oleg Nenashev 16042bd57b Merge pull request #3196 from jglick/unmarshal-JENKINS-21017
[JENKINS-21017] When unmarshalling into an existing object, reset missing fields
2017-12-29 11:56:08 +01:00
Oleg Nenashev 7e67c03a9b Merge branch 'master' into whitelist-JENKINS-47736
# Conflicts:
#	pom.xml
2017-12-28 22:30:37 +01:00
Kohsuke Kawaguchi 0ac93deba0 [maven-release-plugin] prepare for next development iteration 2017-12-25 01:03:42 -08:00
Kohsuke Kawaguchi 101a6cd44a [maven-release-plugin] prepare release jenkins-2.98 2017-12-25 01:03:41 -08:00
Oleg Nenashev cb3990a4d6 Update to Remoting 3.15 and Cleanup issues in Channel#current() usages (#3145)
Pulls in fixes for: JENKINS-48133, JENKINS-48055, JENKINS-37566, JENKINS-48309, JENKINS-47965, JENKINS-48130, JENKINS-37670, JENKINS-37566, JENKINS-46724 

This change also adds some missing null/closing channel checks in the core.
In some cases the change prevents spawning threads if the channel is in the invalid state.
2017-12-22 18:02:44 +01:00
Wadeck Follonier 02035017b6 Ensure all Jelly view have escape-by-default. (#3180)
* Ensure all Jelly view have escape-by-default.
- all those views escape the content theirself, so no vulnerability corrected here (for TextParameterDefinition, it's done by textarea.jelly)

* - just a line break at end

* - just a line break at end (part 2)

* - change from st:out to j:out because their content is expected to be html tags

* - st => j for all finally
2017-12-22 17:27:13 +01:00
Jesse Glick b8d236c658 Merge branch 'master' into whitelist-JENKINS-47736 2017-12-21 12:08:58 -05:00
Jesse Glick 837d0c90ac Allow whitelists to contain blank lines and comments. 2017-12-19 15:05:11 -05:00
Kohsuke Kawaguchi 90f778d281 [maven-release-plugin] prepare for next development iteration 2017-12-19 11:48:27 -08:00
Kohsuke Kawaguchi 5f2a40ba96 [maven-release-plugin] prepare release jenkins-2.97 2017-12-19 11:48:27 -08:00
Jesse Glick dfc1940eee Merge branch 'master' into whitelist-JENKINS-47736 2017-12-19 14:34:57 -05:00
Devin Nusbaum b98ba8c8ff Update local data for tests 2017-12-18 16:12:29 -05:00
Devin Nusbaum 94b1ba9782 Add test asserting that outdated dependencies of detached plugins are updated 2017-12-18 14:21:30 -05:00
Devin Nusbaum 6f03e6b6b9 Remove unneeded type specifier in lambda 2017-12-18 12:02:13 -05:00
Devin Nusbaum 5098524513 Add failing test that reproduces JENKINS-48604 2017-12-18 10:59:47 -05:00
Kohsuke Kawaguchi c32b6d807a [maven-release-plugin] prepare for next development iteration 2017-12-17 16:39:29 -08:00
Kohsuke Kawaguchi eac29da4f1 [maven-release-plugin] prepare release jenkins-2.96 2017-12-17 16:39:29 -08:00
Oleg Nenashev 968b6adf00 Merge pull request #3193 from dwnusbaum/JENKINS-48365
[JENKINS-48365] Install detached plugins when upgrading Jenkins past the version the plugins were detached
2017-12-17 14:26:51 +01:00
Daniel Beck 76c9f8beac Merge pull request #3187 from daniel-beck/JENKINS-34254-v2
[JENKINS-34254] Fix RequirePOST form
2017-12-16 22:16:37 +01:00
Wadeck Follonier 814d202716 [JENKINS-22474] API Token does not require CSRF token (#3129)
* [JENKINS-22474] API Token does not require CSRF token
- in order to ease the use of the api, we are not requiring the request to have a crumb
- in terms of security it's not a problem normally since the CSRF attacks use the cookies and in case of API Token, it's session-less / cookie-less

* - adjust the license header

* - add test for basic authentication
- add test for login process

* - add test for form submission using ui (htmlunit), not just login form

* - modification requested by Jesse

* - pom.xml update to use the last version of jenkins-test-harness (with the token helper methods)
- beginning of the simplification of tests

* - using the try-with-resource approach to ease readability

* - using closure method now

* - add missing login transformation

* - add unit test

* - use withToken
- remove useless crumb for GET method
- add fail (otherwise the assert in catch is not as useful as it could be)

* another bunch of test cases

* - for HudsonTestCase, some additional modifications are required: changing the view / different type of management for the variable inside the views

* - small other tests

* - last batch for the login method

* - crumb is not more required since we are using API Token

* - converting auth to ApiToken to avoid crumb method

* - converting auth to ApiToken to avoid crumb method (second)

* - remove usage of closure aware methods

* - update the pom using the snapshot as adviced by Jesse
- modifications on other class to adapt to the last modifications in JTH

* - modifications requested during code review

* - also put back my changes to the conflicted file

* - correction of the merge :)
2017-12-16 09:25:30 +01:00
Daniel Beck f0efdbab08 [JENKINS-34254] Add test 2017-12-15 23:43:01 +01:00
Wadeck Follonier b7f42b2e59 [JENKINS-27027] Notify the SecurityListener on authentication (#3074)
* [JENKINS-27026] Notify the SecurityListener in case of Token based authentication success
- due the current version of the method, the UserDetails required for the event was not accessible. In order to stay with the same API in SecurityListener, two "protected" methods were created to split the job and let the UserDetails accessible

* - add test to ensure the SecurityListener is called for REST Token but also for regular basic auth

* - remove the comment about the split, will be put in GitHub comment instead

* - add check for anonymous call instead of just putting a comment
- remove the constructor in the dummy
- add link to PR from Daniel to simplify a call

* - separate the before/after to save one clear and be more explicit
- put more meaning in the assertLastEventIs method by explicitly say we will remove the last event

* - add comment about why we do not fire the "failedToAuthenticated" in the case of an invalid token (tips: it's because it could be a valid password)

* - also add the authenticated trigger on legacy filter as pointed by Ivan

* - add support of event on CLI remoting authentication
- adjust tests by moving the helper class used to spy on events

* - as mentioned Yvan, the code had some problems with null checking, so the approach is changed in order to encapsulate all that internal mechanism

* - add javadoc
- open the getUserDetailsForImpersonation from the User (will let the SSHD module to retrieve UserDetails from that)

* - remove single quote in log messages

* - basic corrections requested by Jesse

* - just another typo

* - adjust the javadoc for SecurityListener events

* - add the link to Jenkins#Anonymous

* - add link (not using see)

* - update comment on the isAnonymous as we (me + Oleg) do not find a best place at the moment

* - put the new method isAnonymous in ACL instead of Functions

* - little typo
- add requirement about the SecurityContext authentication
2017-12-14 20:44:54 +01:00
Jesse Glick 3aa523969d Merge branch 'master' into unmarshal-JENKINS-21017 2017-12-14 10:56:58 -05:00
Kohsuke Kawaguchi d31adbe0f3 Merge remote-tracking branch 'origin/master' 2017-12-13 19:00:33 -08:00
Kohsuke Kawaguchi 4c75250ad4 [maven-release-plugin] prepare for next development iteration 2017-12-13 17:58:00 -08:00
Kohsuke Kawaguchi 0f029f39e6 [maven-release-plugin] prepare release jenkins-2.95 2017-12-13 17:58:00 -08:00
Jesse Glick 51b0f2f5d3 Redesigned fix to run from XStream2.unmarshal. 2017-12-13 17:17:16 -05:00
Devin Nusbaum cfbc34ed72 Assert that detached plugins and their dependencies load successfully 2017-12-12 17:37:25 -05:00
Devin Nusbaum efd8b7153b Use LocalData to test upgrades from before and after 2.0 2017-12-12 17:16:30 -05:00
Oleg Nenashev cc6c508e6b Merge pull request #3175 from Wadeck/JENKINS-48383_LOGGED_IN_AFTER_ACCOUNT_CREATION
[JENKINS-48383] Add loggedIn event on self-registration
2017-12-12 22:26:57 +01:00