GitList

Browse code

Add better client error for client certificate failure (missing or denied)

This adds a more meaningful error on the client side so the "bad
certificate" error coming from the TLS dial code has some context for
the user.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)

Phil Estes authored on 2015/06/06 05:48:59
Showing 1 changed files

api/client/utils.go

History View file @ d175ef6

@@ -102,6 +102,10 @@ func (cli *DockerCli) clientRequest(method, path string, in io.Reader, headers m
                      		if cli.tlsConfig == nil {
                      			return serverResp, fmt.Errorf("%v.\n* Are you trying to connect to a TLS-enabled daemon without TLS?\n* Is your docker daemon up and running?", err)
+                     		}
                     +		if cli.tlsConfig != nil && strings.Contains(err.Error(), "remote error: bad certificate") {
                     +			return serverResp, fmt.Errorf("The server probably has client authentication (--tlsverify) enabled. Please check your TLS client certification settings: %v", err)
                     +		}
+                    +
                      		return serverResp, fmt.Errorf("An error occurred trying to connect: %v", err)
+                     	}