From f5a84a1e30c0ef4805fdb309ee635826f8a5d0db Mon Sep 17 00:00:00 2001 From: Konstanty Karagiorgis Date: Wed, 12 Feb 2025 23:28:51 +0100 Subject: [PATCH] #90 Fixed error message for key mismatch --- pkg/pairing/server.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkg/pairing/server.go b/pkg/pairing/server.go index c786677..ecf2e84 100644 --- a/pkg/pairing/server.go +++ b/pkg/pairing/server.go @@ -1,7 +1,6 @@ package pairing import ( - "errors" "fmt" "github.com/glothriel/wormhole/pkg/wg" @@ -62,13 +61,11 @@ func (s *Server) Start() { // nolint: funlen, gocognit } } else { if existingPeer.PublicKey != request.Wireguard.PublicKey { - logrus.Errorf( - "attempted peering from peer `%s`: error, public key mismatch. "+ + + incomingRequest.Err <- NewClientError( + fmt.Errorf("attempted peering from peer `%s`: error, public key mismatch. "+ "There's existing peer `%s` with a different public key.", - request.Name, existingPeer.Name, - ) - incomingRequest.Err <- NewServerError( - errors.New("please see the server log for error details"), + request.Name, existingPeer.Name), ) continue }