From 33a9e1e0eb88fdb124f4f4dc10f7f50286fa3447 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Wed, 15 Jun 2022 06:57:57 +0200 Subject: [PATCH 1/4] node: add JWT secret log line --- node/node.go | 1 + 1 file changed, 1 insertion(+) diff --git a/node/node.go b/node/node.go index 7c540306db2b..0db99b162cb7 100644 --- a/node/node.go +++ b/node/node.go @@ -356,6 +356,7 @@ func (n *Node) obtainJWTSecret(cliParam string) ([]byte, error) { if data, err := os.ReadFile(fileName); err == nil { jwtSecret := common.FromHex(strings.TrimSpace(string(data))) if len(jwtSecret) == 32 { + log.Info("Read JWT secret", "path", fileName) return jwtSecret, nil } log.Error("Invalid JWT secret", "path", fileName, "length", len(jwtSecret)) From d961279d4ecc5a7043310c432cf320406c3df441 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Wed, 15 Jun 2022 10:19:54 +0200 Subject: [PATCH 2/4] node: better log --- node/node.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/node/node.go b/node/node.go index 0db99b162cb7..a0c93b2382d7 100644 --- a/node/node.go +++ b/node/node.go @@ -20,6 +20,7 @@ import ( crand "crypto/rand" "errors" "fmt" + "hash/crc32" "net/http" "os" "path/filepath" @@ -356,7 +357,7 @@ func (n *Node) obtainJWTSecret(cliParam string) ([]byte, error) { if data, err := os.ReadFile(fileName); err == nil { jwtSecret := common.FromHex(strings.TrimSpace(string(data))) if len(jwtSecret) == 32 { - log.Info("Read JWT secret", "path", fileName) + log.Info("Read JWT secret", "path", fileName, "crc32", fmt.Sprintf("%#x", crc32.ChecksumIEEE(jwtSecret))) return jwtSecret, nil } log.Error("Invalid JWT secret", "path", fileName, "length", len(jwtSecret)) From 1eee315045799f64b47e660a56f03666a09b5454 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Wed, 15 Jun 2022 14:11:03 +0200 Subject: [PATCH 3/4] Update node.go --- node/node.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/node.go b/node/node.go index a0c93b2382d7..e13a82599ebb 100644 --- a/node/node.go +++ b/node/node.go @@ -357,7 +357,7 @@ func (n *Node) obtainJWTSecret(cliParam string) ([]byte, error) { if data, err := os.ReadFile(fileName); err == nil { jwtSecret := common.FromHex(strings.TrimSpace(string(data))) if len(jwtSecret) == 32 { - log.Info("Read JWT secret", "path", fileName, "crc32", fmt.Sprintf("%#x", crc32.ChecksumIEEE(jwtSecret))) + log.Info("JWT secret loaded", "path", fileName, "crc32", fmt.Sprintf("%#x", crc32.ChecksumIEEE(jwtSecret))) return jwtSecret, nil } log.Error("Invalid JWT secret", "path", fileName, "length", len(jwtSecret)) From e282475c66d97989b3a8d96b6f8946fa7a85a6fb Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Wed, 15 Jun 2022 14:17:35 +0200 Subject: [PATCH 4/4] Update node.go --- node/node.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/node/node.go b/node/node.go index e13a82599ebb..0a2b9eb83692 100644 --- a/node/node.go +++ b/node/node.go @@ -353,11 +353,10 @@ func (n *Node) obtainJWTSecret(cliParam string) ([]byte, error) { fileName = n.ResolvePath(datadirJWTKey) } // try reading from file - log.Debug("Reading JWT secret", "path", fileName) if data, err := os.ReadFile(fileName); err == nil { jwtSecret := common.FromHex(strings.TrimSpace(string(data))) if len(jwtSecret) == 32 { - log.Info("JWT secret loaded", "path", fileName, "crc32", fmt.Sprintf("%#x", crc32.ChecksumIEEE(jwtSecret))) + log.Info("Loaded JWT secret file", "path", fileName, "crc32", fmt.Sprintf("%#x", crc32.ChecksumIEEE(jwtSecret))) return jwtSecret, nil } log.Error("Invalid JWT secret", "path", fileName, "length", len(jwtSecret))