mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2024-11-26 00:01:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic error on context history visibility (#2211)

Browse source
This commit is contained in:
Neil Alexander 2022-02-21 16:38:53 +00:00 committed by GitHub
parent aa6bbf484a
commit bbe7d37928
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
syncapi/routing/context.go
View file

@ -64,7 +64,7 @@ func Context(
ctx := req.Context() ctx := req.Context()
membershipRes := roomserver.QueryMembershipForUserResponse{} membershipRes := roomserver.QueryMembershipForUserResponse{}
membershipReq := roomserver.QueryMembershipForUserRequest{UserID: device.UserID, RoomID: roomID} membershipReq := roomserver.QueryMembershipForUserRequest{UserID: device.UserID, RoomID: roomID}
if err := rsAPI.QueryMembershipForUser(ctx, &membershipReq, &membershipRes); err != nil { if err = rsAPI.QueryMembershipForUser(ctx, &membershipReq, &membershipRes); err != nil {
logrus.WithError(err).Error("unable to fo membership") logrus.WithError(err).Error("unable to fo membership")
return jsonerror.InternalServerError() return jsonerror.InternalServerError()
} }
@ -86,11 +86,12 @@ func Context(
state, _ := syncDB.CurrentState(ctx, roomID, &stateFilter, nil) state, _ := syncDB.CurrentState(ctx, roomID, &stateFilter, nil)
// verify the user is allowed to see the context for this room/event // verify the user is allowed to see the context for this room/event
for _, x := range state { for _, x := range state {
hisVis, err := x.HistoryVisibility() var hisVis string
hisVis, err = x.HistoryVisibility()
if err != nil { if err != nil {
continue continue
} }
allowed := hisVis != "world_readable" && membershipRes.Membership == "join" allowed := hisVis == gomatrixserverlib.WorldReadable || membershipRes.Membership == gomatrixserverlib.Join
if !allowed { if !allowed {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusForbidden, Code: http.StatusForbidden,