change yurthub's protocol from http to https #368
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| Copyright 2020 The OpenYurt Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package certmanager | ||
|
|
||
| import ( | ||
| "crypto/tls" | ||
| "crypto/x509" | ||
| "crypto/x509/pkix" | ||
| "fmt" | ||
| "github.com/openyurtio/openyurt/pkg/projectinfo" | ||
| certificates "k8s.io/api/certificates/v1beta1" | ||
| "k8s.io/client-go/kubernetes" | ||
| clicert "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" | ||
| "k8s.io/client-go/util/certificate" | ||
| "k8s.io/klog/v2" | ||
| ) | ||
|
|
||
| const ( | ||
| YurtHubServerCSROrg = "system:nodes" | ||
| YurtHubServerCSRCN = "kube-apiserver-kubelet-client" | ||
| ) | ||
|
|
||
| // NewYurtHubServerCertManager creates a certificate manager for | ||
| // the yurthub-server | ||
| func NewYurtHubServerCertManager( | ||
| clientset kubernetes.Interface, | ||
| certDir string) (certificate.Manager, error) { | ||
|
|
||
| klog.Infof("subject of yurthub server certificate") | ||
| return newCertManager( | ||
| clientset, | ||
| projectinfo.GetHubName(), | ||
| certDir, | ||
| YurtHubServerCSRCN, | ||
| []string{YurtHubServerCSROrg}) | ||
| } | ||
|
|
||
| // NewCertManager creates a certificate manager that will generates a | ||
| // certificate by sending a csr to the apiserver | ||
| func newCertManager( | ||
| clientset kubernetes.Interface, | ||
| componentName, | ||
| certDir, | ||
| commonName string, | ||
| organizations []string) (certificate.Manager, error) { | ||
| certificateStore, err := | ||
| certificate.NewFileStore(componentName, certDir, certDir, "", "") | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to initialize the server certificate store: %v", err) | ||
| } | ||
|
|
||
| getTemplate := func() *x509.CertificateRequest { | ||
| return &x509.CertificateRequest{ | ||
| Subject: pkix.Name{ | ||
| CommonName: commonName, | ||
| Organization: organizations, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| certManager, err := certificate.NewManager(&certificate.Config{ | ||
| ClientFn: func(current *tls.Certificate) (clicert.CertificateSigningRequestInterface, error) { | ||
| return clientset.CertificatesV1beta1().CertificateSigningRequests(), nil | ||
| }, | ||
| SignerName: certificates.KubeAPIServerClientKubeletSignerName, | ||
| GetTemplate: getTemplate, | ||
| Usages: []certificates.KeyUsage{ | ||
| certificates.UsageAny, | ||
| }, | ||
| CertificateStore: certificateStore, | ||
| }) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to initialize server certificate manager: %v", err) | ||
| } | ||
|
|
||
| return certManager, nil | ||
| } |
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,85 @@ | ||
| /* | ||
| Copyright 2020 The OpenYurt Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package pki | ||
|
|
||
| import ( | ||
| "crypto/tls" | ||
| "crypto/x509" | ||
| "errors" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "os" | ||
|
|
||
| "k8s.io/client-go/util/certificate" | ||
| ) | ||
|
|
||
| // GenTGenTLSConfigUseCertMgrAndCertPool generates a TLS configuration | ||
| // using the given certificate manager and x509 CertPool | ||
| func GenTLSConfigUseCertMgrAndCertPool( | ||
| m certificate.Manager, | ||
| root *x509.CertPool) (*tls.Config, error) { | ||
| tlsConfig := &tls.Config{ | ||
| // Can't use SSLv3 because of POODLE and BEAST | ||
| // Can't use TLSv1.0 because of POODLE and BEAST using CBC cipher | ||
| // Can't use TLSv1.1 because of RC4 cipher usage | ||
| MinVersion: tls.VersionTLS12, | ||
| RootCAs: root, | ||
| ClientAuth: tls.RequireAnyClientCert, | ||
| } | ||
|
|
||
| tlsConfig.GetClientCertificate = | ||
| func(*tls.CertificateRequestInfo) (*tls.Certificate, error) { | ||
| cert := m.Current() | ||
| if cert == nil { | ||
| return &tls.Certificate{Certificate: nil}, nil | ||
| } | ||
| return cert, nil | ||
| } | ||
| tlsConfig.GetCertificate = | ||
| func(*tls.ClientHelloInfo) (*tls.Certificate, error) { | ||
| cert := m.Current() | ||
| if cert == nil { | ||
| return &tls.Certificate{Certificate: nil}, nil | ||
| } | ||
| return cert, nil | ||
| } | ||
|
|
||
| return tlsConfig, nil | ||
| } | ||
|
|
||
| // GenCertPoolUseCA generates a x509 CertPool based on the given CA file | ||
| func GenCertPoolUseCA(caFile string) (*x509.CertPool, error) { | ||
| if caFile == "" { | ||
| return nil, errors.New("CA file is not set") | ||
| } | ||
|
|
||
| if _, err := os.Stat(caFile); err != nil { | ||
| if os.IsNotExist(err) { | ||
| return nil, fmt.Errorf("CA file(%s) doesn't exist", caFile) | ||
| } | ||
| return nil, fmt.Errorf("fail to stat the CA file(%s): %s", caFile, err) | ||
| } | ||
|
|
||
| caData, err := ioutil.ReadFile(caFile) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| certPool := x509.NewCertPool() | ||
| certPool.AppendCertsFromPEM(caData) | ||
| return certPool, nil | ||
| } |
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.
The following fields should be deleted?