From 0c9a4a5e56230b4ad0d64f5b468d71be9a2291e0 Mon Sep 17 00:00:00 2001 From: paul cannon Date: Tue, 26 May 2020 17:25:20 -0500 Subject: [PATCH] satellite/gracefulexit: better validation error messages Change-Id: I14168dbeaf17302e5e853854956f8fbcb82a0900 --- satellite/gracefulexit/validation.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/satellite/gracefulexit/validation.go b/satellite/gracefulexit/validation.go index 8e149961e..a2d2d1a6a 100644 --- a/satellite/gracefulexit/validation.go +++ b/satellite/gracefulexit/validation.go @@ -57,31 +57,31 @@ func (endpoint *Endpoint) verifyPieceTransferred(ctx context.Context, message *p // verify that the satellite signed the original order limit err := signing.VerifyOrderLimitSignature(ctx, endpoint.signer, originalOrderLimit) if err != nil { - return ErrInvalidArgument.Wrap(err) + return ErrInvalidArgument.New("Could not validate signature from satellite on claimed original order limit: %v", err) } // verify that the public key on the order limit signed the original piece hash err = signing.VerifyUplinkPieceHashSignature(ctx, originalOrderLimit.UplinkPublicKey, originalPieceHash) if err != nil { - return ErrInvalidArgument.Wrap(err) + return ErrInvalidArgument.New("Could not validate signature from original order limit's public key on original piece hash: %v", err) } if originalOrderLimit.PieceId != message.Succeeded.OriginalPieceId { - return ErrInvalidArgument.New("Invalid original piece ID") + return ErrInvalidArgument.New("Original piece ID in piece-transfer success message does not match piece ID in original order limit") } receivingNodeID := transfer.SatelliteMessage.GetTransferPiece().GetAddressedOrderLimit().GetLimit().StorageNodeId calculatedNewPieceID := transfer.OriginalPointer.GetRemote().RootPieceId.Derive(receivingNodeID, transfer.PieceNum) if calculatedNewPieceID != replacementPieceHash.PieceId { - return ErrInvalidArgument.New("Invalid replacement piece ID") + return ErrInvalidArgument.New("Replacement piece ID does not match derived piece ID for receivingNodeID %s, PieceNum %d: %q != %q", receivingNodeID.String(), transfer.PieceNum, calculatedNewPieceID.String(), replacementPieceHash.PieceId.String()) } - signee := signing.SigneeFromPeerIdentity(receivingNodePeerID) + signer := signing.SigneeFromPeerIdentity(receivingNodePeerID) // verify that the new node signed the replacement piece hash - err = signing.VerifyPieceHashSignature(ctx, signee, replacementPieceHash) + err = signing.VerifyPieceHashSignature(ctx, signer, replacementPieceHash) if err != nil { - return ErrInvalidArgument.Wrap(err) + return ErrInvalidArgument.New("Could not validate signature from receiving node on replacement piece hash: %v", err) } return nil }