@@ -14,6 +14,7 @@ import (
1414
1515 "github.com/essentialkaos/ek/v12/fmtc"
1616 "github.com/essentialkaos/ek/v12/fmtutil"
17+ "github.com/essentialkaos/ek/v12/httputil"
1718 "github.com/essentialkaos/ek/v12/pluralize"
1819 "github.com/essentialkaos/ek/v12/sliceutil"
1920 "github.com/essentialkaos/ek/v12/strutil"
@@ -74,7 +75,7 @@ func printDetailedInfo(ap *sslscan.AnalyzeProgress, fromCache bool) {
7475 printCertificateInfo (info .Certs , info .Endpoints )
7576
7677 for index , endpoint := range info .Endpoints {
77- fmtc .Printf ("\n {c*} %s {!*}#%d (%s){!}\n " , info .Host , index + 1 , endpoint .IPAdress )
78+ fmtc .Printf ("\n {c*} %s {!*}#%d (%s){!}\n " , info .Host , index + 1 , endpoint .IPAddress )
7879 printDetailedEndpointInfo (endpoint , info .Certs )
7980 }
8081}
@@ -333,8 +334,9 @@ func printCertValidityInfo(cert *sslscan.Cert) {
333334 )
334335 } else {
335336 fmtc .Printf (
336- "%s {s-}(expires in %s){!}\n " ,
337+ "%s {s-}(expires in %s %s ){!}\n " ,
337338 timeutil .Format (validUntilDate , "%Y/%m/%d %H:%M:%S" ),
339+ fmtutil .PrettyNum (validDays ),
338340 pluralize .Pluralize (int (validDays ), "day" , "days" ),
339341 )
340342 }
@@ -503,8 +505,9 @@ func printChainCertInfo(cert *sslscan.Cert) {
503505 fmtc .Printf (" %-24s {s}|{!} {s-}Pin: %s{!}\n " , "" , cert .PINSHA256 )
504506
505507 fmtc .Printf (
506- " %-24s {s}|{!} %s {s-}(expires in %s){!}\n " , "Valid until" ,
508+ " %-24s {s}|{!} %s {s-}(expires in %s %s ){!}\n " , "Valid until" ,
507509 timeutil .Format (validUntilDate , "%Y/%m/%d %H:%M:%S" ),
510+ fmtutil .PrettyNum (validDays ),
508511 pluralize .Pluralize (int (validDays ), "day" , "days" ),
509512 )
510513
@@ -637,9 +640,19 @@ func printSimulationInfo(sim *sslscan.SIM, suites []*sslscan.ProtocolSuites) {
637640 }
638641
639642 if sim .Client .IsReference {
640- fmtc .Printf (" %-29s {s}|{!} " , sim .Client .Name + " " + sim .Client .Version + " " + fmtc .Sprintf ("{g}R" ))
643+ fmtc .Printf (
644+ " %s {s}|{!} " ,
645+ fmtutil .Align (fmtc .Sprintf (
646+ "%s %s {g}R{!}" , sim .Client .Name , sim .Client .Version ,
647+ ), fmtutil .LEFT , 20 ),
648+ )
641649 } else {
642- fmtc .Printf (" %-20s {s}|{!} " , sim .Client .Name + " " + sim .Client .Version )
650+ fmtc .Printf (
651+ " %s {s}|{!} " ,
652+ fmtutil .Align (fmtc .Sprintf (
653+ "%s %s" , sim .Client .Name , sim .Client .Version ,
654+ ), fmtutil .LEFT , 20 ),
655+ )
643656 }
644657
645658 switch protocolsNames [sim .ProtocolID ] {
@@ -1178,7 +1191,11 @@ func printTestInfo(info *sslscan.EndpointInfo) {
11781191 if details .HTTPStatusCode == 0 {
11791192 fmtc .Printf (" %-24s {s}|{!} {y}Request failed{!}\n " , "HTTP status code" )
11801193 } else {
1181- fmtc .Printf (" %-24s {s}|{!} %d\n " , "HTTP status code" , details .HTTPStatusCode )
1194+ fmtc .Printf (
1195+ " %-24s {s}|{!} %d {s-}(%s){!}\n " , "HTTP status code" ,
1196+ details .HTTPStatusCode ,
1197+ httputil .GetDescByCode (details .HTTPStatusCode ),
1198+ )
11821199 }
11831200}
11841201
@@ -1506,7 +1523,8 @@ func getExpiryMessage(ap *sslscan.AnalyzeProgress, dur int64) string {
15061523 validDays := (validUntilDate .Unix () - time .Now ().Unix ()) / 86400
15071524
15081525 return fmt .Sprintf (
1509- " {r}(expires in %s){!}" ,
1526+ " {r}(expires in %s %s){!}" ,
1527+ fmtutil .PrettyNum (validDays ),
15101528 pluralize .Pluralize (int (validDays ), "day" , "days" ),
15111529 )
15121530}
0 commit comments