Fix the bug with showing the number of validity days

Author: andyone

cli/cli.go

@@ -38,7 +38,7 @@ import (
 
 const (
 	APP  = "SSLScan Client"
-	VER  = "2.7.4"
+	VER  = "2.7.5"
 	DESC = "Command-line client for the SSL Labs API"
 )
 
@@ -86,8 +86,8 @@ type HostCheckInfo struct {
 
 type EndpointCheckInfo struct {
 	IPAddress string  `json:"ipAddress"`
-	Grade    string  `json:"grade"`
-	GradeNum float64 `json:"gradeNum"`
+	Grade     string  `json:"grade"`
+	GradeNum  float64 `json:"gradeNum"`
 }
 
 // ////////////////////////////////////////////////////////////////////////////////// //
@@ -573,8 +573,8 @@ func appendEndpointsInfo(checkInfo *HostCheckInfo, endpoints []*sslscan.Endpoint
 
 		checkInfo.Endpoints = append(checkInfo.Endpoints, &EndpointCheckInfo{
 			IPAddress: endpoint.IPAddress,
-			Grade:    grade,
-			GradeNum: gradeNumMap[grade],
+			Grade:     grade,
+			GradeNum:  gradeNumMap[grade],
 		})
 	}
 }

cli/details.go

@@ -333,8 +333,9 @@ func printCertValidityInfo(cert *sslscan.Cert) {
 		)
 	} else {
 		fmtc.Printf(
-			"%s {s-}(expires in %s){!}\n",
+			"%s {s-}(expires in %s %s){!}\n",
 			timeutil.Format(validUntilDate, "%Y/%m/%d %H:%M:%S"),
+			fmtutil.PrettyNum(validDays),
 			pluralize.Pluralize(int(validDays), "day", "days"),
 		)
 	}
@@ -503,8 +504,9 @@ func printChainCertInfo(cert *sslscan.Cert) {
 	fmtc.Printf(" %-24s {s}|{!} {s-}Pin: %s{!}\n", "", cert.PINSHA256)
 
 	fmtc.Printf(
-		" %-24s {s}|{!} %s {s-}(expires in %s){!}\n", "Valid until",
+		" %-24s {s}|{!} %s {s-}(expires in %s %s){!}\n", "Valid until",
 		timeutil.Format(validUntilDate, "%Y/%m/%d %H:%M:%S"),
+		fmtutil.PrettyNum(validDays),
 		pluralize.Pluralize(int(validDays), "day", "days"),
 	)
 
@@ -1506,7 +1508,8 @@ func getExpiryMessage(ap *sslscan.AnalyzeProgress, dur int64) string {
 	validDays := (validUntilDate.Unix() - time.Now().Unix()) / 86400
 
 	return fmt.Sprintf(
-		" {r}(expires in %s){!}",
+		" {r}(expires in %s %s){!}",
+		fmtutil.PrettyNum(validDays),
 		pluralize.Pluralize(int(validDays), "day", "days"),
 	)
 }