Code refactoring

Author: andyone

cli/cli.go

@@ -40,7 +40,7 @@ import (
 
 const (
 	APP  = "SSLScan Client"
-	VER  = "3.0.2"
+	VER  = "3.0.3"
 	DESC = "Command-line client for the SSL Labs API"
 )
 
@@ -159,7 +159,7 @@ func Run(gitRev string, gomod []byte) {
 
 	if !errs.IsEmpty() {
 		terminal.Error("Options parsing errors:")
-		terminal.Error(errs.Error("- "))
+		terminal.Error(errs.Error(" - "))
 		os.Exit(1)
 	}
 
@@ -272,7 +272,7 @@ func registerUser() (error, bool) {
 
 	if err != nil {
 		if !options.GetB(OPT_FORMAT) {
-			return fmt.Errorf("Error while sending request to SSL Labs API: %v", err), false
+			return fmt.Errorf("Error while sending request to SSL Labs API: %w", err), false
 		}
 
 		return nil, false
@@ -302,7 +302,7 @@ func registerUser() (error, bool) {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Can't register user: %v", err), false
+		return fmt.Errorf("Can't register user: %w", err), false
 	}
 
 	fmtc.Printfn("{g}%s{!}\n", resp.Message)
@@ -320,7 +320,7 @@ func runHostCheck(args options.Arguments) (error, bool) {
 
 	if err != nil {
 		if !options.GetB(OPT_FORMAT) {
-			return fmt.Errorf("Error while sending request to SSL Labs API: %v", err), false
+			return fmt.Errorf("Error while sending request to SSL Labs API: %w", err), false
 		}
 
 		return nil, false
@@ -704,7 +704,7 @@ func checkAPIAvailability() support.Check {
 	} else if resp.StatusCode != 200 {
 		return support.Check{
 			support.CHECK_ERROR, "SSLLabs API", fmt.Sprintf(
-				"API returned non-ok status code %s", resp.StatusCode,
+				"API returned non-ok status code %d", resp.StatusCode,
 			),
 		}
 	}
@@ -756,6 +756,8 @@ func genUsage() *usage.Info {
 	info.AddOption(OPT_HELP, "Show this help message")
 	info.AddOption(OPT_VER, "Show version")
 
+	info.AddEnv("SSLLABS_EMAIL", "User account email {s-}(String){!}")
+
 	info.AddExample(
 		"--register --email john@domain.com --org 'Some Organization' --name 'John Doe'",
 		"Register new user account for scanning",

cli/details.go

@@ -9,14 +9,14 @@ package cli
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 	"time"
 
 	"github.com/essentialkaos/ek/v13/fmtc"
 	"github.com/essentialkaos/ek/v13/fmtutil"
 	"github.com/essentialkaos/ek/v13/httputil"
 	"github.com/essentialkaos/ek/v13/pluralize"
-	"github.com/essentialkaos/ek/v13/sliceutil"
 	"github.com/essentialkaos/ek/v13/strutil"
 	"github.com/essentialkaos/ek/v13/terminal"
 	"github.com/essentialkaos/ek/v13/timeutil"
@@ -603,11 +603,11 @@ func printProtocolSuiteInfo(suite *sslscan.Suite, chaCha20Preference bool) {
 	}
 
 	switch {
-	case insecure == true:
+	case insecure:
 		fmtc.Printf(" {r}%-52s{!} {s}|{!} {r}%d (INSECURE){!} ", suite.Name, suite.CipherStrength)
-	case weak == true:
+	case weak:
 		fmtc.Printf(" {y}%-52s{!} {s}|{!} {y}%d (WEAK){!} ", suite.Name, suite.CipherStrength)
-	case preferred == true:
+	case preferred:
 		fmtc.Printf(" {*}%-52s{!} {s}|{!} %d ", suite.Name, suite.CipherStrength)
 	default:
 		fmtc.Printf(" %-52s {s}|{!} %d ", suite.Name, suite.CipherStrength)
@@ -1458,12 +1458,12 @@ func getTrustInfo(certID string, endpoints []*sslscan.EndpointInfo) (map[string]
 	for _, endpoint := range endpoints {
 		for _, chain := range endpoint.Details.CertChains {
 			for _, path := range chain.TrustPaths {
-				if !sliceutil.Contains(path.CertIDs, certID) {
+				if !slices.Contains(path.CertIDs, certID) {
 					continue
 				}
 
 				for _, store := range path.Trust {
-					if store.IsTrusted && result[store.RootStore] == false {
+					if store.IsTrusted && !result[store.RootStore] {
 						result[store.RootStore] = true
 					}
 				}

common/sslcli.spec

@@ -10,7 +10,7 @@
 
 Summary:        Pretty awesome command-line client for public SSLLabs API
 Name:           sslcli
-Version:        3.0.2
+Version:        3.0.3
 Release:        0%{?dist}
 Group:          Applications/System
 License:        Apache License, Version 2.0
@@ -103,6 +103,10 @@ fi
 ################################################################################
 
 %changelog
+* Thu May 15 2025 Anton Novojilov <andy@essentialkaos.com> - 3.0.3-0
+- Code refactoring
+- Dependencies update
+
 * Tue Aug 06 2024 Anton Novojilov <andy@essentialkaos.com> - 3.0.2-0
 - Package ek updated to v13
 - Dependencies update