aboutsummaryrefslogtreecommitdiff
path: root/clientapi/routing/sendevent.go
diff options
context:
space:
mode:
authorDavid Spenler <15622190+DavidSpenler@users.noreply.github.com>2022-04-05 05:04:08 -0400
committerGitHub <noreply@github.com>2022-04-05 10:04:08 +0100
commit2defc4249d650f0bd43aa33b49b6b20032db43a4 (patch)
tree6bdcc3b02846de497efa5d723b99eb47dd463a33 /clientapi/routing/sendevent.go
parent562d7422405b180ef20555e61d0b3e4320d1577a (diff)
Added /upgrade endpoint (#2307)
* Added /upgrade endpoint * fix * Fix lints * More lint lifex * Move room upgrading to the roomserver * Remove extraneous arg * Fix HTTP API for `PerformUpgrade` * Reduce number of API calls in `generateInitialEvents`, preserve membership fields * Refactor `generateInitialEvents` to preserve old state events for all but the essential room setup events * Handle ban events in the state transfer * Refactor and comment `createTemporaryPowerLevels` * Only send two power levels if we needed to override the levels, preserve miscellaneous fields in the create event * Fix copyrights * Review comments @S7evinK * Update sytest whitelist * Specify empty state keys, use `EventLevel`, remove unnecessary check on state copy * Add comment to `restrictOldRoomPowerLevels` * Ensure canonical aliases exist before clearing * Copy invites as well as bans * Fix return error on `m.room.tombstone` handling in client API * Relax checks for well-formedness of join rules, membership event etc Co-authored-by: Alex Kursell <alex@awk.run> Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com> Co-authored-by: kegsay <kegan@matrix.org>
Diffstat (limited to 'clientapi/routing/sendevent.go')
-rw-r--r--clientapi/routing/sendevent.go19
1 files changed, 19 insertions, 0 deletions
diff --git a/clientapi/routing/sendevent.go b/clientapi/routing/sendevent.go
index 3d599371..c5884e80 100644
--- a/clientapi/routing/sendevent.go
+++ b/clientapi/routing/sendevent.go
@@ -272,5 +272,24 @@ func generateSendEvent(
JSON: jsonerror.Forbidden(err.Error()), // TODO: Is this error string comprehensible to the client?
}
}
+
+ // User should not be able to send a tombstone event to the same room.
+ if e.Type() == "m.room.tombstone" {
+ content := make(map[string]interface{})
+ if err = json.Unmarshal(e.Content(), &content); err != nil {
+ util.GetLogger(ctx).WithError(err).Error("Cannot unmarshal the event content.")
+ return nil, &util.JSONResponse{
+ Code: http.StatusBadRequest,
+ JSON: jsonerror.BadJSON("Cannot unmarshal the event content."),
+ }
+ }
+ if content["replacement_room"] == e.RoomID() {
+ return nil, &util.JSONResponse{
+ Code: http.StatusBadRequest,
+ JSON: jsonerror.InvalidParam("Cannot send tombstone event that points to the same room."),
+ }
+ }
+ }
+
return e.Event, nil
}