Skip to content

Faster room joins: Add edge case tests for outgoing device list updates #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 29, 2022
Merged

Faster room joins: Add edge case tests for outgoing device list updates #474

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e99a022
Add missing `t.Helper()` marking to helper functions
Sep 23, 2022
e0dd523
Add comment to `createTestRoom`
Sep 23, 2022
fd921f2
Add `createJoin/LeaveEvent` helper functions
Sep 23, 2022
83ff595
Add `awaitPartialStateJoinCompletion` helper function
Sep 23, 2022
4eb69d6
Accept extra route handlers in `createTestServer`
Sep 23, 2022
c42f9c9
Add helpers for outgoing device list update tests
Sep 23, 2022
39394c7
Test happy cases for outgoing device list updates
Sep 23, 2022
e99b6c6
Add `SendJoinRequestsHandler` option to omit other servers in room
Sep 23, 2022
e2afad0
Test outgoing device lists when we incorrectly think a server is absent
Sep 23, 2022
61ffe04
fixup: note side effects of setupIncorrectlyAcceptedKick
Sep 28, 2022
6b4d088
Merge branch 'main' into squah/faster_room_joins_device_list_tracking…
squahtx Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions internal/federation/handle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,11 @@ func MakeRespMakeKnock(s *Server, room *ServerRoom, userID string) (resp gomatri
// expectPartialState should be true if we should expect the incoming send_join
// request to use the partial_state flag, per MSC3706. In that case, we reply
// with only the critical subset of the room state.
func SendJoinRequestsHandler(s *Server, w http.ResponseWriter, req *http.Request, expectPartialState bool) {
//
// omitServersInRoom should be false to respond to partial_state joins with the complete list of
// servers in the room. When omitServersInRoom is true, a misbehaving server is simulated and only
// the current server is returned to the joining server.
func SendJoinRequestsHandler(s *Server, w http.ResponseWriter, req *http.Request, expectPartialState bool, omitServersInRoom bool) {
fedReq, errResp := gomatrixserverlib.VerifyHTTPRequest(
req, time.Now(), gomatrixserverlib.ServerName(s.serverName), s.keyRing,
)
Expand Down Expand Up @@ -172,7 +176,10 @@ func SendJoinRequestsHandler(s *Server, w http.ResponseWriter, req *http.Request
authEvents := room.AuthChainForEvents(stateEvents)

// get servers in room *before* the join event
serversInRoom := room.ServersInRoom()
serversInRoom := []string{s.serverName}
if !omitServersInRoom {
serversInRoom = room.ServersInRoom()
}

// insert the join event into the room state
room.AddEvent(event)
Expand Down Expand Up @@ -205,7 +212,7 @@ func HandleMakeSendJoinRequests() func(*Server) {
})).Methods("GET")

s.mux.Handle("/_matrix/federation/v2/send_join/{roomID}/{eventID}", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
SendJoinRequestsHandler(s, w, req, false)
SendJoinRequestsHandler(s, w, req, false, false)
})).Methods("PUT")
}
}
Expand All @@ -218,7 +225,7 @@ func HandlePartialStateMakeSendJoinRequests() func(*Server) {
})).Methods("GET")

s.mux.Handle("/_matrix/federation/v2/send_join/{roomID}/{eventID}", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
SendJoinRequestsHandler(s, w, req, true)
SendJoinRequestsHandler(s, w, req, true, false)
})).Methods("PUT")
}
}
Expand Down
Loading