Include ServerName in tls transport cache key #56415

liggitt · 2017-11-27T15:05:42Z

Fixes server name verification of aggregated API servers and webhook admission endpoints

deads2k · 2017-11-27T15:11:50Z

This will need picks.

/lgtm
/status approved-for-milestone

liggitt · 2017-11-27T15:17:07Z

/status in-progress

k8s-github-robot · 2017-11-27T15:18:10Z

[MILESTONENOTIFIER] Milestone Pull Request Current

@caesarxuchao @deads2k @liggitt

Note: This pull request is marked as priority/critical-urgent, and must be updated every 1 day during code freeze.

Example update:

ACK.  In progress
ETA: DD/MM/YYYY
Risks: Complicated fix required

Pull Request Labels

sig/api-machinery: Pull Request will be escalated to these SIGs if needed.
priority/critical-urgent: Never automatically move pull request out of a release milestone; continually escalate to contributor and SIG through all available channels.
kind/bug: Fixes a bug discovered during the current release.

Help

liggitt · 2017-11-27T15:29:02Z

picks opened

liggitt · 2017-11-27T16:18:17Z

integration test setup for one test had a bug that was masked because the extension server and kube apiserver were both in-process and shared the tls config cache. pushed a test update

deads2k · 2017-11-27T16:24:52Z

still
/lgtm

k8s-github-robot · 2017-11-27T16:25:09Z

[APPROVALNOTIFIER] This PR is APPROVED

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

Associated issue: 56385

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

Needs approval from an approver in each of these OWNERS Files:

~~staging/src/k8s.io/client-go/OWNERS~~ [deads2k,liggitt]
~~test/OWNERS~~ [deads2k,liggitt]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

caesarxuchao · 2017-11-27T18:11:21Z

lgtm.

k8s-github-robot · 2017-11-28T00:04:29Z

Automatic merge from submit-queue (batch tested with PRs 56094, 52910, 55953, 56405, 56415). If you want to cherry-pick this change to another branch, please follow the instructions here.

…5-upstream-release-1.6 Automatic merge from submit-queue. Automated cherry pick of #56415 Cherry pick of #56415 on release-1.6. #56415: Include ServerName in tls transport cache key

…5-upstream-release-1.7 Automatic merge from submit-queue. Automated cherry pick of #56415 Cherry pick of #56415 on release-1.7. #56415: Include ServerName in tls transport cache key

…5-upstream-release-1.8 Automatic merge from submit-queue. Automated cherry pick of #56415 Cherry pick of #56415 on release-1.8. #56415: Include ServerName in tls transport cache key

lavalamp · 2017-11-30T21:09:45Z

staging/src/k8s.io/client-go/transport/cache.go

@@ -88,5 +88,5 @@ func tlsConfigKey(c *Config) (string, error) {
 		return "", err
 	}
 	// Only include the things that actually affect the tls.Config
-	return fmt.Sprintf("%v/%x/%x/%x", c.TLS.Insecure, c.TLS.CAData, c.TLS.CertData, c.TLS.KeyData), nil
+	return fmt.Sprintf("%v/%x/%x/%x/%v", c.TLS.Insecure, c.TLS.CAData, c.TLS.CertData, c.TLS.KeyData, c.TLS.ServerName), nil


Uh, are we printing very sensitive key data into the cache key? That seems like a terrible idea, doesn't it?

