Merge pull request #58 from LeviHarrison/fix-typo

Fix ClientAuth type typo

Author: Julien Pivotto

web/testdata/tls_config_noAuth.requireanyclientcert.good.yml

@@ -0,0 +1,5 @@
+tls_server_config:
+  cert_file: "server.crt"
+  key_file: "server.key"
+  client_auth_type: "RequireAnyClientCert"
+  client_ca_file: "tls-ca-chain.pem"

web/tls_config.go

@@ -154,7 +154,7 @@ func ConfigToTLSConfig(c *TLSStruct) (*tls.Config, error) {
 	switch c.ClientAuth {
 	case "RequestClientCert":
 		cfg.ClientAuth = tls.RequestClientCert
-	case "RequireClientCert":
+	case "RequireAnyClientCert", "RequireClientCert": // Preserved for backwards compatibility.
 		cfg.ClientAuth = tls.RequireAnyClientCert
 	case "VerifyClientCertIfGiven":
 		cfg.ClientAuth = tls.VerifyClientCertIfGiven

web/tls_config_test.go

@@ -53,6 +53,7 @@ var (
 		"Unknown TLS version":          regexp.MustCompile(`unknown TLS version`),
 		"No HTTP2 cipher":              regexp.MustCompile(`TLSConfig.CipherSuites is missing an HTTP/2-required`),
 		"Incompatible TLS version":     regexp.MustCompile(`protocol version not supported`),
+		"Bad certificate":              regexp.MustCompile(`bad certificate`),
 	}
 )
 
@@ -280,6 +281,12 @@ func TestServerBehaviour(t *testing.T) {
 			UseTLSClient:   true,
 			ExpectedError:  ErrorMap["No HTTP2 cipher"],
 		},
+		{
+			Name:           `valid tls config yml and tls client with RequireAnyClientCert`,
+			YAMLConfigPath: "testdata/tls_config_noAuth.requireanyclientcert.good.yml",
+			UseTLSClient:   true,
+			ExpectedError:  ErrorMap["Bad certificate"],
+		},
 	}
 	for _, testInputs := range testTables {
 		t.Run(testInputs.Name, testInputs.Test)