Add Pass TLS Cert Issuer and Domain Component

old/provider/docker/config_container_docker_test.go

@@ -69,16 +69,24 @@ func TestDockerBuildConfiguration(t *testing.T) {
 				containerJSON(
 					name("test"),
 					labels(map[string]string{
-						label.TraefikFrontendPassTLSClientCertPem:                      "true",
-						label.TraefikFrontendPassTLSClientCertInfosNotBefore:           "true",
-						label.TraefikFrontendPassTLSClientCertInfosNotAfter:            "true",
-						label.TraefikFrontendPassTLSClientCertInfosSans:                "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectCommonName:   "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectCountry:      "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectLocality:     "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectOrganization: "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectProvince:     "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectSerialNumber: "true",
+						label.TraefikFrontendPassTLSClientCertPem:                         "true",
+						label.TraefikFrontendPassTLSClientCertInfosNotBefore:              "true",
+						label.TraefikFrontendPassTLSClientCertInfosNotAfter:               "true",
+						label.TraefikFrontendPassTLSClientCertInfosSans:                   "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectCommonName:      "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectCountry:         "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectDomainComponent: "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectLocality:        "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectOrganization:    "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectProvince:        "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectSerialNumber:    "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerCommonName:       "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerCountry:          "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerDomainComponent:  "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerLocality:         "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerOrganization:     "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerProvince:         "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerSerialNumber:     "true",
 					}),
 					ports(nat.PortMap{
 						"80/tcp": {},
@@ -97,13 +105,23 @@ func TestDockerBuildConfiguration(t *testing.T) {
 							NotBefore: true,
 							Sans:      true,
 							NotAfter:  true,
-							Subject: &types.TLSCLientCertificateSubjectInfos{
-								CommonName:   true,
-								Country:      true,
-								Locality:     true,
-								Organization: true,
-								Province:     true,
-								SerialNumber: true,
+							Subject: &types.TLSCLientCertificateDNInfos{
+								CommonName:      true,
+								Country:         true,
+								DomainComponent: true,
+								Locality:        true,
+								Organization:    true,
+								Province:        true,
+								SerialNumber:    true,
+							},
+							Issuer: &types.TLSCLientCertificateDNInfos{
+								CommonName:      true,
+								Country:         true,
+								DomainComponent: true,
+								Locality:        true,
+								Organization:    true,
+								Province:        true,
+								SerialNumber:    true,
 							},
 						},
 					},
@@ -455,16 +473,24 @@ func TestDockerBuildConfiguration(t *testing.T) {
 						label.TraefikBackendBufferingMemRequestBodyBytes:     "2097152",
 						label.TraefikBackendBufferingRetryExpression:         "IsNetworkError() && Attempts() <= 2",
 
-						label.TraefikFrontendPassTLSClientCertPem:                      "true",
-						label.TraefikFrontendPassTLSClientCertInfosNotBefore:           "true",
-						label.TraefikFrontendPassTLSClientCertInfosNotAfter:            "true",
-						label.TraefikFrontendPassTLSClientCertInfosSans:                "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectCommonName:   "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectCountry:      "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectLocality:     "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectOrganization: "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectProvince:     "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectSerialNumber: "true",
+						label.TraefikFrontendPassTLSClientCertPem:                         "true",
+						label.TraefikFrontendPassTLSClientCertInfosNotBefore:              "true",
+						label.TraefikFrontendPassTLSClientCertInfosNotAfter:               "true",
+						label.TraefikFrontendPassTLSClientCertInfosSans:                   "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectCommonName:      "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectCountry:         "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectDomainComponent: "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectLocality:        "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectOrganization:    "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectProvince:        "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectSerialNumber:    "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerCommonName:       "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerCountry:          "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerDomainComponent:  "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerLocality:         "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerOrganization:     "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerProvince:         "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerSerialNumber:     "true",
 
 						label.TraefikFrontendAuthBasic:                        "test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/,test2:$apr1$d9hr9HBB$4HxwgUir3HP4EsggP/QNo0",
 						label.TraefikFrontendAuthBasicRealm:                   "myRealm",
@@ -561,13 +587,23 @@ func TestDockerBuildConfiguration(t *testing.T) {
 							NotBefore: true,
 							Sans:      true,
 							NotAfter:  true,
-							Subject: &types.TLSCLientCertificateSubjectInfos{
-								CommonName:   true,
-								Country:      true,
-								Locality:     true,
-								Organization: true,
-								Province:     true,
-								SerialNumber: true,
+							Subject: &types.TLSCLientCertificateDNInfos{
+								CommonName:      true,
+								Country:         true,
+								DomainComponent: true,
+								Locality:        true,
+								Organization:    true,
+								Province:        true,
+								SerialNumber:    true,
+							},
+							Issuer: &types.TLSCLientCertificateDNInfos{
+								CommonName:      true,
+								Country:         true,
+								DomainComponent: true,
+								Locality:        true,
+								Organization:    true,
+								Province:        true,
+								SerialNumber:    true,
 							},
 						},
 					},

old/provider/docker/config_container_swarm_test.go

@@ -99,17 +99,25 @@ func TestSwarmBuildConfiguration(t *testing.T) {
 				swarmService(
 					serviceName("test"),
 					serviceLabels(map[string]string{
-						label.TraefikPort:                                              "80",
-						label.TraefikFrontendPassTLSClientCertPem:                      "true",
-						label.TraefikFrontendPassTLSClientCertInfosNotBefore:           "true",
-						label.TraefikFrontendPassTLSClientCertInfosNotAfter:            "true",
-						label.TraefikFrontendPassTLSClientCertInfosSans:                "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectCommonName:   "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectCountry:      "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectLocality:     "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectOrganization: "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectProvince:     "true",
-						label.TraefikFrontendPassTLSClientCertInfosSubjectSerialNumber: "true",
+						label.TraefikPort:                                                 "80",
+						label.TraefikFrontendPassTLSClientCertPem:                         "true",
+						label.TraefikFrontendPassTLSClientCertInfosNotBefore:              "true",
+						label.TraefikFrontendPassTLSClientCertInfosNotAfter:               "true",
+						label.TraefikFrontendPassTLSClientCertInfosSans:                   "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerCommonName:       "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerCountry:          "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerDomainComponent:  "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerLocality:         "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerOrganization:     "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerProvince:         "true",
+						label.TraefikFrontendPassTLSClientCertInfosIssuerSerialNumber:     "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectCommonName:      "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectCountry:         "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectDomainComponent: "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectLocality:        "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectOrganization:    "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectProvince:        "true",
+						label.TraefikFrontendPassTLSClientCertInfosSubjectSerialNumber:    "true",
 					}),
 					withEndpointSpec(modeVIP),
 					withEndpoint(virtualIP("1", "127.0.0.1/24")),
@@ -126,13 +134,23 @@ func TestSwarmBuildConfiguration(t *testing.T) {
 							NotBefore: true,
 							Sans:      true,
 							NotAfter:  true,
-							Subject: &types.TLSCLientCertificateSubjectInfos{
-								CommonName:   true,
-								Country:      true,
-								Locality:     true,
-								Organization: true,
-								Province:     true,
-								SerialNumber: true,
+							Subject: &types.TLSCLientCertificateDNInfos{
+								CommonName:      true,
+								Country:         true,
+								DomainComponent: true,
+								Locality:        true,
+								Organization:    true,
+								Province:        true,
+								SerialNumber:    true,
+							},
+							Issuer: &types.TLSCLientCertificateDNInfos{
+								CommonName:      true,
+								Country:         true,
+								DomainComponent: true,
+								Locality:        true,
+								Organization:    true,
+								Province:        true,
+								SerialNumber:    true,
 							},
 						},
 					},

old/provider/docker/config_segment_test.go

@@ -71,18 +71,19 @@ func TestSegmentBuildConfiguration(t *testing.T) {
 				containerJSON(
 					name("foo"),
 					labels(map[string]string{
-						"traefik.sauternes.port":                                                                    "2503",
-						"traefik.sauternes.frontend.entryPoints":                                                    "http,https",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertPem:                      "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosNotAfter:            "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosNotBefore:           "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSans:                "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectCommonName:   "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectCountry:      "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectLocality:     "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectOrganization: "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectProvince:     "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectSerialNumber: "true",
+						"traefik.sauternes.port":                                                                       "2503",
+						"traefik.sauternes.frontend.entryPoints":                                                       "http,https",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertPem:                         "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosNotAfter:               "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosNotBefore:              "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSans:                   "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectCommonName:      "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectCountry:         "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectDomainComponent: "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectLocality:        "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectOrganization:    "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectProvince:        "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectSerialNumber:    "true",
 					}),
 					ports(nat.PortMap{
 						"80/tcp": {},
@@ -106,13 +107,14 @@ func TestSegmentBuildConfiguration(t *testing.T) {
 							NotBefore: true,
 							Sans:      true,
 							NotAfter:  true,
-							Subject: &types.TLSCLientCertificateSubjectInfos{
-								CommonName:   true,
-								Country:      true,
-								Locality:     true,
-								Organization: true,
-								Province:     true,
-								SerialNumber: true,
+							Subject: &types.TLSCLientCertificateDNInfos{
+								CommonName:      true,
+								Country:         true,
+								DomainComponent: true,
+								Locality:        true,
+								Organization:    true,
+								Province:        true,
+								SerialNumber:    true,
 							},
 						},
 					},
@@ -355,16 +357,24 @@ func TestSegmentBuildConfiguration(t *testing.T) {
 						label.Prefix + "sauternes." + label.SuffixProtocol: "https",
 						label.Prefix + "sauternes." + label.SuffixWeight:   "12",
 
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertPem:                      "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosNotAfter:            "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosNotBefore:           "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSans:                "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectCommonName:   "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectCountry:      "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectLocality:     "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectOrganization: "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectProvince:     "true",
-						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectSerialNumber: "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertPem:                         "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosNotAfter:               "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosNotBefore:              "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSans:                   "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosIssuerCommonName:       "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosIssuerCountry:          "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosIssuerDomainComponent:  "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosIssuerLocality:         "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosIssuerOrganization:     "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosIssuerProvince:         "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosIssuerSerialNumber:     "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectCommonName:      "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectCountry:         "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectDomainComponent: "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectLocality:        "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectOrganization:    "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectProvince:        "true",
+						label.Prefix + "sauternes." + label.SuffixFrontendPassTLSClientCertInfosSubjectSerialNumber:    "true",
 
 						label.Prefix + "sauternes." + label.SuffixFrontendAuthBasicRemoveHeader:            "true",
 						label.Prefix + "sauternes." + label.SuffixFrontendAuthBasicRealm:                   "myRealm",
@@ -455,13 +465,23 @@ func TestSegmentBuildConfiguration(t *testing.T) {
 							NotBefore: true,
 							Sans:      true,
 							NotAfter:  true,
-							Subject: &types.TLSCLientCertificateSubjectInfos{
-								CommonName:   true,
-								Country:      true,
-								Locality:     true,
-								Organization: true,
-								Province:     true,
-								SerialNumber: true,
+							Subject: &types.TLSCLientCertificateDNInfos{
+								CommonName:      true,
+								Country:         true,
+								DomainComponent: true,
+								Locality:        true,
+								Organization:    true,
+								Province:        true,
+								SerialNumber:    true,
+							},
+							Issuer: &types.TLSCLientCertificateDNInfos{
+								CommonName:      true,
+								Country:         true,
+								DomainComponent: true,
+								Locality:        true,
+								Organization:    true,
+								Province:        true,
+								SerialNumber:    true,
 							},
 						},
 					},