Remove PerformError from DownloadState

clientapi/routing/admin.go

@@ -230,20 +230,13 @@ func AdminDownloadState(req *http.Request, cfg *config.ClientAPI, device *api.De
 			JSON: jsonerror.MissingArgument("Expecting remote server name."),
 		}
 	}
-	res := &roomserverAPI.PerformAdminDownloadStateResponse{}
+	if err = rsAPI.PerformAdminDownloadState(req.Context(), roomID, device.UserID, spec.ServerName(serverName)); err != nil {
-	if err := rsAPI.PerformAdminDownloadState(
+		logrus.WithError(err).WithFields(logrus.Fields{
-		req.Context(),
+			"userID":     device.UserID,
-		&roomserverAPI.PerformAdminDownloadStateRequest{
+			"serverName": serverName,
-			UserID:     device.UserID,
+			"roomID":     roomID,
-			RoomID:     roomID,
+		}).Error("failed to download state")
-			ServerName: spec.ServerName(serverName),
+		return util.ErrorResponse(err)
-		},
-		res,
-	); err != nil {
-		return jsonerror.InternalAPIError(req.Context(), err)
-	}
-	if err := res.Error; err != nil {
-		return err.JSONResponse()
 	}
 	return util.JSONResponse{
 		Code: 200,

clientapi/routing/routing.go

@@ -168,7 +168,7 @@ func Setup(
 
 	dendriteAdminRouter.Handle("/admin/purgeRoom/{roomID}",
 		httputil.MakeAdminAPI("admin_purge_room", userAPI, func(req *http.Request, device *userapi.Device) util.JSONResponse {
-			return AdminPurgeRoom(req, cfg, device, rsAPI)
+			return AdminPurgeRoom(req, rsAPI)
 		}),
 	).Methods(http.MethodPost, http.MethodOptions)
 

roomserver/api/api.go

@@ -154,7 +154,7 @@ type ClientRoomserverAPI interface {
 	PerformAdminEvacuateRoom(ctx context.Context, roomID string) (affected []string, err error)
 	PerformAdminEvacuateUser(ctx context.Context, userID string) (affected []string, err error)
 	PerformAdminPurgeRoom(ctx context.Context, roomID string) error
-	PerformAdminDownloadState(ctx context.Context, req *PerformAdminDownloadStateRequest, res *PerformAdminDownloadStateResponse) error
+	PerformAdminDownloadState(ctx context.Context, roomID, userID string, serverName spec.ServerName) error
 	PerformPeek(ctx context.Context, req *PerformPeekRequest, res *PerformPeekResponse) error
 	PerformUnpeek(ctx context.Context, req *PerformUnpeekRequest, res *PerformUnpeekResponse) error
 	PerformInvite(ctx context.Context, req *PerformInviteRequest, res *PerformInviteResponse) error

roomserver/internal/perform/perform_admin.go

@@ -213,42 +213,25 @@ func (r *Admin) PerformAdminPurgeRoom(
 
 func (r *Admin) PerformAdminDownloadState(
 	ctx context.Context,
-	req *api.PerformAdminDownloadStateRequest,
+	roomID, userID string, serverName spec.ServerName,
-	res *api.PerformAdminDownloadStateResponse,
 ) error {
-	_, senderDomain, err := r.Cfg.Matrix.SplitLocalID('@', req.UserID)
+	_, senderDomain, err := r.Cfg.Matrix.SplitLocalID('@', userID)
 	if err != nil {
-		res.Error = &api.PerformError{
+		return err
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("r.Cfg.Matrix.SplitLocalID: %s", err),
-		}
-		return nil
 	}
 
-	roomInfo, err := r.DB.RoomInfo(ctx, req.RoomID)
+	roomInfo, err := r.DB.RoomInfo(ctx, roomID)
 	if err != nil {
-		res.Error = &api.PerformError{
+		return err
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("r.DB.RoomInfo: %s", err),
-		}
-		return nil
 	}
 
 	if roomInfo == nil || roomInfo.IsStub() {
-		res.Error = &api.PerformError{
+		return eventutil.ErrRoomNoExists
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("room %q not found", req.RoomID),
-		}
-		return nil
 	}
 
 	fwdExtremities, _, depth, err := r.DB.LatestEventIDs(ctx, roomInfo.RoomNID)
 	if err != nil {
-		res.Error = &api.PerformError{
+		return err
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("r.DB.LatestEventIDs: %s", err),
-		}
-		return nil
 	}
 
 	authEventMap := map[string]*gomatrixserverlib.Event{}
@@ -256,13 +239,9 @@ func (r *Admin) PerformAdminDownloadState(
 
 	for _, fwdExtremity := range fwdExtremities {
 		var state gomatrixserverlib.StateResponse
-		state, err = r.Inputer.FSAPI.LookupState(ctx, r.Inputer.ServerName, req.ServerName, req.RoomID, fwdExtremity.EventID, roomInfo.RoomVersion)
+		state, err = r.Inputer.FSAPI.LookupState(ctx, r.Inputer.ServerName, serverName, roomID, fwdExtremity.EventID, roomInfo.RoomVersion)
 		if err != nil {
-			res.Error = &api.PerformError{
+			return fmt.Errorf("r.Inputer.FSAPI.LookupState (%q): %s", fwdExtremity.EventID, err)
-				Code: api.PerformErrorBadRequest,
-				Msg:  fmt.Sprintf("r.Inputer.FSAPI.LookupState (%q): %s", fwdExtremity.EventID, err),
-			}
-			return nil
 		}
 		for _, authEvent := range state.GetAuthEvents().UntrustedEvents(roomInfo.RoomVersion) {
 			if err = authEvent.VerifyEventSignatures(ctx, r.Inputer.KeyRing); err != nil {
@@ -292,18 +271,14 @@ func (r *Admin) PerformAdminDownloadState(
 
 	builder := &gomatrixserverlib.EventBuilder{
 		Type:    "org.matrix.dendrite.state_download",
-		Sender:  req.UserID,
+		Sender:  userID,
-		RoomID:  req.RoomID,
+		RoomID:  roomID,
 		Content: spec.RawJSON("{}"),
 	}
 
 	eventsNeeded, err := gomatrixserverlib.StateNeededForEventBuilder(builder)
 	if err != nil {
-		res.Error = &api.PerformError{
+		return fmt.Errorf("gomatrixserverlib.StateNeededForEventBuilder: %w", err)
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("gomatrixserverlib.StateNeededForEventBuilder: %s", err),
-		}
-		return nil
 	}
 
 	queryRes := &api.QueryLatestEventsAndStateResponse{
@@ -321,11 +296,7 @@ func (r *Admin) PerformAdminDownloadState(
 
 	ev, err := eventutil.BuildEvent(ctx, builder, r.Cfg.Matrix, identity, time.Now(), &eventsNeeded, queryRes)
 	if err != nil {
-		res.Error = &api.PerformError{
+		return fmt.Errorf("eventutil.BuildEvent: %w", err)
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("eventutil.BuildEvent: %s", err),
-		}
-		return nil
 	}
 
 	inputReq := &api.InputRoomEventsRequest{
@@ -349,19 +320,12 @@ func (r *Admin) PerformAdminDownloadState(
 		SendAsServer:  string(r.Cfg.Matrix.ServerName),
 	})
 
-	if err := r.Inputer.InputRoomEvents(ctx, inputReq, inputRes); err != nil {
+	if err = r.Inputer.InputRoomEvents(ctx, inputReq, inputRes); err != nil {
-		res.Error = &api.PerformError{
+		return fmt.Errorf("r.Inputer.InputRoomEvents: %w", err)
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("r.Inputer.InputRoomEvents: %s", err),
-		}
-		return nil
 	}
 
 	if inputRes.ErrMsg != "" {
-		res.Error = &api.PerformError{
+		return inputRes.Err()
-			Code: api.PerformErrorBadRequest,
-			Msg:  inputRes.ErrMsg,
-		}
 	}
 
 	return nil