-
Notifications
You must be signed in to change notification settings - Fork 104
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
Add kudo init --unsafe-self-signed-webhook-ca option
#1459
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
fd6a73a
Add kudo init `--self-signed-webhook-ca-for-testing-only` option
zen-dog ca06b0f
Activating IAC with self-signed CA for e2e tests
zen-dog 7ffb894
Revert "Activating IAC with self-signed CA for e2e tests"
zen-dog ba56380
*Not* advertising the `--self-signed-webhook-ca-for-testing-only` opt…
zen-dog c15d719
Minor variable renaming
zen-dog 61b69e6
Removed hard-coded values from `Options`
zen-dog c739c9f
Removed "kudo-controller-manager" magic string from the tests
zen-dog 74e08f9
Renamed the option to `unsafe-self-signed-webhook-ca`
zen-dog File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| package prereq | ||
|
|
||
| // This is a slightly modified version of controller-runtime/pkg/internal/testing/integration/internal/tinyca.go | ||
| // package which is sadly internal and can't be used directly. All the methods here are supposed to be FOR TESTING ONLY. | ||
| // This package is used to provide self-signed CA along with a CA signed server certificate (and key) for services running | ||
| // inside the cluster. This is IN NO WAY a generic certificate generation solution as it is tailored towards testing and demos. | ||
| // Generated server certificate is valid 1 week which is generous enough for testing and demos. | ||
| // More information: https://kubernetes.io/blog/2019/03/21/a-guide-to-kubernetes-admission-controllers/ | ||
|
|
||
| import ( | ||
| "crypto" | ||
| crand "crypto/rand" | ||
| "crypto/rsa" | ||
| "crypto/x509" | ||
| "crypto/x509/pkix" | ||
| "encoding/pem" | ||
| "fmt" | ||
| "math/big" | ||
| "time" | ||
|
|
||
| certutil "k8s.io/client-go/util/cert" | ||
| ) | ||
|
|
||
| var ( | ||
| rsaKeySize = 2048 // a decent number, as of 2019 | ||
| bigOne = big.NewInt(1) | ||
| ) | ||
|
|
||
| // CertPair is a private key and certificate for use for client auth, as a CA, or serving. | ||
| type CertPair struct { | ||
| Key crypto.Signer | ||
| Cert *x509.Certificate | ||
| } | ||
|
|
||
| // CertBytes returns the PEM-encoded version of the certificate for this pair. | ||
| func (k CertPair) CertBytes() []byte { | ||
| return pem.EncodeToMemory(&pem.Block{ | ||
| Type: "CERTIFICATE", | ||
| Bytes: k.Cert.Raw, | ||
| }) | ||
| } | ||
|
|
||
| // AsBytes encodes key-pair in the appropriate formats for on-disk storage (PEM and PKCS8, respectively). | ||
| func (k CertPair) AsBytes() (cert []byte, key []byte, err error) { | ||
| cert = k.CertBytes() | ||
|
|
||
| rawKeyData, err := x509.MarshalPKCS8PrivateKey(k.Key) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("unable to encode private key: %v", err) | ||
| } | ||
|
|
||
| key = pem.EncodeToMemory(&pem.Block{ | ||
| Type: "PRIVATE KEY", | ||
| Bytes: rawKeyData, | ||
| }) | ||
|
|
||
| return cert, key, nil | ||
| } | ||
|
|
||
| // TinyCA supports signing serving certs and client-certs for services | ||
| // and can be used as an auth mechanism with tests. | ||
| type TinyCA struct { | ||
| CA CertPair | ||
| CN string | ||
| Service string | ||
| Namespace string | ||
| nextSerial *big.Int | ||
| } | ||
|
|
||
| // newPrivateKey generates a new private key of a relatively sane size (see rsaKeySize) | ||
| func newPrivateKey() (crypto.Signer, error) { | ||
| return rsa.GenerateKey(crand.Reader, rsaKeySize) | ||
| } | ||
|
|
||
| func NewTinyCA(svc, ns string) (*TinyCA, error) { | ||
| caPrivateKey, err := newPrivateKey() | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to generate private key for CA: %v", err) | ||
| } | ||
| cn := fmt.Sprintf("%s.%s.svc", svc, ns) | ||
| caCfg := certutil.Config{CommonName: cn} | ||
| caCert, err := certutil.NewSelfSignedCACert(caCfg, caPrivateKey) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to generate certificate for CA: %v", err) | ||
| } | ||
|
|
||
| return &TinyCA{ | ||
| CA: CertPair{Key: caPrivateKey, Cert: caCert}, | ||
| CN: cn, | ||
| Service: svc, | ||
| Namespace: ns, | ||
| nextSerial: big.NewInt(1), | ||
| }, nil | ||
| } | ||
|
|
||
| func (ca *TinyCA) makeCert(cfg certutil.Config) (CertPair, error) { | ||
| now := time.Now() | ||
|
|
||
| key, err := newPrivateKey() | ||
| if err != nil { | ||
| return CertPair{}, fmt.Errorf("unable to create private key: %v", err) | ||
| } | ||
|
|
||
| serial := new(big.Int).Set(ca.nextSerial) | ||
| ca.nextSerial.Add(ca.nextSerial, bigOne) | ||
|
|
||
| template := x509.Certificate{ | ||
| Subject: pkix.Name{CommonName: cfg.CommonName, Organization: cfg.Organization}, | ||
| DNSNames: cfg.AltNames.DNSNames, | ||
| IPAddresses: cfg.AltNames.IPs, | ||
| SerialNumber: serial, | ||
|
|
||
| KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature, | ||
| ExtKeyUsage: cfg.Usages, | ||
|
|
||
| // technically not necessary for testing, but let's set anyway just in case. | ||
| NotBefore: now.UTC(), | ||
| // 1 week is just long enough for a long-term test, but not too long that anyone would | ||
| // try to use this seriously. | ||
| NotAfter: now.Add(168 * time.Hour).UTC(), | ||
| } | ||
|
|
||
| certRaw, err := x509.CreateCertificate(crand.Reader, &template, ca.CA.Cert, key.Public(), ca.CA.Key) | ||
| if err != nil { | ||
| return CertPair{}, fmt.Errorf("unable to create certificate: %v", err) | ||
| } | ||
|
|
||
| cert, err := x509.ParseCertificate(certRaw) | ||
| if err != nil { | ||
| return CertPair{}, fmt.Errorf("generated invalid certificate, could not parse: %v", err) | ||
| } | ||
|
|
||
| return CertPair{ | ||
| Key: key, | ||
| Cert: cert, | ||
| }, nil | ||
| } | ||
|
|
||
| // NewServingCert returns a new CertPair for a serving HTTPS for a service. DNSNames are generated from the passed | ||
| // service and namespace | ||
| func (ca *TinyCA) NewServingCert() (CertPair, error) { | ||
| return ca.makeCert(certutil.Config{ | ||
| CommonName: ca.CN, | ||
| AltNames: certutil.AltNames{ | ||
| DNSNames: []string{ | ||
| ca.Service, | ||
| fmt.Sprintf("%s.%s", ca.Service, ca.Namespace), | ||
| fmt.Sprintf("%s.%s.svc", ca.Service, ca.Namespace), | ||
| }, | ||
| }, | ||
| Usages: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}, | ||
| }) | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is more of a warning.. right? there is no value of a CA bundle without webhooks... but there is no reason we can't run that way. I'm ok with it... just seems unnecessary
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The webhook is populated with the CA bundle so it does need it. Also, most CLIs that I use fail in the presence of an invalid option. I think we should do the same here. It might save the user some surprises.