Merge pull request #977 from atc0005/i952-lscert-adjust-hostname-vali…

…dation-behavior

Update `lscert` hostname validation behavior

cmd/lscert/main.go

@@ -230,14 +230,15 @@ func main() {
 		)
 	}
 
+	hasLeafCert := certs.HasLeafCert(certChain)
 	hostnameValidationResult := certs.ValidateHostname(
 		certChain,
 		cfg.Server,
 		cfg.DNSName,
 		config.IgnoreHostnameVerificationFailureIfEmptySANsListFlag,
 		certs.CertChainValidationOptions{
 			IgnoreHostnameVerificationFailureIfEmptySANsList: cfg.IgnoreHostnameVerificationFailureIfEmptySANsList,
-			IgnoreValidationResultHostname:                   !cfg.ApplyCertHostnameValidationResults(),
+			IgnoreValidationResultHostname:                   !hasLeafCert || cfg.DNSName == "",
 		},
 	)
 
@@ -259,10 +260,21 @@ func main() {
 			Msgf("%s validation ignored", hostnameValidationResult.CheckName())
 
 		fmt.Printf(
-			"- %s: %s %s\n",
+			"- %s: %s %s%s\n",
 			hostnameValidationResult.ServiceState().Label,
 			hostnameValidationResult.Status(),
 			hostnameValidationResult.Overview(),
+			func() string {
+				switch {
+				case hasLeafCert:
+					return fmt.Sprintf(
+						"(use %q flag to force evaluation)",
+						config.DNSNameFlagLong,
+					)
+				default:
+					return "(not supported for this cert type)"
+				}
+			}(),
 		)
 
 	default:

internal/certs/certs.go

@@ -616,6 +616,43 @@ func IsExpiringCert(cert *x509.Certificate, ageCritical time.Time, ageWarning ti
 
 }
 
+// HasLeafCert receives a slice of x509 certificates and indicates whether
+// any of the certificates in the chain are a leaf certificate.
+func HasLeafCert(certChain []*x509.Certificate) bool {
+	for _, cert := range certChain {
+		if IsLeafCert(cert, certChain) {
+			return true
+		}
+	}
+
+	return false
+}
+
+// HasIntermediateCert receives a slice of x509 certificates and indicates
+// whether any of the certificates in the chain are an intermediate
+// certificate.
+func HasIntermediateCert(certChain []*x509.Certificate) bool {
+	for _, cert := range certChain {
+		if IsIntermediateCert(cert, certChain) {
+			return true
+		}
+	}
+
+	return false
+}
+
+// HasRootCert receives a slice of x509 certificates and indicates whether any
+// of the certificates in the chain are a root certificate.
+func HasRootCert(certChain []*x509.Certificate) bool {
+	for _, cert := range certChain {
+		if IsRootCert(cert, certChain) {
+			return true
+		}
+	}
+
+	return false
+}
+
 // HasExpiredCert receives a slice of x509 certificates and indicates whether
 // any of the certificates in the chain have expired.
 func HasExpiredCert(certChain []*x509.Certificate) bool {