Allow CSR that contains either IP or DNS as SANs #22
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@jnummelin I really don't want to annoy anyone, but having this PR merged would be really, really helpful |
|
@dbaumgarten no worries. I haven't been working with stamper (or any other kontena org projects) in a good while and hence all the notifications from these have fallen into /dev/null unfortunately. I'll be looking at all the open PRs in coming week or so. |
jnummelin
suggested changes
Oct 22, 2020
| @@ -73,7 +73,7 @@ func isNodeServingCert(csr *capi.CertificateSigningRequest, x509cr *x509.Certifi | |||
| klog.Warningf("Org does not match: %s", x509cr.Subject.Organization) | |||
| return false | |||
| } | |||
| if (len(x509cr.DNSNames) < 1) || (len(x509cr.IPAddresses) < 1) { | |||
| if (len(x509cr.DNSNames) < 1) && (len(x509cr.IPAddresses) < 1) { | |||
| return false | |||
There was a problem hiding this comment.
As defined in the original issue #35 maybe we should also log here something why we're rejecting the CSR. I.e. something like No DNS or IP addresses given in CSR
yuanying
force-pushed
the
fix-node-csr-recognizer
branch
from
a89c0d0
to
6041f9f
Compare
jnummelin
approved these changes
Oct 27, 2020
In some environments, kubelet may only send IP addresses or DNS address as SANs in CSR. For example, kubelet which starts with `--hostname-override=IP_ADDRRES` only sends IP addresses. So we should allow this CSR.
yuanying
force-pushed
the
fix-node-csr-recognizer
branch
from
6041f9f
to
d5f08cd
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In some environments, kubelet may only send IP addresses or DNS
address as SANs in CSR. For example, kubelet which starts with
--hostname-override=IP_ADDRRESonly sends IP addresses.So we should allow this CSR.