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.

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

[JENKINS-31256] Use credentials in waitForServerToBack #67

Closed
wants to merge 4 commits into from

Conversation

tpambor
Copy link
Contributor

@tpambor tpambor commented Dec 18, 2015

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.

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()
@jenkinsadmin
Copy link
Member

Thank you for this pull request! Please check this document for how the Jenkins project handles pull requests.

@oleg-nenashev
Copy link
Member

👍 . I wonder why remoting supports only Basic auth, but It's another story. Maybe makes sense to move the duplicated credentials handling code to a new helper method.

@tpambor
Copy link
Contributor Author

tpambor commented Jan 14, 2016

Any further comments or can this be merged?

@oleg-nenashev
Copy link
Member

Uhm, last changes caused a merge conflict. I'm planning a new release soon, so I'll check what can be done with this guy

…Back

# Conflicts:
#	src/main/java/hudson/remoting/Engine.java
@tpambor
Copy link
Contributor Author

tpambor commented Feb 18, 2016

I fixed the merge conflict but I think the SSL stuff has also to go to waitForServerToBack(). I think some parts can be commonized into openURLConnection(). I'll take a closer look shortly.

@oleg-nenashev
Copy link
Member

I think the SSL stuff has also to go to waitForServerToBack()

+1

@oleg-nenashev
Copy link
Member

Needs to be merged locally. NVM, I'll do it

@nebulans
Copy link

Any ETA on this landing?

@oleg-nenashev
Copy link
Member

Sorry for the delay. I'll try to do it ASAP

SSLSocketFactory sslSocketFactory = null;
try {
sslSocketFactory = getSSLSocketFactory();
} catch (Throwable e) {
Copy link
Member

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

@oleg-nenashev
Copy link
Member

Merged via #87

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants