From 6c12375e17f0b6da94c2a9928484c545d784cb3e Mon Sep 17 00:00:00 2001 From: Dustin Stiles Date: Sat, 22 Mar 2025 14:28:03 -0400 Subject: [PATCH] refactor(internal/peer): reduce default logging --- internal/peer/peer.go | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/internal/peer/peer.go b/internal/peer/peer.go index 140a9e9..8089638 100644 --- a/internal/peer/peer.go +++ b/internal/peer/peer.go @@ -5,9 +5,9 @@ import ( "crypto/ed25519" "encoding/base64" "fmt" + "io" "log/slog" "net" - "os" "strings" "koti.casa/numenor-labs/dsfx/internal/lib/crypto/identity" @@ -85,7 +85,7 @@ func New(disk disk.Disk, system system.System) *Peer { func (p *Peer) Run(ctx context.Context) error { opts := &slog.HandlerOptions{ AddSource: false, - Level: slog.LevelDebug, + Level: slog.LevelInfo, } logger := slog.New(slog.NewTextHandler(p.system.Stdout(), opts)) @@ -169,9 +169,6 @@ func (p *Peer) loadAdmins() ([]string, error) { func (p *Peer) hasAdminsFile() (bool, error) { f, err := p.config.Open("admins") if err != nil { - if os.IsNotExist(err) { - return false, nil - } return false, err } defer f.Close() @@ -237,11 +234,8 @@ func (p *Peer) loadIdentity() (ed25519.PrivateKey, error) { // hasKeyFile checks if the key file exists in the disk storage. func (p *Peer) hasKeyFile() (bool, error) { - f, err := p.config.Open("key") + f, err := p.config.Open("ed25519.key") if err != nil { - if os.IsNotExist(err) { - return false, nil - } return false, err } defer f.Close() @@ -251,7 +245,7 @@ func (p *Peer) hasKeyFile() (bool, error) { // createKeyFile creates a new key file with a generated private key. func (p *Peer) createKeyFile() error { - f, err := p.config.Create("key") + f, err := p.config.Create("ed25519.key") if err != nil { return err } @@ -272,19 +266,23 @@ func (p *Peer) createKeyFile() error { // readKeyFile reads the private key from the key file and returns it as an ed25519.PrivateKey. func (p *Peer) readKeyFile() (ed25519.PrivateKey, error) { - f, err := p.config.Open("key") + f, err := p.config.Open("ed25519.key") if err != nil { return nil, err } defer f.Close() - keyRaw := make([]byte, ed25519.PrivateKeySize) - n, err := f.Read(keyRaw) + keyRawBase64, err := io.ReadAll(f) if err != nil { return nil, err } - if n != ed25519.PrivateKeySize { - return nil, fmt.Errorf("key file is not the correct size: %d", n) + + keyRaw, err := base64.StdEncoding.DecodeString(string(keyRawBase64)) + if err != nil { + return nil, err + } + if len(keyRaw) != ed25519.PrivateKeySize { + return nil, fmt.Errorf("key file is not the correct size: %d", len(keyRaw)) } return ed25519.PrivateKey(keyRaw), nil