kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #15167 from tiborvass/better-tlsconf-error-msg

Browse source 
tlsconfig: better format for error message in tlsconfig
This commit is contained in:
Tibor Vass 2015-07-30 14:51:35 -04:00
commit 06668de15e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/daemon.go
View file

@ -228,7 +228,7 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
} }
tlsConfig, err := tlsconfig.Server(*commonFlags.TLSOptions) tlsConfig, err := tlsconfig.Server(*commonFlags.TLSOptions)
if err != nil { if err != nil {
logrus.Fatalf("foobar: %v", err) logrus.Fatal(err)
} }
serverConfig.TLSConfig = tlsConfig serverConfig.TLSConfig = tlsConfig
} }

8
pkg/tlsconfig/config.go
View file

@ -72,10 +72,10 @@ func certPool(caFile string) (*x509.CertPool, error) {
certPool := x509.NewCertPool() certPool := x509.NewCertPool()
pem, err := ioutil.ReadFile(caFile) pem, err := ioutil.ReadFile(caFile)
if err != nil { if err != nil {
return nil, fmt.Errorf("Could not read CA certificate %s: %v", caFile, err) return nil, fmt.Errorf("Could not read CA certificate %q: %v", caFile, err)
} }
if !certPool.AppendCertsFromPEM(pem) { if !certPool.AppendCertsFromPEM(pem) {
return nil, fmt.Errorf("failed to append certificates from PEM file: %s", caFile) return nil, fmt.Errorf("failed to append certificates from PEM file: %q", caFile)
} }
s := certPool.Subjects() s := certPool.Subjects()
subjects := make([]string, len(s)) subjects := make([]string, len(s))
@ -116,9 +116,9 @@ func Server(options Options) (*tls.Config, error) {
tlsCert, err := tls.LoadX509KeyPair(options.CertFile, options.KeyFile) tlsCert, err := tls.LoadX509KeyPair(options.CertFile, options.KeyFile)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, fmt.Errorf("Could not load X509 key pair (%s, %s): %v", options.CertFile, options.KeyFile, err) return nil, fmt.Errorf("Could not load X509 key pair (cert: %q, key: %q): %v", options.CertFile, options.KeyFile, err)
} }
return nil, fmt.Errorf("Error reading X509 key pair (%s, %s): %v. Make sure the key is not encrypted.", options.CertFile, options.KeyFile, err) return nil, fmt.Errorf("Error reading X509 key pair (cert: %q, key: %q): %v. Make sure the key is not encrypted.", options.CertFile, options.KeyFile, err)
} }
tlsConfig.Certificates = []tls.Certificate{tlsCert} tlsConfig.Certificates = []tls.Certificate{tlsCert}
if options.ClientAuth >= tls.VerifyClientCertIfGiven { if options.ClientAuth >= tls.VerifyClientCertIfGiven {