GRPC: Make ra.FinalizeOrder a pass-through (letsencrypt#5549)

beautifulentropy · web-flow · commit 3480cc5ee9b5 · 2021-08-02T13:52:15.000-07:00
- Move `FinalizeOrder` logic from `grpc/ra-wrappers.go` to `ra` and `wfe` Fixes letsencrypt#5530
diff --git a/grpc/ra-wrappers.go b/grpc/ra-wrappers.go
@@ -75,14 +75,7 @@ func (ras *RegistrationAuthorityClientWrapper) NewOrder(ctx context.Context, req
 }
 
 func (ras *RegistrationAuthorityClientWrapper) FinalizeOrder(ctx context.Context, request *rapb.FinalizeOrderRequest) (*corepb.Order, error) {
-	resp, err := ras.inner.FinalizeOrder(ctx, request)
-	if err != nil {
-		return nil, err
-	}
-	if resp == nil || !orderValid(resp) {
-		return nil, errIncompleteResponse
-	}
-	return resp, nil
+	return ras.inner.FinalizeOrder(ctx, request)
 }
 
 // RegistrationAuthorityServerWrapper is the gRPC version of a core.RegistrationAuthority server
@@ -147,9 +140,5 @@ func (ras *RegistrationAuthorityServerWrapper) NewOrder(ctx context.Context, req
 }
 
 func (ras *RegistrationAuthorityServerWrapper) FinalizeOrder(ctx context.Context, request *rapb.FinalizeOrderRequest) (*corepb.Order, error) {
-	if request == nil || request.Order == nil || request.Csr == nil {
-		return nil, errIncompleteRequest
-	}
-
 	return ras.inner.FinalizeOrder(ctx, request)
 }
diff --git a/ra/ra.go b/ra/ra.go
@@ -980,6 +980,10 @@ func (ra *RegistrationAuthorityImpl) failOrder(
 // If successful the order will be returned in processing status for the client
 // to poll while awaiting finalization to occur.
 func (ra *RegistrationAuthorityImpl) FinalizeOrder(ctx context.Context, req *rapb.FinalizeOrderRequest) (*corepb.Order, error) {
+	if req == nil || req.Order == nil {
+		return nil, errIncompleteGRPCRequest
+	}
+
 	order := req.Order
 
 	if order.Status != string(core.StatusReady) {
diff --git a/wfe2/wfe.go b/wfe2/wfe.go
@@ -2275,6 +2275,11 @@ func (wfe *WebFrontEndImpl) FinalizeOrder(ctx context.Context, logEvent *web.Req
 		wfe.sendError(response, logEvent, web.ProblemDetailsForError(err, "Error finalizing order"), err)
 		return
 	}
+	if updatedOrder == nil || order.Id == 0 || order.Created == 0 || order.RegistrationID == 0 || order.Expires == 0 || len(order.Names) == 0 {
+		err = errors.New("Incomplete gRPC response message")
+		wfe.sendError(response, logEvent, web.ProblemDetailsForError(err, "Error validating order"), err)
+		return
+	}
 
 	orderURL := web.RelativeEndpoint(request,
 		fmt.Sprintf("%s%d/%d", orderPath, acct.ID, updatedOrder.Id))

Original file line number	Diff line number	Diff line change
`@@ -75,14 +75,7 @@ func (ras *RegistrationAuthorityClientWrapper) NewOrder(ctx context.Context, req`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`func (ras RegistrationAuthorityClientWrapper) FinalizeOrder(ctx context.Context, request rapb.FinalizeOrderRequest) (*corepb.Order, error) {`
`78`		`- resp, err := ras.inner.FinalizeOrder(ctx, request)`
`79`		`- if err != nil {`
`80`		`- return nil, err`
`81`		`- }`
`82`		`- if resp == nil \|\| !orderValid(resp) {`
`83`		`- return nil, errIncompleteResponse`
`84`		`- }`
`85`		`- return resp, nil`
	`78`	`+ return ras.inner.FinalizeOrder(ctx, request)`
`86`	`79`	`}`
`87`	`80`
`88`	`81`	`// RegistrationAuthorityServerWrapper is the gRPC version of a core.RegistrationAuthority server`
`@@ -147,9 +140,5 @@ func (ras *RegistrationAuthorityServerWrapper) NewOrder(ctx context.Context, req`
`147`	`140`	`}`
`148`	`141`
`149`	`142`	`func (ras RegistrationAuthorityServerWrapper) FinalizeOrder(ctx context.Context, request rapb.FinalizeOrderRequest) (*corepb.Order, error) {`
`150`		`- if request == nil \|\| request.Order == nil \|\| request.Csr == nil {`
`151`		`- return nil, errIncompleteRequest`
`152`		`- }`
`153`		`-`
`154`	`143`	`return ras.inner.FinalizeOrder(ctx, request)`
`155`	`144`	`}`