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

tls.Dial() validates hostname, no need to do that manually #110029

Merged

Conversation

ash2k
Copy link
Member

@ash2k ash2k commented May 13, 2022

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

tls.Dial() validates hostname, no need to do that manually. VerifyHostname() is still needed for the tls.Client() code path. See #109750.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 13, 2022
@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels May 13, 2022
@ash2k
Copy link
Member Author

ash2k commented May 13, 2022

/sig api-machinery

@ash2k
Copy link
Member Author

ash2k commented May 13, 2022

/assign @liggitt

@@ -101,6 +100,21 @@ func dialURL(ctx context.Context, url *url.URL, transport http.RoundTripper) (ne
return nil, err
}

Copy link
Member

Choose a reason for hiding this comment

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

according to #109750, Handshake validates host... why is this still needed for this path?

Copy link
Member

Choose a reason for hiding this comment

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

also, should this switch to HandshakeContext (and tls.Dial below switch to tls.Dialer#DialContext?)

Copy link
Member Author

Choose a reason for hiding this comment

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

why is this still needed for this path?

It's not, removed. Sorry about that.

also, should this switch to HandshakeContext (and tls.Dial below switch to tls.Dialer#DialContext?)

I wanted to do that in a separate PR in the whole codebase, if you don't mind.

Copy link
Member Author

Choose a reason for hiding this comment

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

Follow up #110079

@liggitt
Copy link
Member

liggitt commented May 16, 2022

would like a second set of eyes on this as well
/assign @aojea

Handshake() is still needed for tls.Client() code path. See kubernetes#109750
@ash2k ash2k force-pushed the ash2k/no-double-tls-validation branch from 76bf707 to 29dc50c Compare May 16, 2022 13:26
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 16, 2022
@liggitt
Copy link
Member

liggitt commented May 16, 2022

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 16, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ash2k, liggitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 16, 2022
@k8s-ci-robot k8s-ci-robot merged commit 81261d4 into kubernetes:master May 16, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone May 16, 2022
@aojea
Copy link
Member

aojea commented May 16, 2022

+1

@ash2k ash2k deleted the ash2k/no-double-tls-validation branch May 16, 2022 21:19
@roycaihw
Copy link
Member

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels May 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants