Made requested changes.

Signed-off-by: Cody Littley <[email protected]>

relay/auth/authenticator_test.go

@@ -62,8 +62,8 @@ func TestValidRequest(t *testing.T) {
 
 	request := randomGetChunksRequest()
 	request.OperatorId = operatorID[:]
-	SignGetChunksRequest(ics.KeyPairs[operatorID], request)
-	signature := request.OperatorSignature
+	signature := SignGetChunksRequest(ics.KeyPairs[operatorID], request)
+	request.OperatorSignature = signature
 
 	now := time.Now()
 
@@ -125,8 +125,8 @@ func TestAuthenticationSavingDisabled(t *testing.T) {
 
 	request := randomGetChunksRequest()
 	request.OperatorId = operatorID[:]
-	SignGetChunksRequest(ics.KeyPairs[operatorID], request)
-	signature := request.OperatorSignature
+	signature := SignGetChunksRequest(ics.KeyPairs[operatorID], request)
+	request.OperatorSignature = signature
 
 	now := time.Now()
 
@@ -199,7 +199,7 @@ func TestBadSignature(t *testing.T) {
 
 	request := randomGetChunksRequest()
 	request.OperatorId = operatorID[:]
-	SignGetChunksRequest(ics.KeyPairs[operatorID], request)
+	request.OperatorSignature = SignGetChunksRequest(ics.KeyPairs[operatorID], request)
 
 	now := time.Now()
 

relay/auth/request_signing.go

@@ -49,9 +49,10 @@ func HashGetChunksRequest(request *pb.GetChunksRequest) []byte {
 	return hasher.Sum(nil)
 }
 
-// SignGetChunksRequest signs the given GetChunksRequest with the given private key.
-func SignGetChunksRequest(keys *core.KeyPair, request *pb.GetChunksRequest) {
+// SignGetChunksRequest signs the given GetChunksRequest with the given private key. Does not
+// write the signature into the request.
+func SignGetChunksRequest(keys *core.KeyPair, request *pb.GetChunksRequest) []byte {
 	hash := HashGetChunksRequest(request)
 	signature := keys.SignMessage(([32]byte)(hash))
-	request.OperatorSignature = signature.G1Point.Serialize()
+	return signature.G1Point.Serialize()
 }

relay/server.go

@@ -228,13 +228,13 @@ func (s *Server) GetChunks(ctx context.Context, request *pb.GetChunksRequest) (*
 			"too many chunk requests provided, max is %d", s.config.MaxKeysPerGetChunksRequest)
 	}
 
-	client, ok := peer.FromContext(ctx)
-	if !ok {
-		return nil, errors.New("could not get peer information")
-	}
-	clientAddress := client.Addr.String()
-
 	if s.authenticator != nil {
+		client, ok := peer.FromContext(ctx)
+		if !ok {
+			return nil, errors.New("could not get peer information")
+		}
+		clientAddress := client.Addr.String()
+
 		err := s.authenticator.AuthenticateGetChunksRequest(clientAddress, request, time.Now())
 		if err != nil {
 			return nil, fmt.Errorf("auth failed: %w", err)