Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JENKINS-31256] Use credentials in waitForServerToBack #87

Merged
merged 5 commits into from
Jun 9, 2016
Merged

[JENKINS-31256] Use credentials in waitForServerToBack #87

merged 5 commits into from
Jun 9, 2016

Conversation

oleg-nenashev
Copy link
Member

@oleg-nenashev oleg-nenashev commented Jun 9, 2016 •
edited
Loading

It's a follow-up to #67 by @wiizzard

This patch addresses three regressions introduced with HUDSON-4071, 662b0f and JENKINS-6167 as these only modified run() resulting in no proxy and no authorization support in waitForServerToBack()

As a result the connection to the master could not be reestablished as connections were rejected with response code 401 as reported in JENKINS-31256.

https://issues.jenkins-ci.org/browse/JENKINS-31256

CC @wiizzard @reviewbybees

@tpambor
[JENKINS-31256] Use credentials in waitForServerToBack
1e00902 
This address three regressions introduced with HUDSON-4071, 662b0f and JENKINS-6167 as these only modified run() resulting in no proxy and no authorization support in waitForServerToBack()
@tpambor
Move authorization code to openURLConnection()
dacee70
@tpambor
Merge remote-tracking branch 'origin/master' into fix-waitForServerTo…
5b913ab 
…Back

# Conflicts:
#	src/main/java/hudson/remoting/Engine.java
@tpambor
Factored out sslSocketFactory creation and use sslSocketFactory also …
97597d6 
…in waitForServerToBack()
oleg-nenashev
oleg-nenashev reviewed Jun 9, 2016
View reviewed changes
src/main/java/hudson/remoting/Engine.java
SSLSocketFactory sslSocketFactory = null;
try {
sslSocketFactory = getSSLSocketFactory();
} catch (Throwable e) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This approach is being used in other places of this file. It is not LGTM, but it does not increase the technical debt

@tpambor @oleg-nenashev
Merge branch 'master' into JENKINS-31256-waitForServerToBack
7d485ca 
Conflicts:
	src/main/java/hudson/remoting/Engine.java
@oleg-nenashev oleg-nenashev force-pushed the JENKINS-31256-waitForServerToBack branch from 806f670 to 7d485ca Compare June 9, 2016 10:29
@oleg-nenashev
Copy link
Member Author

Had to remove my changes and to force push in order to squash with the correct author

@oleg-nenashev oleg-nenashev reopened this Jun 9, 2016
@oleg-nenashev
Copy link
Member Author

Works locally for me, restarted the tests

@oleg-nenashev oleg-nenashev merged commit fbb9aff into jenkinsci:master Jun 9, 2016
@oleg-nenashev oleg-nenashev mentioned this pull request Jun 9, 2016
Closed
@oleg-nenashev
Copy link
Member Author

Crap, even such merge retains the author.
@wiizzard is it principal to you? If yes, I'll revert and resubmit the stuff

oleg-nenashev added a commit that referenced this pull request Jun 9, 2016
@oleg-nenashev
Revert "[JENKINS-31256] Use credentials in waitForServerToBack (#87)"
2d8e969 
This reverts commit fbb9aff.
oleg-nenashev pushed a commit that referenced this pull request Jun 9, 2016
@tpambor @oleg-nenashev
[JENKINS-31256] Reintegrated #87 and #67 with proper author
362cfb2
@oleg-nenashev
Copy link
Member Author

Done, reintegrated the change. 2.60 is a target baseline

oleg-nenashev added a commit to jenkinsci/jenkins that referenced this pull request Jun 10, 2016
@oleg-nenashev
Update remoting to 2.60
d9f12b0 
Changes summary:

Fixed issues:
* [JENKINS-22722](https://issues.jenkins-ci.org/browse/JENKINS-22722) - 
Make the channel reader tolerant against Socket timeouts. 
(jenkinsci/remoting#80)
* [JENKINS-32326](https://issues.jenkins-ci.org/browse/JENKINS-32326) - 
Support no_proxy environment variable. 
(jenkinsci/remoting#84)
* [JENKINS-35190](https://issues.jenkins-ci.org/browse/JENKINS-35190)  - 
Do not invoke PingFailureAnalyzer for agent=>master ping failures. 
(jenkinsci/remoting#85)
* [JENKINS-31256](https://issues.jenkins-ci.org/browse/JENKINS-31256) - 
 <code>hudson.Remoting.Engine#waitForServerToBack</code> now uses credentials for connection. 
(jenkinsci/remoting#87)
* [JENKINS-35494](https://issues.jenkins-ci.org/browse/JENKINS-35494) - 
Fix issues in file management in <code>hudson.remoting.Launcher</code> (main executable class). 
(jenkinsci/remoting#88)

Enhancements:
* Ensure a message is logged if remoting fails to override the default <code>ClassFilter</code>. 
(jenkinsci/remoting#80)
@oleg-nenashev oleg-nenashev mentioned this pull request Jun 10, 2016
Merged
oleg-nenashev added a commit to jenkinsci/jenkins that referenced this pull request Jun 11, 2016
@oleg-nenashev
Update remoting to 2.60 (#2403)
c718516 
Changes summary:

Fixed issues:
* [JENKINS-22722](https://issues.jenkins-ci.org/browse/JENKINS-22722) - 
Make the channel reader tolerant against Socket timeouts. 
(jenkinsci/remoting#80)
* [JENKINS-32326](https://issues.jenkins-ci.org/browse/JENKINS-32326) - 
Support no_proxy environment variable. 
(jenkinsci/remoting#84)
* [JENKINS-35190](https://issues.jenkins-ci.org/browse/JENKINS-35190)  - 
Do not invoke PingFailureAnalyzer for agent=>master ping failures. 
(jenkinsci/remoting#85)
* [JENKINS-31256](https://issues.jenkins-ci.org/browse/JENKINS-31256) - 
 <code>hudson.Remoting.Engine#waitForServerToBack</code> now uses credentials for connection. 
(jenkinsci/remoting#87)
* [JENKINS-35494](https://issues.jenkins-ci.org/browse/JENKINS-35494) - 
Fix issues in file management in <code>hudson.remoting.Launcher</code> (main executable class). 
(jenkinsci/remoting#88)

Enhancements:
* Ensure a message is logged if remoting fails to override the default <code>ClassFilter</code>. 
(jenkinsci/remoting#80)
olivergondza pushed a commit to jenkinsci/jenkins that referenced this pull request Jul 20, 2016
@oleg-nenashev @olivergondza
Update remoting to 2.60 (#2403)
3da25a0 
Changes summary:

Fixed issues:
* [JENKINS-22722](https://issues.jenkins-ci.org/browse/JENKINS-22722) -
Make the channel reader tolerant against Socket timeouts.
(jenkinsci/remoting#80)
* [JENKINS-32326](https://issues.jenkins-ci.org/browse/JENKINS-32326) -
Support no_proxy environment variable.
(jenkinsci/remoting#84)
* [JENKINS-35190](https://issues.jenkins-ci.org/browse/JENKINS-35190)  -
Do not invoke PingFailureAnalyzer for agent=>master ping failures.
(jenkinsci/remoting#85)
* [JENKINS-31256](https://issues.jenkins-ci.org/browse/JENKINS-31256) -
 <code>hudson.Remoting.Engine#waitForServerToBack</code> now uses credentials for connection.
(jenkinsci/remoting#87)
* [JENKINS-35494](https://issues.jenkins-ci.org/browse/JENKINS-35494) -
Fix issues in file management in <code>hudson.remoting.Launcher</code> (main executable class).
(jenkinsci/remoting#88)

Enhancements:
* Ensure a message is logged if remoting fails to override the default <code>ClassFilter</code>.
(jenkinsci/remoting#80)
(cherry picked from commit c718516)
samatdav pushed a commit to samatdav/jenkins that referenced this pull request Jul 25, 2016
@oleg-nenashev @samatdav
Update remoting to 2.60 (jenkinsci#2403)
de0ccc5 
Changes summary:

Fixed issues:
* [JENKINS-22722](https://issues.jenkins-ci.org/browse/JENKINS-22722) - 
Make the channel reader tolerant against Socket timeouts. 
(jenkinsci/remoting#80)
* [JENKINS-32326](https://issues.jenkins-ci.org/browse/JENKINS-32326) - 
Support no_proxy environment variable. 
(jenkinsci/remoting#84)
* [JENKINS-35190](https://issues.jenkins-ci.org/browse/JENKINS-35190)  - 
Do not invoke PingFailureAnalyzer for agent=>master ping failures. 
(jenkinsci/remoting#85)
* [JENKINS-31256](https://issues.jenkins-ci.org/browse/JENKINS-31256) - 
 <code>hudson.Remoting.Engine#waitForServerToBack</code> now uses credentials for connection. 
(jenkinsci/remoting#87)
* [JENKINS-35494](https://issues.jenkins-ci.org/browse/JENKINS-35494) - 
Fix issues in file management in <code>hudson.remoting.Launcher</code> (main executable class). 
(jenkinsci/remoting#88)

Enhancements:
* Ensure a message is logged if remoting fails to override the default <code>ClassFilter</code>. 
(jenkinsci/remoting#80)
samatdav pushed a commit to samatdav/jenkins that referenced this pull request Jul 25, 2016
@oleg-nenashev @samatdav
Update remoting to 2.60 (jenkinsci#2403)
46e5d60 
Changes summary:

Fixed issues:
* [JENKINS-22722](https://issues.jenkins-ci.org/browse/JENKINS-22722) - 
Make the channel reader tolerant against Socket timeouts. 
(jenkinsci/remoting#80)
* [JENKINS-32326](https://issues.jenkins-ci.org/browse/JENKINS-32326) - 
Support no_proxy environment variable. 
(jenkinsci/remoting#84)
* [JENKINS-35190](https://issues.jenkins-ci.org/browse/JENKINS-35190)  - 
Do not invoke PingFailureAnalyzer for agent=>master ping failures. 
(jenkinsci/remoting#85)
* [JENKINS-31256](https://issues.jenkins-ci.org/browse/JENKINS-31256) - 
 <code>hudson.Remoting.Engine#waitForServerToBack</code> now uses credentials for connection. 
(jenkinsci/remoting#87)
* [JENKINS-35494](https://issues.jenkins-ci.org/browse/JENKINS-35494) - 
Fix issues in file management in <code>hudson.remoting.Launcher</code> (main executable class). 
(jenkinsci/remoting#88)

Enhancements:
* Ensure a message is logged if remoting fails to override the default <code>ClassFilter</code>. 
(jenkinsci/remoting#80)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@oleg-nenashev @tpambor