aboutsummaryrefslogtreecommitdiff
path: root/federationapi/routing/join.go
diff options
context:
space:
mode:
Diffstat (limited to 'federationapi/routing/join.go')
-rw-r--r--federationapi/routing/join.go12
1 files changed, 11 insertions, 1 deletions
diff --git a/federationapi/routing/join.go b/federationapi/routing/join.go
index 74d065e5..03809df7 100644
--- a/federationapi/routing/join.go
+++ b/federationapi/routing/join.go
@@ -131,10 +131,20 @@ func MakeJoin(
return jsonerror.InternalServerError()
}
+ identity, err := cfg.Matrix.SigningIdentityFor(request.Destination())
+ if err != nil {
+ return util.JSONResponse{
+ Code: http.StatusNotFound,
+ JSON: jsonerror.NotFound(
+ fmt.Sprintf("Server name %q does not exist", request.Destination()),
+ ),
+ }
+ }
+
queryRes := api.QueryLatestEventsAndStateResponse{
RoomVersion: verRes.RoomVersion,
}
- event, err := eventutil.QueryAndBuildEvent(httpReq.Context(), &builder, cfg.Matrix, time.Now(), rsAPI, &queryRes)
+ event, err := eventutil.QueryAndBuildEvent(httpReq.Context(), &builder, cfg.Matrix, identity, time.Now(), rsAPI, &queryRes)
if err == eventutil.ErrRoomNoExists {
return util.JSONResponse{
Code: http.StatusNotFound,