From 06a15e6c7019e4dbe82ecf9044a5e58849b65861 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Tue, 7 Jan 2025 17:21:02 +0200 Subject: Refactored to better embed the certifcates and also made sure to read at runtime the server.key instead of containing it in the server's executable using go embed --- internal/server/server.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'internal/server') diff --git a/internal/server/server.go b/internal/server/server.go index f510821..253cef3 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -5,17 +5,18 @@ import ( "crypto/ed25519" "crypto/rand" "crypto/tls" - _ "embed" "encoding/binary" "errors" "fmt" "io" "log" "net" + "os" "strconv" "sync" "time" + "github.com/kyren223/eko/certs" "github.com/kyren223/eko/internal/packet" "github.com/kyren223/eko/internal/server/api" "github.com/kyren223/eko/internal/server/session" @@ -23,19 +24,19 @@ import ( "github.com/kyren223/eko/pkg/snowflake" ) -//go:embed certs/server.crt -var certPEM []byte - -//go:embed certs/server.key -var keyPEM []byte - var ( nodeId int64 = 0 tlsConfig *tls.Config ) func init() { - cert, err := tls.X509KeyPair(certPEM, keyPEM) + path := "certs/server.key" + keyPEM, err := os.ReadFile(path) + if err != nil { + log.Fatalln("failed to read certificate key from", path) + } + + cert, err := tls.X509KeyPair(certs.CertPEM, keyPEM) if err != nil { log.Fatalln("error loading certificate:", err) } -- cgit v1.3.1