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 473744ce4e Merge branch 'master' into SSH-CLI-JENKINS-41745 2017-03-17 11:14:36 -04:00
Jesse Glick 4fd4bd3a28 Merge pull request #2790 from jglick/security-settings-save 
Save after calling setSecurityRealm or setAuthorizationStrategy
 2017-03-17 10:41:54 -04:00
Jesse Glick 59d50136a4 Merge branch 'master' into SSH-CLI-JENKINS-41745 2017-03-17 10:39:13 -04:00
Jesse Glick e0c263745e Trying to diagnose a test failure on Windows on CI. 
https://ci.jenkins.io/job/Core/job/jenkins/job/PR-2795/10/testReport/junit/hudson.model/MyViewTest/testDoCreateItem/
java.lang.NullPointerException
	at hudson.model.MyViewTest.testDoCreateItem(MyViewTest.java:88)
 2017-03-17 10:33:28 -04:00
Jesse Glick 996c52e168 Trying to avoid a premature test timeout. 2017-03-17 10:31:20 -04:00
Oleg Nenashev 9536ad2182 Merge branch 'master' into findbugs/JENKINS-36720-medium-level-fb 2017-03-17 14:10:47 +01:00
Yoann Dubreuil 1b3121db24 [JENKINS-42191] Enhance CLI HTTP proxy support (#2711) 
* Enhance CLI HTTP proxy support

Fix few issues around proxy support in CLI:

* make proxy support work with recent Squid version which reply with HTTP/1.1 even if request is HTTP 1.0
* close the socket connected to the proxy if the connection failed
* output an error message when proxy connection failed
* don't do a reverse DNS lookup, instead use the host string provided in X-Jenkins-CLI-Host headers (we don't know if the DNS resolver on the
proxy will be able to resolve the name correctly, or like us).

* Use stdout to output CLI proxy connection error message

* Use the logger to output the error message, not System.out

* Add a 'verbose' option to the CLI to turn logging on

This should help people diagnosing connection issues with the CLI.

* [JENKINS-42191] Set log level to FINEST when -v is passed
 2017-03-17 14:09:16 +01:00
Oleg Nenashev 255acdac9a Merge pull request #2796 from oleg-nenashev/sshd/1.10 
Update SSHD Core to 1.10.
 2017-03-17 09:43:27 +01:00
Baptiste Mathus 0717285e93 Merge pull request #2805 from batmat/clarify_PermissionGroup.owner_is_Nonnull 
Clarify PermissionGroup.owner is @Nonnull
 2017-03-17 09:39:52 +01:00
Jesse Glick 71db95a1c6 Allow http://repo.jenkins-ci.org/public/org/jenkins-ci/modules/sshd/1.11-SNAPSHOT/sshd-1.11-20170315.153852-1.jar to be downloaded. 2017-03-16 18:58:16 -04:00
Jesse Glick 9434d0ea9d UI to enable or disable CLI over Remoting. 2017-03-16 18:24:29 -04:00
Jesse Glick ee01d1b920 Depending on what seems to have been timing conditions, connectNodeShouldSucceedWithForce could fail with a cryptic message. 
Found an error in the launch log:
java.lang.IllegalStateException: Already connected
	at hudson.slaves.SlaveComputer.setChannel(SlaveComputer.java:567)
	at hudson.slaves.SlaveComputer.setChannel(SlaveComputer.java:390)
	at hudson.slaves.CommandLauncher.launch(CommandLauncher.java:132)
	at hudson.slaves.SlaveComputer$1.call(SlaveComputer.java:262)
I think the slave was being launched in the background, and then the test tried to disconnect and reconnect it.
Perhaps if these actions overlapped in time, the loose locking semantics of SlaveComputer.setChannel could cause the error.
 2017-03-16 16:05:44 -04:00
Jesse Glick 24dec27ed6 Merge branch 'master' into security-settings-save 2017-03-16 14:56:52 -04:00
Jesse Glick c5e1fc0919 Comment. 2017-03-16 14:56:33 -04:00
Stephen Connolly 1bc1d6170c Merge pull request #2794 from stephenc/dont-wrap-interrupt 
Don't wrap the InterruptedException without unwrapping
 2017-03-16 16:12:45 +00:00
Stephen Connolly 80aa2c8e40 Merge pull request #2782 from stephenc/jenkins-34691 
[FIXED JENKINS-34691] Add the ability for ItemListeners to veto copy operations
 2017-03-15 16:17:39 +00:00
Jesse Glick f437ccc9ef Merge branch 'master' into SSH-CLI-JENKINS-41745 2017-03-15 11:53:55 -04:00
Jesse Glick 9e427ce218 Noting potential issue in ConsoleCommand. 2017-03-15 11:52:42 -04:00
Jesse Glick 2cf0ac523c Pick up https://github.com/jenkinsci/sshd-module/pull/10 so we are using a consistent version of sshd-core for client & server. 2017-03-15 11:51:43 -04:00
Stephen Connolly 6f243e49b3 [JENKINS-41899] Pick up fix 
(cherry picked from commit 5969b8da99)
 2017-03-15 12:55:16 +01:00
Oleg Nenashev 7039abe708 [JENKINS-42670] - Fix the potential File descriptor leak in the Windows Service installer 
(cherry picked from commit e63774decd)
 2017-03-15 12:48:08 +01:00
urkon 3cbeb12349 Fix JENKINS-41756 - Indecently translated items 
Removed false and indecently to slovene translated main menu items.
(cherry picked from commit acaf91c585)
 2017-03-15 12:41:17 +01:00
Daniel Beck e025dc9420 [JENKINS-41864] More Javadoc, rephrase warning message 
(cherry picked from commit d1c21484c3)
 2017-03-15 12:22:37 +01:00
Daniel Beck 933a4785af [FIX JENKINS-41864] Add warning for rare dates 
Previously, impossible dates caused 100% CPU while Jenkins was
trying to find the previous/next occurrence of the date.

(cherry picked from commit 6e5225c06b)
 2017-03-15 12:22:37 +01:00
Oleg Nenashev 5f655a59b6 Merge pull request #2746 from oleg-nenashev/bug/JENKINS-32820 
[JENKINS-32820, JENKINS-42164] - Windows service restart does not retain the build queue
(cherry picked from commit 4ab693846c)
 2017-03-15 12:15:29 +01:00
Jesse Glick e2a8c0efd1 [JENKINS-41987] Improved message. 
(cherry picked from commit dbf5efa6ae)
 2017-03-15 11:58:51 +01:00
Jesse Glick 7e9015d3ea Check for null return values from InstanceIdentityProvider methods. 
(cherry picked from commit d3791e9a84)
 2017-03-15 11:58:51 +01:00
Baptiste Mathus 8da82e0e77 Clarify PermissionGroup.owner is @Nonnull 
Permission.owner is already marked @Nonnull, and
is built using PermissionGroup.owner.
 2017-03-15 08:58:06 +01:00
Jesse Glick a76ff0ad18 Replacing complex and non-Serializable AuthorizationStrategy’s with MockAuthorizationStrategy. 2017-03-14 16:41:36 -04:00
Jesse Glick 3fd02a718d Non-Serializable SecurityRealm’s, consolidated into one implementation. 2017-03-14 16:40:59 -04:00
Jesse Glick 214f1b9bb7 Non-Serializable SecurityRealm, and simplifying with MockAuthorizationStrategy. 2017-03-14 16:40:13 -04:00
Jesse Glick b24aaefcad Non-Serializable AuthorizationStrategy. 2017-03-14 16:39:31 -04:00
Jesse Glick c096d49c37 Non-Serializable SecurityRealm’s. 2017-03-14 16:38:42 -04:00
Jesse Glick ae345dc31a Fix test to avoid saving Jenkins.securityRealm/authorizationStrategy after we rewrote $JENKINS_HOME/config.xml, clobbering it. 
https://github.com/jenkinsci/jenkins-test-harness/pull/53 would simplify test code a bit.
 2017-03-14 16:37:45 -04:00
Jesse Glick 7360b98047 Jenkins.setNumExecutors already called save; redundant to do so again. 2017-03-14 15:43:58 -04:00
Jesse Glick d26f59f3d7 Merge branch 'master' into security-settings-save 2017-03-14 15:32:03 -04:00
Jesse Glick 98bb78ff18 [JENKINS-42556] Updating since tags for #2792. 2017-03-14 15:27:02 -04:00
Jesse Glick dd0d578cb0 Merge pull request #2792 from jglick/SYSTEM-JENKINS-42556 
[JENKINS-42556] Run more system threads as SYSTEM
 2017-03-14 15:25:05 -04:00
Jesse Glick 3d071b945d @oleg-nenashev noticed a typo 2017-03-14 12:13:42 -04:00
Daniel Beck 12a4177af1 Merge pull request #2779 from daniel-beck/translation-tool-newlines 
Fix for translation tool newlines
 2017-03-14 16:07:06 +01:00
Baptiste Mathus 1eba93806c Clarify PermissionGroup.owner is @Nonnull 
Permission.owner is already marked @Nonnull, and
is built using PermissionGroup.owner.
 2017-03-14 14:09:07 +01:00
Oleg Nenashev acb6724fce Merge pull request #2798 from oleg-nenashev/translations/russian_bigscoop 
Update Russian Translations
 2017-03-14 10:01:32 +01:00
Jesse Glick 9ffb5d87f5 Hoping to fix an unreproducible test hang. 2017-03-13 19:14:15 -04:00
Jesse Glick 5f0bb2a13f Some more work deprecating channel/checkChannel. 2017-03-13 18:17:08 -04:00
Jesse Glick 82cd1bdacf Deleteing apparently unused class SequenceOutputStream. 2017-03-13 17:06:50 -04:00
Jesse Glick b8ad3606e7 Marking various APIs, and a couple of commands, deprecated when they assume a Remoting-based CLI. 2017-03-13 17:06:18 -04:00
Jesse Glick 12ae48ebb4 Deprecating --username/--password and login/logout in favor of new -auth option passing BASIC authentication to /cli endpoint. 
Simpler, does not rely on Remoting, allows use of API tokens, and bypasses JENKINS-12543.
(You could actually do this before but only by embedding userinfo in the -s URL, especially awkward for usernames containing @.)
 2017-03-13 16:33:09 -04:00
Baptiste Mathus a953bc863c Make it compilable with JDK8 2017-03-13 20:54:13 +01:00
Jesse Glick 8d622e0344 Clarifying role of API tokens in -remoting. 2017-03-13 15:52:15 -04:00
Jesse Glick c2a5d85123 Establishing baseline behavior of JENKINS-12543: no workaround when using Remoting transport other than SSH authentication. 
(Verifying that this affects only @Argument in CLICommand, not @CLIMethod.)
With the new HTTP protocol in JENKINS-41745, API tokens may be used to set a transport authentication.
 2017-03-13 15:07:16 -04:00