From 163bf51ad00e8bf2fdf7272d75fc8f0b4133b570 Mon Sep 17 00:00:00 2001
From: Siyuan Miao <i@xswan.net>
Date: Mon, 7 Apr 2025 13:31:30 +0200
Subject: [PATCH] make linter happy

---
 Makefile                       |  3 ---
 internal/websecure/selfsign.go |  9 ++++++---
 jsonrpc.go                     | 11 ++++++++++-
 web_tls.go                     |  1 -
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 5ef7804..2aefdea 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,6 @@ VERSION := 0.3.8
 PROMETHEUS_TAG := github.com/prometheus/common/version
 KVM_PKG_NAME := github.com/jetkvm/kvm
 
-PROMETHEUS_TAG := github.com/prometheus/common/version
-KVM_PKG_NAME := github.com/jetkvm/kvm
-
 GO_LDFLAGS := \
   -s -w \
   -X $(PROMETHEUS_TAG).Branch=$(BRANCH) \
diff --git a/internal/websecure/selfsign.go b/internal/websecure/selfsign.go
index f93d719..120873d 100644
--- a/internal/websecure/selfsign.go
+++ b/internal/websecure/selfsign.go
@@ -7,7 +7,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"crypto/x509/pkix"
-	"log"
 	"net"
 	"strings"
 	"time"
@@ -78,7 +77,8 @@ func (s *SelfSigner) createSelfSignedCert(hostname string) *tls.Certificate {
 
 	priv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
 	if err != nil {
-		log.Fatalf("Failed to generate private key: %v", err)
+		s.log.Errorf("Failed to generate private key: %v", err)
+		return nil
 	}
 
 	notBefore := time.Now()
@@ -87,6 +87,7 @@ func (s *SelfSigner) createSelfSignedCert(hostname string) *tls.Certificate {
 	serialNumber, err := generateSerialNumber()
 	if err != nil {
 		s.log.Errorf("Failed to generate serial number: %v", err)
+		return nil
 	}
 
 	dnsName := hostname
@@ -164,8 +165,10 @@ func (s *SelfSigner) createSelfSignedCert(hostname string) *tls.Certificate {
 	return tlsCert
 }
 
+// GetCertificate returns the certificate for the given hostname
+// returns nil if the certificate is not found
 func (s *SelfSigner) GetCertificate(info *tls.ClientHelloInfo) (*tls.Certificate, error) {
-	hostname := s.DefaultDomain
+	var hostname string
 	if info.ServerName != "" && info.ServerName != selfSignerCAMagicName {
 		hostname = info.ServerName
 	} else {
diff --git a/jsonrpc.go b/jsonrpc.go
index fde5946..b4dadd3 100644
--- a/jsonrpc.go
+++ b/jsonrpc.go
@@ -406,7 +406,16 @@ func rpcGetTLSState() TLSState {
 }
 
 func rpcSetTLSState(tlsState TLSState) error {
-	return setTLSState(tlsState)
+	err := setTLSState(tlsState)
+	if err != nil {
+		return fmt.Errorf("failed to set TLS state: %w", err)
+	}
+
+	if err := SaveConfig(); err != nil {
+		return fmt.Errorf("failed to save config: %w", err)
+	}
+
+	return nil
 }
 
 func callRPCHandler(handler RPCHandler, params map[string]interface{}) (interface{}, error) {
diff --git a/web_tls.go b/web_tls.go
index 6a4e209..84fb27e 100644
--- a/web_tls.go
+++ b/web_tls.go
@@ -101,7 +101,6 @@ func setTLSState(s TLSState) error {
 	case "self-signed":
 		config.TLSMode = "self-signed"
 	}
-	SaveConfig()
 	return nil
 }