2017-11-29 10:38:56 +01:00
|
|
|
// Copyright 2017 New Vector Ltd
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package routing
|
|
|
|
|
|
|
|
import (
|
Federation for v3/v4 rooms (#954)
* Update gomatrixserverlib
* Default to room version 4
* Update gomatrixserverlib
* Limit prev_events and auth_events
* Fix auth_events, prev_events
* Fix linter issues
* Update gomatrixserverlib
* Fix getState
* Update sytest-whitelist
* Squashed commit of the following:
commit 067b87506357c996fd6ddb11271db9469ad4ce80
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri Apr 3 14:29:06 2020 +0100
Invites v2 endpoint (#952)
* Start converting v1 invite endpoint to v2
* Update gomatrixserverlib
* Early federationsender code for sending invites
* Sending invites sorta happens now
* Populate invite request with stripped state
* Remodel a bit, don't reflect received invites
* Handle invite_room_state
* Handle room versions a bit better
* Update gomatrixserverlib
* Tweak order in destinationQueue.next
* Revert check in processMessage
* Tweak federation sender destination queue code a bit
* Add comments
commit 955244c09298d0e6c870377dad3af2ffa1f5e578
Author: Ben B <benne@klimlive.de>
Date: Fri Apr 3 12:40:50 2020 +0200
use custom http client instead of the http DefaultClient (#823)
This commit replaces the default client from the http lib with a custom one.
The previously used default client doesn't come with a timeout. This could cause
unwanted locks.
That solution chosen here creates a http client in the base component dendrite
with a constant timeout of 30 seconds. If it should be necessary to overwrite
this, we could include the timeout in the dendrite configuration.
Here it would be a good idea to extend the type "Address" by a timeout and
create an http client for each service.
Closes #820
Signed-off-by: Benedikt Bongartz <benne@klimlive.de>
Co-authored-by: Kegsay <kegan@matrix.org>
* Update sytest-whitelist, sytest-blacklist
* Update go.mod/go.sum
* Add some error wrapping for debug
* Add a NOTSPEC to common/events.go
* Perform state resolution at send_join
* Set default room version to v2 again
* Tweak GetCapabilities
* Add comments to ResolveConflictsAdhoc
* Update sytest-blacklist
* go mod tidy
* Update sytest-whitelist, sytest-blacklist
* Update versions
* Updates from review comments
* Update sytest-blacklist, sytest-whitelist
* Check room versions compatible at make_join, add some comments, update gomatrixserverlib, other tweaks
* Set default room version back to v2
* Update gomatrixserverlib, sytest-whitelist
2020-04-09 16:46:06 +02:00
|
|
|
"fmt"
|
2017-11-29 10:38:56 +01:00
|
|
|
"net/http"
|
2020-05-12 17:24:28 +02:00
|
|
|
"sort"
|
2018-08-06 15:09:25 +02:00
|
|
|
"time"
|
2017-11-29 10:38:56 +01:00
|
|
|
|
|
|
|
"github.com/matrix-org/dendrite/clientapi/jsonerror"
|
2020-06-12 15:55:57 +02:00
|
|
|
"github.com/matrix-org/dendrite/internal/eventutil"
|
2017-11-29 10:38:56 +01:00
|
|
|
"github.com/matrix-org/dendrite/roomserver/api"
|
2020-12-02 18:41:00 +01:00
|
|
|
"github.com/matrix-org/dendrite/setup/config"
|
2017-11-29 10:38:56 +01:00
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
|
|
"github.com/matrix-org/util"
|
|
|
|
)
|
|
|
|
|
|
|
|
// MakeJoin implements the /make_join API
|
|
|
|
func MakeJoin(
|
|
|
|
httpReq *http.Request,
|
|
|
|
request *gomatrixserverlib.FederationRequest,
|
2020-08-10 15:18:04 +02:00
|
|
|
cfg *config.FederationAPI,
|
2020-05-01 11:48:17 +02:00
|
|
|
rsAPI api.RoomserverInternalAPI,
|
2017-11-29 10:38:56 +01:00
|
|
|
roomID, userID string,
|
Federation for v3/v4 rooms (#954)
* Update gomatrixserverlib
* Default to room version 4
* Update gomatrixserverlib
* Limit prev_events and auth_events
* Fix auth_events, prev_events
* Fix linter issues
* Update gomatrixserverlib
* Fix getState
* Update sytest-whitelist
* Squashed commit of the following:
commit 067b87506357c996fd6ddb11271db9469ad4ce80
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri Apr 3 14:29:06 2020 +0100
Invites v2 endpoint (#952)
* Start converting v1 invite endpoint to v2
* Update gomatrixserverlib
* Early federationsender code for sending invites
* Sending invites sorta happens now
* Populate invite request with stripped state
* Remodel a bit, don't reflect received invites
* Handle invite_room_state
* Handle room versions a bit better
* Update gomatrixserverlib
* Tweak order in destinationQueue.next
* Revert check in processMessage
* Tweak federation sender destination queue code a bit
* Add comments
commit 955244c09298d0e6c870377dad3af2ffa1f5e578
Author: Ben B <benne@klimlive.de>
Date: Fri Apr 3 12:40:50 2020 +0200
use custom http client instead of the http DefaultClient (#823)
This commit replaces the default client from the http lib with a custom one.
The previously used default client doesn't come with a timeout. This could cause
unwanted locks.
That solution chosen here creates a http client in the base component dendrite
with a constant timeout of 30 seconds. If it should be necessary to overwrite
this, we could include the timeout in the dendrite configuration.
Here it would be a good idea to extend the type "Address" by a timeout and
create an http client for each service.
Closes #820
Signed-off-by: Benedikt Bongartz <benne@klimlive.de>
Co-authored-by: Kegsay <kegan@matrix.org>
* Update sytest-whitelist, sytest-blacklist
* Update go.mod/go.sum
* Add some error wrapping for debug
* Add a NOTSPEC to common/events.go
* Perform state resolution at send_join
* Set default room version to v2 again
* Tweak GetCapabilities
* Add comments to ResolveConflictsAdhoc
* Update sytest-blacklist
* go mod tidy
* Update sytest-whitelist, sytest-blacklist
* Update versions
* Updates from review comments
* Update sytest-blacklist, sytest-whitelist
* Check room versions compatible at make_join, add some comments, update gomatrixserverlib, other tweaks
* Set default room version back to v2
* Update gomatrixserverlib, sytest-whitelist
2020-04-09 16:46:06 +02:00
|
|
|
remoteVersions []gomatrixserverlib.RoomVersion,
|
2017-11-29 10:38:56 +01:00
|
|
|
) util.JSONResponse {
|
2020-03-27 17:28:22 +01:00
|
|
|
verReq := api.QueryRoomVersionForRoomRequest{RoomID: roomID}
|
|
|
|
verRes := api.QueryRoomVersionForRoomResponse{}
|
2020-05-01 11:48:17 +02:00
|
|
|
if err := rsAPI.QueryRoomVersionForRoom(httpReq.Context(), &verReq, &verRes); err != nil {
|
2020-03-27 17:28:22 +01:00
|
|
|
return util.JSONResponse{
|
|
|
|
Code: http.StatusInternalServerError,
|
|
|
|
JSON: jsonerror.InternalServerError(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Federation for v3/v4 rooms (#954)
* Update gomatrixserverlib
* Default to room version 4
* Update gomatrixserverlib
* Limit prev_events and auth_events
* Fix auth_events, prev_events
* Fix linter issues
* Update gomatrixserverlib
* Fix getState
* Update sytest-whitelist
* Squashed commit of the following:
commit 067b87506357c996fd6ddb11271db9469ad4ce80
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri Apr 3 14:29:06 2020 +0100
Invites v2 endpoint (#952)
* Start converting v1 invite endpoint to v2
* Update gomatrixserverlib
* Early federationsender code for sending invites
* Sending invites sorta happens now
* Populate invite request with stripped state
* Remodel a bit, don't reflect received invites
* Handle invite_room_state
* Handle room versions a bit better
* Update gomatrixserverlib
* Tweak order in destinationQueue.next
* Revert check in processMessage
* Tweak federation sender destination queue code a bit
* Add comments
commit 955244c09298d0e6c870377dad3af2ffa1f5e578
Author: Ben B <benne@klimlive.de>
Date: Fri Apr 3 12:40:50 2020 +0200
use custom http client instead of the http DefaultClient (#823)
This commit replaces the default client from the http lib with a custom one.
The previously used default client doesn't come with a timeout. This could cause
unwanted locks.
That solution chosen here creates a http client in the base component dendrite
with a constant timeout of 30 seconds. If it should be necessary to overwrite
this, we could include the timeout in the dendrite configuration.
Here it would be a good idea to extend the type "Address" by a timeout and
create an http client for each service.
Closes #820
Signed-off-by: Benedikt Bongartz <benne@klimlive.de>
Co-authored-by: Kegsay <kegan@matrix.org>
* Update sytest-whitelist, sytest-blacklist
* Update go.mod/go.sum
* Add some error wrapping for debug
* Add a NOTSPEC to common/events.go
* Perform state resolution at send_join
* Set default room version to v2 again
* Tweak GetCapabilities
* Add comments to ResolveConflictsAdhoc
* Update sytest-blacklist
* go mod tidy
* Update sytest-whitelist, sytest-blacklist
* Update versions
* Updates from review comments
* Update sytest-blacklist, sytest-whitelist
* Check room versions compatible at make_join, add some comments, update gomatrixserverlib, other tweaks
* Set default room version back to v2
* Update gomatrixserverlib, sytest-whitelist
2020-04-09 16:46:06 +02:00
|
|
|
// Check that the room that the remote side is trying to join is actually
|
|
|
|
// one of the room versions that they listed in their supported ?ver= in
|
|
|
|
// the make_join URL.
|
|
|
|
// https://matrix.org/docs/spec/server_server/r0.1.3#get-matrix-federation-v1-make-join-roomid-userid
|
|
|
|
remoteSupportsVersion := false
|
|
|
|
for _, v := range remoteVersions {
|
|
|
|
if v == verRes.RoomVersion {
|
|
|
|
remoteSupportsVersion = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// If it isn't, stop trying to join the room.
|
|
|
|
if !remoteSupportsVersion {
|
|
|
|
return util.JSONResponse{
|
|
|
|
Code: http.StatusBadRequest,
|
2020-05-04 14:53:47 +02:00
|
|
|
JSON: jsonerror.IncompatibleRoomVersion(verRes.RoomVersion),
|
Federation for v3/v4 rooms (#954)
* Update gomatrixserverlib
* Default to room version 4
* Update gomatrixserverlib
* Limit prev_events and auth_events
* Fix auth_events, prev_events
* Fix linter issues
* Update gomatrixserverlib
* Fix getState
* Update sytest-whitelist
* Squashed commit of the following:
commit 067b87506357c996fd6ddb11271db9469ad4ce80
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri Apr 3 14:29:06 2020 +0100
Invites v2 endpoint (#952)
* Start converting v1 invite endpoint to v2
* Update gomatrixserverlib
* Early federationsender code for sending invites
* Sending invites sorta happens now
* Populate invite request with stripped state
* Remodel a bit, don't reflect received invites
* Handle invite_room_state
* Handle room versions a bit better
* Update gomatrixserverlib
* Tweak order in destinationQueue.next
* Revert check in processMessage
* Tweak federation sender destination queue code a bit
* Add comments
commit 955244c09298d0e6c870377dad3af2ffa1f5e578
Author: Ben B <benne@klimlive.de>
Date: Fri Apr 3 12:40:50 2020 +0200
use custom http client instead of the http DefaultClient (#823)
This commit replaces the default client from the http lib with a custom one.
The previously used default client doesn't come with a timeout. This could cause
unwanted locks.
That solution chosen here creates a http client in the base component dendrite
with a constant timeout of 30 seconds. If it should be necessary to overwrite
this, we could include the timeout in the dendrite configuration.
Here it would be a good idea to extend the type "Address" by a timeout and
create an http client for each service.
Closes #820
Signed-off-by: Benedikt Bongartz <benne@klimlive.de>
Co-authored-by: Kegsay <kegan@matrix.org>
* Update sytest-whitelist, sytest-blacklist
* Update go.mod/go.sum
* Add some error wrapping for debug
* Add a NOTSPEC to common/events.go
* Perform state resolution at send_join
* Set default room version to v2 again
* Tweak GetCapabilities
* Add comments to ResolveConflictsAdhoc
* Update sytest-blacklist
* go mod tidy
* Update sytest-whitelist, sytest-blacklist
* Update versions
* Updates from review comments
* Update sytest-blacklist, sytest-whitelist
* Check room versions compatible at make_join, add some comments, update gomatrixserverlib, other tweaks
* Set default room version back to v2
* Update gomatrixserverlib, sytest-whitelist
2020-04-09 16:46:06 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-29 10:38:56 +01:00
|
|
|
_, domain, err := gomatrixserverlib.SplitID('@', userID)
|
|
|
|
if err != nil {
|
|
|
|
return util.JSONResponse{
|
2018-03-13 16:55:45 +01:00
|
|
|
Code: http.StatusBadRequest,
|
2017-11-29 10:38:56 +01:00
|
|
|
JSON: jsonerror.BadJSON("Invalid UserID"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if domain != request.Origin() {
|
|
|
|
return util.JSONResponse{
|
2018-03-13 16:55:45 +01:00
|
|
|
Code: http.StatusForbidden,
|
2017-11-29 10:38:56 +01:00
|
|
|
JSON: jsonerror.Forbidden("The join must be sent by the server of the user"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-24 17:18:13 +02:00
|
|
|
// Check if we think we are still joined to the room
|
|
|
|
inRoomReq := &api.QueryServerJoinedToRoomRequest{
|
|
|
|
ServerName: cfg.Matrix.ServerName,
|
|
|
|
RoomID: roomID,
|
|
|
|
}
|
|
|
|
inRoomRes := &api.QueryServerJoinedToRoomResponse{}
|
|
|
|
if err = rsAPI.QueryServerJoinedToRoom(httpReq.Context(), inRoomReq, inRoomRes); err != nil {
|
|
|
|
util.GetLogger(httpReq.Context()).WithError(err).Error("rsAPI.QueryServerJoinedToRoom failed")
|
|
|
|
return jsonerror.InternalServerError()
|
|
|
|
}
|
|
|
|
if !inRoomRes.RoomExists {
|
|
|
|
return util.JSONResponse{
|
|
|
|
Code: http.StatusNotFound,
|
|
|
|
JSON: jsonerror.NotFound(fmt.Sprintf("Room ID %q was not found on this server", roomID)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !inRoomRes.IsInRoom {
|
|
|
|
return util.JSONResponse{
|
|
|
|
Code: http.StatusNotFound,
|
|
|
|
JSON: jsonerror.NotFound(fmt.Sprintf("Room ID %q has no remaining users on this server", roomID)),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-29 10:38:56 +01:00
|
|
|
// Try building an event for the server
|
|
|
|
builder := gomatrixserverlib.EventBuilder{
|
|
|
|
Sender: userID,
|
|
|
|
RoomID: roomID,
|
|
|
|
Type: "m.room.member",
|
|
|
|
StateKey: &userID,
|
|
|
|
}
|
2019-08-06 16:07:36 +02:00
|
|
|
err = builder.SetContent(map[string]interface{}{"membership": gomatrixserverlib.Join})
|
2017-11-29 10:38:56 +01:00
|
|
|
if err != nil {
|
2020-03-02 17:20:44 +01:00
|
|
|
util.GetLogger(httpReq.Context()).WithError(err).Error("builder.SetContent failed")
|
|
|
|
return jsonerror.InternalServerError()
|
2017-11-29 10:38:56 +01:00
|
|
|
}
|
|
|
|
|
2020-03-27 17:28:22 +01:00
|
|
|
queryRes := api.QueryLatestEventsAndStateResponse{
|
|
|
|
RoomVersion: verRes.RoomVersion,
|
|
|
|
}
|
2020-09-02 18:13:15 +02:00
|
|
|
event, err := eventutil.QueryAndBuildEvent(httpReq.Context(), &builder, cfg.Matrix, time.Now(), rsAPI, &queryRes)
|
2020-06-12 15:55:57 +02:00
|
|
|
if err == eventutil.ErrRoomNoExists {
|
2017-11-29 10:38:56 +01:00
|
|
|
return util.JSONResponse{
|
2018-03-13 16:55:45 +01:00
|
|
|
Code: http.StatusNotFound,
|
2017-11-29 10:38:56 +01:00
|
|
|
JSON: jsonerror.NotFound("Room does not exist"),
|
|
|
|
}
|
2020-06-04 11:53:39 +02:00
|
|
|
} else if e, ok := err.(gomatrixserverlib.BadJSONError); ok {
|
|
|
|
return util.JSONResponse{
|
|
|
|
Code: http.StatusBadRequest,
|
|
|
|
JSON: jsonerror.BadJSON(e.Error()),
|
|
|
|
}
|
2017-11-29 10:38:56 +01:00
|
|
|
} else if err != nil {
|
2020-06-12 15:55:57 +02:00
|
|
|
util.GetLogger(httpReq.Context()).WithError(err).Error("eventutil.BuildEvent failed")
|
2020-03-02 17:20:44 +01:00
|
|
|
return jsonerror.InternalServerError()
|
2017-11-29 10:38:56 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Check that the join is allowed or not
|
|
|
|
stateEvents := make([]*gomatrixserverlib.Event, len(queryRes.StateEvents))
|
|
|
|
for i := range queryRes.StateEvents {
|
2020-11-16 16:44:53 +01:00
|
|
|
stateEvents[i] = queryRes.StateEvents[i].Event
|
2017-11-29 10:38:56 +01:00
|
|
|
}
|
2020-03-27 17:28:22 +01:00
|
|
|
|
2017-11-29 10:38:56 +01:00
|
|
|
provider := gomatrixserverlib.NewAuthEvents(stateEvents)
|
2020-07-03 18:24:51 +02:00
|
|
|
if err = gomatrixserverlib.Allowed(event.Event, &provider); err != nil {
|
2017-11-29 10:38:56 +01:00
|
|
|
return util.JSONResponse{
|
2018-03-13 16:55:45 +01:00
|
|
|
Code: http.StatusForbidden,
|
2017-11-29 10:38:56 +01:00
|
|
|
JSON: jsonerror.Forbidden(err.Error()),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return util.JSONResponse{
|
2018-03-13 16:55:45 +01:00
|
|
|
Code: http.StatusOK,
|
2020-03-27 17:28:22 +01:00
|
|
|
JSON: map[string]interface{}{
|
|
|
|
"event": builder,
|
|
|
|
"room_version": verRes.RoomVersion,
|
|
|
|
},
|
2017-11-29 10:38:56 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// SendJoin implements the /send_join API
|
2020-05-04 14:53:47 +02:00
|
|
|
// The make-join send-join dance makes much more sense as a single
|
|
|
|
// flow so the cyclomatic complexity is high:
|
2017-11-29 10:38:56 +01:00
|
|
|
func SendJoin(
|
|
|
|
httpReq *http.Request,
|
|
|
|
request *gomatrixserverlib.FederationRequest,
|
2020-08-10 15:18:04 +02:00
|
|
|
cfg *config.FederationAPI,
|
2020-05-01 11:48:17 +02:00
|
|
|
rsAPI api.RoomserverInternalAPI,
|
2020-06-15 17:57:59 +02:00
|
|
|
keys gomatrixserverlib.JSONVerifier,
|
2017-11-29 10:38:56 +01:00
|
|
|
roomID, eventID string,
|
|
|
|
) util.JSONResponse {
|
2020-03-27 17:28:22 +01:00
|
|
|
verReq := api.QueryRoomVersionForRoomRequest{RoomID: roomID}
|
|
|
|
verRes := api.QueryRoomVersionForRoomResponse{}
|
2020-05-01 11:48:17 +02:00
|
|
|
if err := rsAPI.QueryRoomVersionForRoom(httpReq.Context(), &verReq, &verRes); err != nil {
|
|
|
|
util.GetLogger(httpReq.Context()).WithError(err).Error("rsAPI.QueryRoomVersionForRoom failed")
|
2020-03-27 17:28:22 +01:00
|
|
|
return util.JSONResponse{
|
|
|
|
Code: http.StatusInternalServerError,
|
|
|
|
JSON: jsonerror.InternalServerError(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
event, err := gomatrixserverlib.NewEventFromUntrustedJSON(request.Content(), verRes.RoomVersion)
|
|
|
|
if err != nil {
|
2017-11-29 10:38:56 +01:00
|
|
|
return util.JSONResponse{
|
2018-03-13 16:55:45 +01:00
|
|
|
Code: http.StatusBadRequest,
|
2020-06-04 11:53:39 +02:00
|
|
|
JSON: jsonerror.BadJSON("The request body could not be decoded into valid JSON: " + err.Error()),
|
2017-11-29 10:38:56 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-04 14:53:47 +02:00
|
|
|
// Check that a state key is provided.
|
2020-08-25 22:04:35 +02:00
|
|
|
if event.StateKey() == nil || event.StateKeyEquals("") {
|
2020-05-04 14:53:47 +02:00
|
|
|
return util.JSONResponse{
|
|
|
|
Code: http.StatusBadRequest,
|
2020-10-01 21:00:56 +02:00
|
|
|
JSON: jsonerror.BadJSON("No state key was provided in the join event."),
|
2020-05-04 14:53:47 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-29 10:38:56 +01:00
|
|
|
// Check that the room ID is correct.
|
|
|
|
if event.RoomID() != roomID {
|
|
|
|
return util.JSONResponse{
|
2018-03-13 16:55:45 +01:00
|
|
|
Code: http.StatusBadRequest,
|
Federation for v3/v4 rooms (#954)
* Update gomatrixserverlib
* Default to room version 4
* Update gomatrixserverlib
* Limit prev_events and auth_events
* Fix auth_events, prev_events
* Fix linter issues
* Update gomatrixserverlib
* Fix getState
* Update sytest-whitelist
* Squashed commit of the following:
commit 067b87506357c996fd6ddb11271db9469ad4ce80
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri Apr 3 14:29:06 2020 +0100
Invites v2 endpoint (#952)
* Start converting v1 invite endpoint to v2
* Update gomatrixserverlib
* Early federationsender code for sending invites
* Sending invites sorta happens now
* Populate invite request with stripped state
* Remodel a bit, don't reflect received invites
* Handle invite_room_state
* Handle room versions a bit better
* Update gomatrixserverlib
* Tweak order in destinationQueue.next
* Revert check in processMessage
* Tweak federation sender destination queue code a bit
* Add comments
commit 955244c09298d0e6c870377dad3af2ffa1f5e578
Author: Ben B <benne@klimlive.de>
Date: Fri Apr 3 12:40:50 2020 +0200
use custom http client instead of the http DefaultClient (#823)
This commit replaces the default client from the http lib with a custom one.
The previously used default client doesn't come with a timeout. This could cause
unwanted locks.
That solution chosen here creates a http client in the base component dendrite
with a constant timeout of 30 seconds. If it should be necessary to overwrite
this, we could include the timeout in the dendrite configuration.
Here it would be a good idea to extend the type "Address" by a timeout and
create an http client for each service.
Closes #820
Signed-off-by: Benedikt Bongartz <benne@klimlive.de>
Co-authored-by: Kegsay <kegan@matrix.org>
* Update sytest-whitelist, sytest-blacklist
* Update go.mod/go.sum
* Add some error wrapping for debug
* Add a NOTSPEC to common/events.go
* Perform state resolution at send_join
* Set default room version to v2 again
* Tweak GetCapabilities
* Add comments to ResolveConflictsAdhoc
* Update sytest-blacklist
* go mod tidy
* Update sytest-whitelist, sytest-blacklist
* Update versions
* Updates from review comments
* Update sytest-blacklist, sytest-whitelist
* Check room versions compatible at make_join, add some comments, update gomatrixserverlib, other tweaks
* Set default room version back to v2
* Update gomatrixserverlib, sytest-whitelist
2020-04-09 16:46:06 +02:00
|
|
|
JSON: jsonerror.BadJSON(
|
|
|
|
fmt.Sprintf(
|
|
|
|
"The room ID in the request path (%q) must match the room ID in the join event JSON (%q)",
|
|
|
|
roomID, event.RoomID(),
|
|
|
|
),
|
|
|
|
),
|
2017-11-29 10:38:56 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that the event ID is correct.
|
|
|
|
if event.EventID() != eventID {
|
|
|
|
return util.JSONResponse{
|
2018-03-13 16:55:45 +01:00
|
|
|
Code: http.StatusBadRequest,
|
Federation for v3/v4 rooms (#954)
* Update gomatrixserverlib
* Default to room version 4
* Update gomatrixserverlib
* Limit prev_events and auth_events
* Fix auth_events, prev_events
* Fix linter issues
* Update gomatrixserverlib
* Fix getState
* Update sytest-whitelist
* Squashed commit of the following:
commit 067b87506357c996fd6ddb11271db9469ad4ce80
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri Apr 3 14:29:06 2020 +0100
Invites v2 endpoint (#952)
* Start converting v1 invite endpoint to v2
* Update gomatrixserverlib
* Early federationsender code for sending invites
* Sending invites sorta happens now
* Populate invite request with stripped state
* Remodel a bit, don't reflect received invites
* Handle invite_room_state
* Handle room versions a bit better
* Update gomatrixserverlib
* Tweak order in destinationQueue.next
* Revert check in processMessage
* Tweak federation sender destination queue code a bit
* Add comments
commit 955244c09298d0e6c870377dad3af2ffa1f5e578
Author: Ben B <benne@klimlive.de>
Date: Fri Apr 3 12:40:50 2020 +0200
use custom http client instead of the http DefaultClient (#823)
This commit replaces the default client from the http lib with a custom one.
The previously used default client doesn't come with a timeout. This could cause
unwanted locks.
That solution chosen here creates a http client in the base component dendrite
with a constant timeout of 30 seconds. If it should be necessary to overwrite
this, we could include the timeout in the dendrite configuration.
Here it would be a good idea to extend the type "Address" by a timeout and
create an http client for each service.
Closes #820
Signed-off-by: Benedikt Bongartz <benne@klimlive.de>
Co-authored-by: Kegsay <kegan@matrix.org>
* Update sytest-whitelist, sytest-blacklist
* Update go.mod/go.sum
* Add some error wrapping for debug
* Add a NOTSPEC to common/events.go
* Perform state resolution at send_join
* Set default room version to v2 again
* Tweak GetCapabilities
* Add comments to ResolveConflictsAdhoc
* Update sytest-blacklist
* go mod tidy
* Update sytest-whitelist, sytest-blacklist
* Update versions
* Updates from review comments
* Update sytest-blacklist, sytest-whitelist
* Check room versions compatible at make_join, add some comments, update gomatrixserverlib, other tweaks
* Set default room version back to v2
* Update gomatrixserverlib, sytest-whitelist
2020-04-09 16:46:06 +02:00
|
|
|
JSON: jsonerror.BadJSON(
|
|
|
|
fmt.Sprintf(
|
|
|
|
"The event ID in the request path (%q) must match the event ID in the join event JSON (%q)",
|
|
|
|
eventID, event.EventID(),
|
|
|
|
),
|
|
|
|
),
|
2017-11-29 10:38:56 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that the event is from the server sending the request.
|
|
|
|
if event.Origin() != request.Origin() {
|
|
|
|
return util.JSONResponse{
|
2018-03-13 16:55:45 +01:00
|
|
|
Code: http.StatusForbidden,
|
2017-11-29 10:38:56 +01:00
|
|
|
JSON: jsonerror.Forbidden("The join must be sent by the server it originated on"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check that the event is signed by the server sending the request.
|
2020-03-27 17:28:22 +01:00
|
|
|
redacted := event.Redact()
|
2017-11-29 10:38:56 +01:00
|
|
|
verifyRequests := []gomatrixserverlib.VerifyJSONRequest{{
|
2020-04-20 18:42:34 +02:00
|
|
|
ServerName: event.Origin(),
|
|
|
|
Message: redacted.JSON(),
|
|
|
|
AtTS: event.OriginServerTS(),
|
|
|
|
StrictValidityChecking: true,
|
2017-11-29 10:38:56 +01:00
|
|
|
}}
|
2018-08-06 15:07:29 +02:00
|
|
|
verifyResults, err := keys.VerifyJSONs(httpReq.Context(), verifyRequests)
|
2017-11-29 10:38:56 +01:00
|
|
|
if err != nil {
|
2020-03-02 17:20:44 +01:00
|
|
|
util.GetLogger(httpReq.Context()).WithError(err).Error("keys.VerifyJSONs failed")
|
|
|
|
return jsonerror.InternalServerError()
|
2017-11-29 10:38:56 +01:00
|
|
|
}
|
|
|
|
if verifyResults[0].Error != nil {
|
|
|
|
return util.JSONResponse{
|
2018-03-13 16:55:45 +01:00
|
|
|
Code: http.StatusForbidden,
|
2020-03-27 17:28:22 +01:00
|
|
|
JSON: jsonerror.Forbidden("Signature check failed: " + verifyResults[0].Error.Error()),
|
2017-11-29 10:38:56 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Fetch the state and auth chain. We do this before we send the events
|
|
|
|
// on, in case this fails.
|
2019-12-20 15:42:57 +01:00
|
|
|
var stateAndAuthChainResponse api.QueryStateAndAuthChainResponse
|
2020-05-01 11:48:17 +02:00
|
|
|
err = rsAPI.QueryStateAndAuthChain(httpReq.Context(), &api.QueryStateAndAuthChainRequest{
|
2017-11-29 10:38:56 +01:00
|
|
|
PrevEventIDs: event.PrevEventIDs(),
|
|
|
|
AuthEventIDs: event.AuthEventIDs(),
|
|
|
|
RoomID: roomID,
|
Federation for v3/v4 rooms (#954)
* Update gomatrixserverlib
* Default to room version 4
* Update gomatrixserverlib
* Limit prev_events and auth_events
* Fix auth_events, prev_events
* Fix linter issues
* Update gomatrixserverlib
* Fix getState
* Update sytest-whitelist
* Squashed commit of the following:
commit 067b87506357c996fd6ddb11271db9469ad4ce80
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Fri Apr 3 14:29:06 2020 +0100
Invites v2 endpoint (#952)
* Start converting v1 invite endpoint to v2
* Update gomatrixserverlib
* Early federationsender code for sending invites
* Sending invites sorta happens now
* Populate invite request with stripped state
* Remodel a bit, don't reflect received invites
* Handle invite_room_state
* Handle room versions a bit better
* Update gomatrixserverlib
* Tweak order in destinationQueue.next
* Revert check in processMessage
* Tweak federation sender destination queue code a bit
* Add comments
commit 955244c09298d0e6c870377dad3af2ffa1f5e578
Author: Ben B <benne@klimlive.de>
Date: Fri Apr 3 12:40:50 2020 +0200
use custom http client instead of the http DefaultClient (#823)
This commit replaces the default client from the http lib with a custom one.
The previously used default client doesn't come with a timeout. This could cause
unwanted locks.
That solution chosen here creates a http client in the base component dendrite
with a constant timeout of 30 seconds. If it should be necessary to overwrite
this, we could include the timeout in the dendrite configuration.
Here it would be a good idea to extend the type "Address" by a timeout and
create an http client for each service.
Closes #820
Signed-off-by: Benedikt Bongartz <benne@klimlive.de>
Co-authored-by: Kegsay <kegan@matrix.org>
* Update sytest-whitelist, sytest-blacklist
* Update go.mod/go.sum
* Add some error wrapping for debug
* Add a NOTSPEC to common/events.go
* Perform state resolution at send_join
* Set default room version to v2 again
* Tweak GetCapabilities
* Add comments to ResolveConflictsAdhoc
* Update sytest-blacklist
* go mod tidy
* Update sytest-whitelist, sytest-blacklist
* Update versions
* Updates from review comments
* Update sytest-blacklist, sytest-whitelist
* Check room versions compatible at make_join, add some comments, update gomatrixserverlib, other tweaks
* Set default room version back to v2
* Update gomatrixserverlib, sytest-whitelist
2020-04-09 16:46:06 +02:00
|
|
|
ResolveState: true,
|
2019-12-20 15:42:57 +01:00
|
|
|
}, &stateAndAuthChainResponse)
|
2017-11-29 10:38:56 +01:00
|
|
|
if err != nil {
|
2020-05-01 11:48:17 +02:00
|
|
|
util.GetLogger(httpReq.Context()).WithError(err).Error("rsAPI.QueryStateAndAuthChain failed")
|
2020-03-02 17:20:44 +01:00
|
|
|
return jsonerror.InternalServerError()
|
2017-11-29 10:38:56 +01:00
|
|
|
}
|
|
|
|
|
2019-12-20 15:42:57 +01:00
|
|
|
if !stateAndAuthChainResponse.RoomExists {
|
|
|
|
return util.JSONResponse{
|
|
|
|
Code: http.StatusNotFound,
|
|
|
|
JSON: jsonerror.NotFound("Room does not exist"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-04 14:53:47 +02:00
|
|
|
// Check if the user is already in the room. If they're already in then
|
|
|
|
// there isn't much point in sending another join event into the room.
|
|
|
|
alreadyJoined := false
|
|
|
|
for _, se := range stateAndAuthChainResponse.StateEvents {
|
2020-08-25 22:04:35 +02:00
|
|
|
if !se.StateKeyEquals(*event.StateKey()) {
|
|
|
|
continue
|
|
|
|
}
|
2020-05-04 14:53:47 +02:00
|
|
|
if membership, merr := se.Membership(); merr == nil {
|
2020-08-25 22:04:35 +02:00
|
|
|
alreadyJoined = (membership == gomatrixserverlib.Join)
|
|
|
|
break
|
2020-05-04 14:53:47 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-11-29 10:38:56 +01:00
|
|
|
// Send the events to the room server.
|
|
|
|
// We are responsible for notifying other servers that the user has joined
|
|
|
|
// the room, so set SendAsServer to cfg.Matrix.ServerName
|
2020-05-04 14:53:47 +02:00
|
|
|
if !alreadyJoined {
|
2020-09-03 16:22:16 +02:00
|
|
|
if err = api.SendEvents(
|
2020-06-10 13:17:54 +02:00
|
|
|
httpReq.Context(), rsAPI,
|
2020-10-19 15:59:13 +02:00
|
|
|
api.KindNew,
|
2020-11-16 16:44:53 +01:00
|
|
|
[]*gomatrixserverlib.HeaderedEvent{
|
2020-05-04 14:53:47 +02:00
|
|
|
event.Headered(stateAndAuthChainResponse.RoomVersion),
|
|
|
|
},
|
|
|
|
cfg.Matrix.ServerName,
|
|
|
|
nil,
|
2020-09-03 16:22:16 +02:00
|
|
|
); err != nil {
|
2020-06-10 13:17:54 +02:00
|
|
|
util.GetLogger(httpReq.Context()).WithError(err).Error("SendEvents failed")
|
2020-05-04 14:53:47 +02:00
|
|
|
return jsonerror.InternalServerError()
|
|
|
|
}
|
2017-11-29 10:38:56 +01:00
|
|
|
}
|
|
|
|
|
2020-05-12 17:24:28 +02:00
|
|
|
// sort events deterministically by depth (lower is earlier)
|
|
|
|
// We also do this because sytest's basic federation server isn't good at using the correct
|
|
|
|
// state if these lists are randomised, resulting in flakey tests. :(
|
|
|
|
sort.Sort(eventsByDepth(stateAndAuthChainResponse.StateEvents))
|
|
|
|
sort.Sort(eventsByDepth(stateAndAuthChainResponse.AuthChainEvents))
|
|
|
|
|
2020-05-05 11:53:38 +02:00
|
|
|
// https://matrix.org/docs/spec/server_server/latest#put-matrix-federation-v1-send-join-roomid-eventid
|
2017-11-29 10:38:56 +01:00
|
|
|
return util.JSONResponse{
|
2018-03-13 16:55:45 +01:00
|
|
|
Code: http.StatusOK,
|
2020-04-22 15:13:11 +02:00
|
|
|
JSON: gomatrixserverlib.RespSendJoin{
|
2020-05-05 11:53:38 +02:00
|
|
|
StateEvents: gomatrixserverlib.UnwrapEventHeaders(stateAndAuthChainResponse.StateEvents),
|
|
|
|
AuthEvents: gomatrixserverlib.UnwrapEventHeaders(stateAndAuthChainResponse.AuthChainEvents),
|
|
|
|
Origin: cfg.Matrix.ServerName,
|
2017-11-29 10:38:56 +01:00
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
2020-05-12 17:24:28 +02:00
|
|
|
|
2020-11-16 16:44:53 +01:00
|
|
|
type eventsByDepth []*gomatrixserverlib.HeaderedEvent
|
2020-05-12 17:24:28 +02:00
|
|
|
|
|
|
|
func (e eventsByDepth) Len() int {
|
|
|
|
return len(e)
|
|
|
|
}
|
|
|
|
func (e eventsByDepth) Swap(i, j int) {
|
|
|
|
e[i], e[j] = e[j], e[i]
|
|
|
|
}
|
|
|
|
func (e eventsByDepth) Less(i, j int) bool {
|
|
|
|
return e[i].Depth() < e[j].Depth()
|
|
|
|
}
|