mirror of
https://github.com/1f349/dendrite.git
synced 2024-11-10 06:53:00 +00:00
05e1ae8745
* Room version 2 by default, other wiring updates, update gomatrixserverlib * Fix nil pointer exception * Fix some more nil pointer exceptions hopefully * Update gomatrixserverlib * Send all room versions when joining, not just stable ones * Remove room version cquery * Get room version when getting events from the roomserver database * Reset default back to room version 2 * Don't generate event IDs unless needed * Revert "Remove room version cquery" This reverts commit a170d5873360dd059614460acc8b21ab2cda9767. * Query room version in federation API, client API as needed * Improvements to make_join send_join dance * Make room server producers use headered events * Lint tweaks * Update gomatrixserverlib * Versioned SendJoin * Query room version in syncapi backfill * Handle transaction marshalling/unmarshalling within Dendrite * Sorta fix federation (kinda) * whoops commit federation API too * Use NewEventFromTrustedJSON when getting events from the database * Update gomatrixserverlib * Strip headers on federationapi endpoints * Fix bug in clientapi profile room version query * Update gomatrixserverlib * Return more useful error if room version query doesn't find the room * Update gomatrixserverlib * Update gomatrixserverlib * Maybe fix federation * Fix formatting directive * Update sytest whitelist and blacklist * Temporarily disable room versions 3 and 4 until gmsl is fixed * Fix count of EDUs in logging * Update gomatrixserverlib * Update gomatrixserverlib * Update gomatrixserverlib * Rely on EventBuilder in gmsl to generate the event IDs for us * Some review comments fixed * Move function out of common and into gmsl * Comment in federationsender destinationqueue * Update gomatrixserverlib
136 lines
3.7 KiB
Go
136 lines
3.7 KiB
Go
// Copyright 2017 Vector Creations 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 queue
|
|
|
|
import (
|
|
"fmt"
|
|
"sync"
|
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
log "github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// OutgoingQueues is a collection of queues for sending transactions to other
|
|
// matrix servers
|
|
type OutgoingQueues struct {
|
|
origin gomatrixserverlib.ServerName
|
|
client *gomatrixserverlib.FederationClient
|
|
// The queuesMutex protects queues
|
|
queuesMutex sync.Mutex
|
|
queues map[gomatrixserverlib.ServerName]*destinationQueue
|
|
}
|
|
|
|
// NewOutgoingQueues makes a new OutgoingQueues
|
|
func NewOutgoingQueues(origin gomatrixserverlib.ServerName, client *gomatrixserverlib.FederationClient) *OutgoingQueues {
|
|
return &OutgoingQueues{
|
|
origin: origin,
|
|
client: client,
|
|
queues: map[gomatrixserverlib.ServerName]*destinationQueue{},
|
|
}
|
|
}
|
|
|
|
// SendEvent sends an event to the destinations
|
|
func (oqs *OutgoingQueues) SendEvent(
|
|
ev *gomatrixserverlib.HeaderedEvent, origin gomatrixserverlib.ServerName,
|
|
destinations []gomatrixserverlib.ServerName,
|
|
) error {
|
|
if origin != oqs.origin {
|
|
// TODO: Support virtual hosting; gh issue #577.
|
|
return fmt.Errorf(
|
|
"sendevent: unexpected server to send as: got %q expected %q",
|
|
origin, oqs.origin,
|
|
)
|
|
}
|
|
|
|
// Remove our own server from the list of destinations.
|
|
destinations = filterDestinations(oqs.origin, destinations)
|
|
|
|
log.WithFields(log.Fields{
|
|
"destinations": destinations, "event": ev.EventID(),
|
|
}).Info("Sending event")
|
|
|
|
oqs.queuesMutex.Lock()
|
|
defer oqs.queuesMutex.Unlock()
|
|
for _, destination := range destinations {
|
|
oq := oqs.queues[destination]
|
|
if oq == nil {
|
|
oq = &destinationQueue{
|
|
origin: oqs.origin,
|
|
destination: destination,
|
|
client: oqs.client,
|
|
}
|
|
oqs.queues[destination] = oq
|
|
}
|
|
|
|
oq.sendEvent(ev)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// SendEDU sends an EDU event to the destinations
|
|
func (oqs *OutgoingQueues) SendEDU(
|
|
e *gomatrixserverlib.EDU, origin gomatrixserverlib.ServerName,
|
|
destinations []gomatrixserverlib.ServerName,
|
|
) error {
|
|
if origin != oqs.origin {
|
|
// TODO: Support virtual hosting; gh issue #577.
|
|
return fmt.Errorf(
|
|
"sendevent: unexpected server to send as: got %q expected %q",
|
|
origin, oqs.origin,
|
|
)
|
|
}
|
|
|
|
// Remove our own server from the list of destinations.
|
|
destinations = filterDestinations(oqs.origin, destinations)
|
|
|
|
if len(destinations) > 0 {
|
|
log.WithFields(log.Fields{
|
|
"destinations": destinations, "edu_type": e.Type,
|
|
}).Info("Sending EDU event")
|
|
}
|
|
|
|
oqs.queuesMutex.Lock()
|
|
defer oqs.queuesMutex.Unlock()
|
|
for _, destination := range destinations {
|
|
oq := oqs.queues[destination]
|
|
if oq == nil {
|
|
oq = &destinationQueue{
|
|
origin: oqs.origin,
|
|
destination: destination,
|
|
client: oqs.client,
|
|
}
|
|
oqs.queues[destination] = oq
|
|
}
|
|
|
|
oq.sendEDU(e)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// filterDestinations removes our own server from the list of destinations.
|
|
// Otherwise we could end up trying to talk to ourselves.
|
|
func filterDestinations(origin gomatrixserverlib.ServerName, destinations []gomatrixserverlib.ServerName) []gomatrixserverlib.ServerName {
|
|
var result []gomatrixserverlib.ServerName
|
|
for _, destination := range destinations {
|
|
if destination == origin {
|
|
continue
|
|
}
|
|
result = append(result, destination)
|
|
}
|
|
return result
|
|
}
|