From 4ed3f21d7293dd6ac3bf3a9dc4c1fa0e28247379 Mon Sep 17 00:00:00 2001
From: Toby <tobyxdd@gmail.com>
Date: Sat, 24 Aug 2024 17:07:45 -0700
Subject: [PATCH] fix: crash when the tls option is not used & change from
 python3 to python

---
 app/cmd/server.go                     | 24 ++++++++++++------------
 app/internal/utils/certloader_test.go |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/cmd/server.go b/app/cmd/server.go
index 3d37c09..3da748d 100644
--- a/app/cmd/server.go
+++ b/app/cmd/server.go
@@ -291,19 +291,19 @@ func (c *serverConfig) fillTLSConfig(hyConfig *server.Config) error {
 	if c.TLS != nil && c.ACME != nil {
 		return configError{Field: "tls", Err: errors.New("cannot set both tls and acme")}
 	}
-	// SNI guard
-	var sniGuard utils.SNIGuardFunc
-	switch strings.ToLower(c.TLS.SNIGuard) {
-	case "", "dns-san":
-		sniGuard = utils.SNIGuardDNSSAN
-	case "strict":
-		sniGuard = utils.SNIGuardStrict
-	case "disable":
-		sniGuard = nil
-	default:
-		return configError{Field: "tls.sniGuard", Err: errors.New("unsupported SNI guard")}
-	}
 	if c.TLS != nil {
+		// SNI guard
+		var sniGuard utils.SNIGuardFunc
+		switch strings.ToLower(c.TLS.SNIGuard) {
+		case "", "dns-san":
+			sniGuard = utils.SNIGuardDNSSAN
+		case "strict":
+			sniGuard = utils.SNIGuardStrict
+		case "disable":
+			sniGuard = nil
+		default:
+			return configError{Field: "tls.sniGuard", Err: errors.New("unsupported SNI guard")}
+		}
 		// Local TLS cert
 		if c.TLS.Cert == "" || c.TLS.Key == "" {
 			return configError{Field: "tls", Err: errors.New("empty cert or key path")}
diff --git a/app/internal/utils/certloader_test.go b/app/internal/utils/certloader_test.go
index 7c5875c..3a8e26b 100644
--- a/app/internal/utils/certloader_test.go
+++ b/app/internal/utils/certloader_test.go
@@ -111,7 +111,7 @@ func generateTestCertificate(dnssan []string, certType string) error {
 	if len(dnssan) > 0 {
 		args = append(args, "--dnssan", strings.Join(dnssan, ","))
 	}
-	cmd := exec.Command("python3", args...)
+	cmd := exec.Command("python", args...)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		log.Printf("Failed to generate test certificate: %s", out)
@@ -129,7 +129,7 @@ func runTestTLSClient(sni string) error {
 	if sni != "" {
 		args = append(args, "--sni", sni)
 	}
-	cmd := exec.Command("python3", args...)
+	cmd := exec.Command("python", args...)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		log.Printf("Failed to run test TLS client: %s", out)