mirror of https://github.com/jetkvm/kvm.git
make linter happy
This commit is contained in:
parent
01022eaa64
commit
163bf51ad0
3
Makefile
3
Makefile
|
@ -8,9 +8,6 @@ VERSION := 0.3.8
|
||||||
PROMETHEUS_TAG := github.com/prometheus/common/version
|
PROMETHEUS_TAG := github.com/prometheus/common/version
|
||||||
KVM_PKG_NAME := github.com/jetkvm/kvm
|
KVM_PKG_NAME := github.com/jetkvm/kvm
|
||||||
|
|
||||||
PROMETHEUS_TAG := github.com/prometheus/common/version
|
|
||||||
KVM_PKG_NAME := github.com/jetkvm/kvm
|
|
||||||
|
|
||||||
GO_LDFLAGS := \
|
GO_LDFLAGS := \
|
||||||
-s -w \
|
-s -w \
|
||||||
-X $(PROMETHEUS_TAG).Branch=$(BRANCH) \
|
-X $(PROMETHEUS_TAG).Branch=$(BRANCH) \
|
||||||
|
|
|
@ -7,7 +7,6 @@ import (
|
||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
"crypto/x509"
|
"crypto/x509"
|
||||||
"crypto/x509/pkix"
|
"crypto/x509/pkix"
|
||||||
"log"
|
|
||||||
"net"
|
"net"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
@ -78,7 +77,8 @@ func (s *SelfSigner) createSelfSignedCert(hostname string) *tls.Certificate {
|
||||||
|
|
||||||
priv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
|
priv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
|
||||||
if err != nil {
|
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()
|
notBefore := time.Now()
|
||||||
|
@ -87,6 +87,7 @@ func (s *SelfSigner) createSelfSignedCert(hostname string) *tls.Certificate {
|
||||||
serialNumber, err := generateSerialNumber()
|
serialNumber, err := generateSerialNumber()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.log.Errorf("Failed to generate serial number: %v", err)
|
s.log.Errorf("Failed to generate serial number: %v", err)
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
dnsName := hostname
|
dnsName := hostname
|
||||||
|
@ -164,8 +165,10 @@ func (s *SelfSigner) createSelfSignedCert(hostname string) *tls.Certificate {
|
||||||
return tlsCert
|
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) {
|
func (s *SelfSigner) GetCertificate(info *tls.ClientHelloInfo) (*tls.Certificate, error) {
|
||||||
hostname := s.DefaultDomain
|
var hostname string
|
||||||
if info.ServerName != "" && info.ServerName != selfSignerCAMagicName {
|
if info.ServerName != "" && info.ServerName != selfSignerCAMagicName {
|
||||||
hostname = info.ServerName
|
hostname = info.ServerName
|
||||||
} else {
|
} else {
|
||||||
|
|
11
jsonrpc.go
11
jsonrpc.go
|
@ -406,7 +406,16 @@ func rpcGetTLSState() TLSState {
|
||||||
}
|
}
|
||||||
|
|
||||||
func rpcSetTLSState(tlsState TLSState) error {
|
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) {
|
func callRPCHandler(handler RPCHandler, params map[string]interface{}) (interface{}, error) {
|
||||||
|
|
|
@ -101,7 +101,6 @@ func setTLSState(s TLSState) error {
|
||||||
case "self-signed":
|
case "self-signed":
|
||||||
config.TLSMode = "self-signed"
|
config.TLSMode = "self-signed"
|
||||||
}
|
}
|
||||||
SaveConfig()
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue