mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-26 00:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow peeks into encrypted rooms

Browse source
This commit is contained in:
Neil Alexander 2020-12-03 10:21:43 +00:00
parent 47808e83df
commit dafcd3110c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
roomserver/internal/perform/perform_peek.go
View file

@ -163,8 +163,7 @@ func (r *Peeker) performPeekRoomByID(
// XXX: we should probably factor out history_visibility checks into a common utility method somewhere // XXX: we should probably factor out history_visibility checks into a common utility method somewhere
// which handles the default value etc. // which handles the default value etc.
var worldReadable = false var worldReadable = false
ev, _ := r.DB.GetStateEvent(ctx, roomID, "m.room.history_visibility", "") if ev, _ := r.DB.GetStateEvent(ctx, roomID, "m.room.history_visibility", ""); ev != nil {
if ev != nil {
content := map[string]string{} content := map[string]string{}
if err = json.Unmarshal(ev.Content(), &content); err != nil { if err = json.Unmarshal(ev.Content(), &content); err != nil {
util.GetLogger(ctx).WithError(err).Error("json.Unmarshal for history visibility failed") util.GetLogger(ctx).WithError(err).Error("json.Unmarshal for history visibility failed")
@ -182,6 +181,13 @@ func (r *Peeker) performPeekRoomByID(
} }
} }
if ev, _ := r.DB.GetStateEvent(ctx, roomID, "m.room.encryption", ""); ev != nil {
return "", &api.PerformError{
Code: api.PerformErrorNotAllowed,
Msg: "Cannot peek into an encrypted room",
}
}
// TODO: handle federated peeks // TODO: handle federated peeks
err = r.Inputer.WriteOutputEvents(roomID, []api.OutputEvent{ err = r.Inputer.WriteOutputEvents(roomID, []api.OutputEvent{