It's safer to put things into a key struct, that way you don't have to worry about collisions (things maybe having / in them that shouldn't, say).

Uh, are we printing very sensitive key data into the cache key? That seems like a terrible idea, doesn't it?

If you have memory access to the cache keys, you also have it to the cache data, which has the same information in a different form

It's safer to put things into a key struct, that way you don't have to worry about collisions (things maybe having / in them that shouldn't, say).

/ isn't an issue in this particular case with the current data (%x hex-encodes, and the first value is a bool), but agree a key struct would be better here

@liggitt

If you have memory access to the cache keys, you also have it to the cache data, which has the same information in a different form

I can easily see someone printing the keys to a debug log or something, which is readable by more people than they expect. People don't usually expect cache keys to be super sensitive.

I agree the separator is likely not an actual bug in this particular case, but if you use the struct approach everywhere you prevent an entire class of really hard to find bugs, some of which are serious security problems.

I will likely file an issue about these items.

fair enough. opened #56811 to switch to struct key with its own String() impl that omits logging the key data

Include ServerName in tls transport cache key

195a4d6

liggitt mentioned this pull request Nov 27, 2017

apiserver uses wrong CommonName to verify service certificates for aggregated API Server when External admission controller is enabled #56385

Closed

liggitt added cherrypick-candidate kind/bug Categorizes issue or PR as related to a bug. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. labels Nov 27, 2017

liggitt added this to the v1.9 milestone Nov 27, 2017

k8s-github-robot assigned deads2k and caesarxuchao Nov 27, 2017

k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. milestone/needs-approval labels Nov 27, 2017

k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. status/approved-for-milestone labels Nov 27, 2017

k8s-github-robot added milestone/needs-attention and removed milestone/needs-approval labels Nov 27, 2017

k8s-ci-robot added the status/in-progress label Nov 27, 2017

k8s-github-robot removed the milestone/needs-attention label Nov 27, 2017

This was referenced Nov 27, 2017

Automated cherry pick of #56415 #56418

Merged

Automated cherry pick of #56415 #56419

Merged

Automated cherry pick of #56415 #56420

Merged

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 27, 2017

Fix TestAggregatedAPIServer setup

18d0b70

k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 27, 2017

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 27, 2017

k8s-github-robot merged commit a46153e into kubernetes:master Nov 28, 2017

liggitt deleted the tls-cache-key branch November 28, 2017 05:05

wojtek-t added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 28, 2017

wojtek-t removed the cherrypick-candidate label Nov 29, 2017

lavalamp reviewed Nov 30, 2017

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Include ServerName in tls transport cache key #56415

Include ServerName in tls transport cache key #56415

liggitt commented Nov 27, 2017 •

edited

Loading

deads2k commented Nov 27, 2017

liggitt commented Nov 27, 2017

k8s-github-robot commented Nov 27, 2017

liggitt commented Nov 27, 2017

liggitt commented Nov 27, 2017 •

edited

Loading

deads2k commented Nov 27, 2017

k8s-github-robot commented Nov 27, 2017

caesarxuchao commented Nov 27, 2017

k8s-github-robot commented Nov 28, 2017

lavalamp Nov 30, 2017

lavalamp Nov 30, 2017

liggitt Nov 30, 2017 •

edited

Loading

lavalamp Dec 4, 2017

liggitt Dec 4, 2017

lavalamp Dec 4, 2017

Include ServerName in tls transport cache key #56415

Include ServerName in tls transport cache key #56415

Conversation

liggitt commented Nov 27, 2017 • edited Loading

deads2k commented Nov 27, 2017

liggitt commented Nov 27, 2017

k8s-github-robot commented Nov 27, 2017

liggitt commented Nov 27, 2017

liggitt commented Nov 27, 2017 • edited Loading

deads2k commented Nov 27, 2017

k8s-github-robot commented Nov 27, 2017

caesarxuchao commented Nov 27, 2017

k8s-github-robot commented Nov 28, 2017

lavalamp Nov 30, 2017

Choose a reason for hiding this comment

lavalamp Nov 30, 2017

Choose a reason for hiding this comment

liggitt Nov 30, 2017 • edited Loading

Choose a reason for hiding this comment

lavalamp Dec 4, 2017

Choose a reason for hiding this comment

liggitt Dec 4, 2017

Choose a reason for hiding this comment

lavalamp Dec 4, 2017

Choose a reason for hiding this comment

liggitt commented Nov 27, 2017 •

edited

Loading

liggitt commented Nov 27, 2017 •

edited

Loading

liggitt Nov 30, 2017 •

edited

Loading