Bug fixes

currentstateserver/api/wrapper.go

@@ -27,7 +27,10 @@ func GetEvent(ctx context.Context, stateAPI CurrentStateInternalAPI, roomID stri
 
 // IsServerBannedFromRoom returns whether the server is banned from a room by server ACLs.
 func IsServerBannedFromRoom(ctx context.Context, stateAPI CurrentStateInternalAPI, roomID string, serverName gomatrixserverlib.ServerName) bool {
-	req := &QueryServerBannedFromRoomRequest{}
+	req := &QueryServerBannedFromRoomRequest{
+		ServerName: serverName,
+		RoomID:     roomID,
+	}
 	res := &QueryServerBannedFromRoomResponse{}
 	if err := stateAPI.QueryServerBannedFromRoom(ctx, req, res); err != nil {
 		util.GetLogger(ctx).WithError(err).Error("Failed to QueryServerBannedFromRoom")

currentstateserver/consumers/roomserver.go

@@ -43,6 +43,7 @@ func NewOutputRoomEventConsumer(topicName string, kafkaConsumer sarama.Consumer,
 	s := &OutputRoomEventConsumer{
 		rsConsumer: consumer,
 		db:         store,
+		acls:       acls,
 	}
 	consumer.ProcessMessage = s.onMessage
 

currentstateserver/internal/api.go

@@ -16,6 +16,7 @@ package internal
 
 import (
 	"context"
+	"errors"
 
 	"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
 	"github.com/matrix-org/dendrite/currentstateserver/acls"
@@ -116,6 +117,9 @@ func (a *CurrentStateInternalAPI) QuerySharedUsers(ctx context.Context, req *api
 }
 
 func (a *CurrentStateInternalAPI) QueryServerBannedFromRoom(ctx context.Context, req *api.QueryServerBannedFromRoomRequest, res *api.QueryServerBannedFromRoomResponse) error {
+	if a.ServerACLs == nil {
+		return errors.New("no server ACL tracking")
+	}
 	res.Banned = a.ServerACLs.IsServerBannedFromRoom(req.ServerName, req.RoomID)
 	return nil
 }

federationapi/federationapi.go

@@ -41,7 +41,6 @@ func AddPublicRoutes(
 	stateAPI currentstateAPI.CurrentStateInternalAPI,
 	keyAPI keyserverAPI.KeyInternalAPI,
 ) {
-
 	routing.Setup(
 		router, cfg, rsAPI,
 		eduAPI, federationSenderAPI, keyRing,

federationapi/routing/send_test.go

@@ -318,6 +318,10 @@ func (t *testStateAPI) QueryKnownUsers(ctx context.Context, req *currentstateAPI
 	return fmt.Errorf("not implemented")
 }
 
+func (t *testStateAPI) QueryServerBannedFromRoom(ctx context.Context, req *currentstateAPI.QueryServerBannedFromRoomRequest, res *currentstateAPI.QueryServerBannedFromRoomResponse) error {
+	return nil
+}
+
 type txnFedClient struct {
 	state            map[string]gomatrixserverlib.RespState    // event_id to response
 	stateIDs         map[string]gomatrixserverlib.RespStateIDs // event_id to response