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

Support adding untrusted root CA certificates (corp certs) #5015

Merged
merged 7 commits into from
Aug 15, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions deploy/iso/minikube-iso/configs/minikube_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ BR2_PACKAGE_SOCAT=y
BR2_PACKAGE_SUDO=y
BR2_PACKAGE_ACL=y
BR2_PACKAGE_COREUTILS=y
BR2_PACKAGE_LIBRESSL=y
BR2_PACKAGE_LIBRESSL_BIN=y
BR2_PACKAGE_OPENVMTOOLS=y
BR2_PACKAGE_OPENVMTOOLS_PROCPS=y
BR2_PACKAGE_SYSTEMD_LOGIND=y
Expand Down
137 changes: 136 additions & 1 deletion pkg/minikube/bootstrapper/certs.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ limitations under the License.
package bootstrapper

import (
"encoding/pem"
"fmt"
"io/ioutil"
"net"
"os"
"path"
"path/filepath"
"strings"
Expand Down Expand Up @@ -66,6 +69,19 @@ func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig) error {
copyableFiles = append(copyableFiles, certFile)
}

caCerts, err := collectCACerts()
if err != nil {
return err
}
for src, dst := range caCerts {
certFile, err := assets.NewFileAsset(src, path.Dir(dst), path.Base(dst), "0644")
if err != nil {
return err
}

copyableFiles = append(copyableFiles, certFile)
}

kubeCfgSetup := &util.KubeConfigSetup{
medyagh marked this conversation as resolved.
Show resolved Hide resolved
ClusterName: k8s.NodeName,
ClusterServerAddress: fmt.Sprintf("https://localhost:%d", k8s.NodePort),
Expand All @@ -76,7 +92,7 @@ func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig) error {
}

kubeCfg := api.NewConfig()
err := util.PopulateKubeConfig(kubeCfgSetup, kubeCfg)
err = util.PopulateKubeConfig(kubeCfgSetup, kubeCfg)
medyagh marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return errors.Wrap(err, "populating kubeconfig")
}
Expand All @@ -94,6 +110,11 @@ func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig) error {
return err
}
}

// configure CA certificates
if err := configureCACerts(cmd, caCerts); err != nil {
return errors.Wrapf(err, "error configuring CA certificates during provisioning %v", err)
}
return nil
}

Expand Down Expand Up @@ -197,3 +218,117 @@ func generateCerts(k8s config.KubernetesConfig) error {

return nil
}

func collectCACerts() (map[string]string, error) {
laozc marked this conversation as resolved.
Show resolved Hide resolved
localPath := constants.GetMinipath()

isValidPem := func(hostpath string) (bool, error) {
laozc marked this conversation as resolved.
Show resolved Hide resolved
fileBytes, err := ioutil.ReadFile(hostpath)
if err != nil {
return false, err
}

for {
block, rest := pem.Decode(fileBytes)
if block == nil {
break
}

if block.Type == "CERTIFICATE" {
// certificate found
return true, nil
}
fileBytes = rest
}

return false, nil
}

certFiles := map[string]string{}

certsDir := filepath.Join(localPath, "certs")
err := filepath.Walk(certsDir, func(hostpath string, info os.FileInfo, err error) error {
if err != nil {
return err
}

if info != nil && !info.IsDir() {
ext := strings.ToLower(filepath.Ext(hostpath))
if ext == ".crt" || ext == ".pem" {
validPem, err := isValidPem(hostpath)
if err != nil {
return err
}
if validPem {
filename := filepath.Base(hostpath)
dst := fmt.Sprintf("%s.%s", strings.TrimSuffix(filename, ext), "pem")
certFiles[hostpath] = path.Join(constants.CACertificatesDir, dst)
}
}
}
return nil
})
if err != nil {
return nil, errors.Wrapf(err, "provisioning: traversal certificates dir %s", certsDir)
}

for _, excluded := range []string{"ca.pem", "cert.pem"} {
certFiles[filepath.Join(certsDir, excluded)] = ""
}

// populates minikube CA
certFiles[filepath.Join(localPath, "ca.crt")] = path.Join(constants.CACertificatesDir, "minikubeCA.pem")

filtered := map[string]string{}
for k, v := range certFiles {
if v != "" {
filtered[k] = v
}
}
return filtered, nil
}

func configureCACerts(cmd command.Runner, caCerts map[string]string) error {
laozc marked this conversation as resolved.
Show resolved Hide resolved
getSubjectHash := func(hostpath string) (string, error) {
laozc marked this conversation as resolved.
Show resolved Hide resolved
out, err := cmd.CombinedOutput(fmt.Sprintf("openssl x509 -hash -noout -in '%s'", hostpath))
if err != nil {
return "", err
}

stringHash := strings.ReplaceAll(out, "\n", "")
laozc marked this conversation as resolved.
Show resolved Hide resolved
return stringHash, nil
}

hasSSLBinary := true
if err := cmd.Run("which openssl"); err != nil {
hasSSLBinary = false
}

if !hasSSLBinary && len(caCerts) > 0 {
glog.Warning("OpenSSL not found. Please recreate the cluster with the latest minikube ISO.")
}

for _, caCertFile := range caCerts {
dstFilename := path.Base(caCertFile)
certStorePath := path.Join(constants.SSLCertStoreDir, dstFilename)
if err := cmd.Run(fmt.Sprintf("sudo test -f '%s'", certStorePath)); err != nil {
if err := cmd.Run(fmt.Sprintf("sudo ln -s '%s' '%s'", caCertFile, certStorePath)); err != nil {
return errors.Wrapf(err, "error making symbol link for certificate %s", caCertFile)
}
}
if hasSSLBinary {
subjectHash, err := getSubjectHash(caCertFile)
if err != nil {
return errors.Wrapf(err, "error calculating subject hash for certificate %s", caCertFile)
}
subjectHashLink := path.Join(constants.SSLCertStoreDir, fmt.Sprintf("%s.0", subjectHash))
if err := cmd.Run(fmt.Sprintf("sudo test -f '%s'", subjectHashLink)); err != nil {
if err := cmd.Run(fmt.Sprintf("sudo ln -s '%s' '%s'", certStorePath, subjectHashLink)); err != nil {
return errors.Wrapf(err, "error making subject hash symbol link for certificate %s", caCertFile)
}
}
}
}

return nil
}
29 changes: 29 additions & 0 deletions pkg/minikube/bootstrapper/certs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ limitations under the License.
package bootstrapper

import (
"fmt"
"os"
"path"
"path/filepath"
"testing"

Expand All @@ -39,10 +41,37 @@ func TestSetupCerts(t *testing.T) {
ServiceCIDR: util.DefaultServiceCIDR,
}

if err := os.Mkdir(filepath.Join(tempDir, "certs"), 0777); err != nil {
t.Fatalf("error create certificate directory: %v", err)
}

if err := util.GenerateCACert(
filepath.Join(tempDir, "certs", "mycert.pem"),
filepath.Join(tempDir, "certs", "mykey.pem"),
"Test Certificate",
); err != nil {
t.Fatalf("error generating certificate: %v", err)
}

cmdMap := map[string]string{}
certFilenames := map[string]string{"ca.crt": "minikubeCA.pem", "mycert.pem": "mycert.pem"}
for _, dst := range certFilenames {
certFile := path.Join(constants.CACertificatesDir, dst)
certStorePath := path.Join(constants.SSLCertStoreDir, dst)
certNameHash := "abcdef"
remoteCertHashLink := path.Join(constants.SSLCertStoreDir, fmt.Sprintf("%s.0", certNameHash))
cmdMap[fmt.Sprintf("sudo ln -s '%s' '%s'", certFile, certStorePath)] = "1"
cmdMap[fmt.Sprintf("openssl x509 -hash -noout -in '%s'", certFile)] = certNameHash
cmdMap[fmt.Sprintf("sudo ln -s '%s' '%s'", certStorePath, remoteCertHashLink)] = "1"
}
f.SetCommandToOutput(cmdMap)

var filesToBeTransferred []string
for _, cert := range certs {
filesToBeTransferred = append(filesToBeTransferred, filepath.Join(constants.GetMinipath(), cert))
}
filesToBeTransferred = append(filesToBeTransferred, filepath.Join(constants.GetMinipath(), "ca.crt"))
filesToBeTransferred = append(filesToBeTransferred, filepath.Join(constants.GetMinipath(), "certs", "mycert.pem"))

if err := SetupCerts(f, k8s); err != nil {
t.Fatalf("Error starting cluster: %v", err)
Expand Down
5 changes: 5 additions & 0 deletions pkg/minikube/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -426,3 +426,8 @@ const (
// DriverDocumentation the documentation of the KVM driver
DriverDocumentation = "https://github.com/kubernetes/minikube/blob/master/docs/drivers.md"
)

const (
CACertificatesDir = "/usr/share/ca-certificates"
SSLCertStoreDir = "/etc/ssl/certs"
laozc marked this conversation as resolved.
Show resolved Hide resolved
)