hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 23:48:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Return 403s for now, might placate the tests

Browse source
This commit is contained in:
Neil Alexander 2021-11-09 16:16:04 +00:00
parent f21a585647
commit 5a270ba59f
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
federationapi/routing/join.go
View file

@ -204,13 +204,13 @@ func attemptMakeJoinForRestrictedMembership(
if powerLevelsEvent, err := provider.PowerLevels(); err != nil { if powerLevelsEvent, err := provider.PowerLevels(); err != nil {
logger.WithError(err).Error("Failed to get power levels from auth events") logger.WithError(err).Error("Failed to get power levels from auth events")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusForbidden, // TODO: StatusBadRequest
JSON: jsonerror.UnableToAuthoriseJoin("Room power levels do not exist"), JSON: jsonerror.UnableToAuthoriseJoin("Room power levels do not exist"),
} }
} else if err := json.Unmarshal(powerLevelsEvent.Content(), &powerLevels); err != nil { } else if err := json.Unmarshal(powerLevelsEvent.Content(), &powerLevels); err != nil {
logger.WithError(err).Error("Failed to unmarshal power levels") logger.WithError(err).Error("Failed to unmarshal power levels")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusForbidden, // TODO: StatusBadRequest
JSON: jsonerror.UnableToAuthoriseJoin("Failed to unmarshal room power levels"), JSON: jsonerror.UnableToAuthoriseJoin("Failed to unmarshal room power levels"),
} }
} }
@ -328,7 +328,7 @@ func attemptMakeJoinForRestrictedMembership(
// users had a suitable power level to invite other users, so we // users had a suitable power level to invite other users, so we
// don't have the ability to grant joins. // don't have the ability to grant joins.
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusForbidden, // TODO: StatusBadRequest
JSON: jsonerror.UnableToGrantJoin("None of the users from this homeserver have the power to invite"), JSON: jsonerror.UnableToGrantJoin("None of the users from this homeserver have the power to invite"),
} }
case ableToAuthoriseJoin && !foundUserInAnyRoom: case ableToAuthoriseJoin && !foundUserInAnyRoom:
@ -342,7 +342,7 @@ func attemptMakeJoinForRestrictedMembership(
// We don't seem to be joined to any of the allowed rooms, so we // We don't seem to be joined to any of the allowed rooms, so we
// can't even check if the join is supposed to be allowed or not. // can't even check if the join is supposed to be allowed or not.
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusForbidden, // TODO: StatusBadRequest
JSON: jsonerror.UnableToAuthoriseJoin("This homeserver isn't joined to any of the allowed rooms"), JSON: jsonerror.UnableToAuthoriseJoin("This homeserver isn't joined to any of the allowed rooms"),
} }
} }