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

Add check on invited server

Browse source
This commit is contained in:
Brendan Abolivier 2017-09-13 13:12:38 +01:00
parent f83dadba58
commit fdd2b59433
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/github.com/matrix-org/dendrite/federationapi/writers/threepid.go
View file

@ -51,7 +51,10 @@ type invites struct {
Invites []invite `json:"invites"` Invites []invite `json:"invites"`
} }
var errNotInRoom = errors.New("the server isn't currently in the room") var (
errNotLocalUser = errors.New("the user is not from this server")
errNotInRoom = errors.New("the server isn't currently in the room")
)
// CreateInvitesFrom3PIDInvites implements POST /_matrix/federation/v1/3pid/onbind // CreateInvitesFrom3PIDInvites implements POST /_matrix/federation/v1/3pid/onbind
func CreateInvitesFrom3PIDInvites( func CreateInvitesFrom3PIDInvites(
@ -169,6 +172,15 @@ func createInviteFrom3PIDInvite(
inv invite, federation *gomatrixserverlib.FederationClient, inv invite, federation *gomatrixserverlib.FederationClient,
accountDB *accounts.Database, accountDB *accounts.Database,
) (*gomatrixserverlib.Event, error) { ) (*gomatrixserverlib.Event, error) {
localpart, server, err := gomatrixserverlib.SplitID('@', inv.MXID)
if err != nil {
return nil, err
}
if server != cfg.Matrix.ServerName {
return nil, errNotLocalUser
}
// Build the event // Build the event
builder := &gomatrixserverlib.EventBuilder{ builder := &gomatrixserverlib.EventBuilder{
Type: "m.room.member", Type: "m.room.member",
@ -177,11 +189,6 @@ func createInviteFrom3PIDInvite(
StateKey: &inv.MXID, StateKey: &inv.MXID,
} }
localpart, _, err := gomatrixserverlib.SplitID('@', *builder.StateKey)
if err != nil {
return nil, err
}
profile, err := accountDB.GetProfileByLocalpart(localpart) profile, err := accountDB.GetProfileByLocalpart(localpart)
if err != nil { if err != nil {
return nil, err return nil, err