4ccf6d6f67
Since #3334 didn't change much on d.m.org, this is another attempt to speed up startup. Given moderation bots like Mjolnir/Draupnir are in many rooms with quite often the same or similar ACLs, caching the compiled regexes _should_ reduce the startup time. Using a pointer to the `*regexp.Regex` ensures we only store _one_ instance of a regex in memory, instead of potentially storing it hundred of times. This should reduce memory consumption on servers with many rooms with ACLs drastically. (5.1MB vs 1.7MB with this change on my server with 8 ACL'd rooms [3 using the same ACLs]) [skip ci]
154 lines
4.3 KiB
Go
154 lines
4.3 KiB
Go
// Copyright 2020 The Matrix.org Foundation C.I.C.
|
|
//
|
|
// 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 acls
|
|
|
|
import (
|
|
"context"
|
|
"regexp"
|
|
"testing"
|
|
|
|
"github.com/matrix-org/dendrite/roomserver/storage/tables"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
"github.com/matrix-org/gomatrixserverlib/spec"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestOpenACLsWithBlacklist(t *testing.T) {
|
|
roomID := "!test:test.com"
|
|
allowRegex, err := compileACLRegex("*")
|
|
if err != nil {
|
|
t.Fatalf(err.Error())
|
|
}
|
|
denyRegex, err := compileACLRegex("foo.com")
|
|
if err != nil {
|
|
t.Fatalf(err.Error())
|
|
}
|
|
|
|
acls := ServerACLs{
|
|
acls: make(map[string]*serverACL),
|
|
}
|
|
|
|
acls.acls[roomID] = &serverACL{
|
|
ServerACL: ServerACL{
|
|
AllowIPLiterals: true,
|
|
},
|
|
allowedRegexes: []**regexp.Regexp{&allowRegex},
|
|
deniedRegexes: []**regexp.Regexp{&denyRegex},
|
|
}
|
|
|
|
if acls.IsServerBannedFromRoom("1.2.3.4", roomID) {
|
|
t.Fatal("Expected 1.2.3.4 to be allowed but wasn't")
|
|
}
|
|
if acls.IsServerBannedFromRoom("1.2.3.4:2345", roomID) {
|
|
t.Fatal("Expected 1.2.3.4:2345 to be allowed but wasn't")
|
|
}
|
|
if !acls.IsServerBannedFromRoom("foo.com", roomID) {
|
|
t.Fatal("Expected foo.com to be banned but wasn't")
|
|
}
|
|
if !acls.IsServerBannedFromRoom("foo.com:3456", roomID) {
|
|
t.Fatal("Expected foo.com:3456 to be banned but wasn't")
|
|
}
|
|
if acls.IsServerBannedFromRoom("bar.com", roomID) {
|
|
t.Fatal("Expected bar.com to be allowed but wasn't")
|
|
}
|
|
if acls.IsServerBannedFromRoom("bar.com:4567", roomID) {
|
|
t.Fatal("Expected bar.com:4567 to be allowed but wasn't")
|
|
}
|
|
}
|
|
|
|
func TestDefaultACLsWithWhitelist(t *testing.T) {
|
|
roomID := "!test:test.com"
|
|
allowRegex, err := compileACLRegex("foo.com")
|
|
if err != nil {
|
|
t.Fatalf(err.Error())
|
|
}
|
|
|
|
acls := ServerACLs{
|
|
acls: make(map[string]*serverACL),
|
|
}
|
|
|
|
acls.acls[roomID] = &serverACL{
|
|
ServerACL: ServerACL{
|
|
AllowIPLiterals: false,
|
|
},
|
|
allowedRegexes: []**regexp.Regexp{&allowRegex},
|
|
deniedRegexes: []**regexp.Regexp{},
|
|
}
|
|
|
|
if !acls.IsServerBannedFromRoom("1.2.3.4", roomID) {
|
|
t.Fatal("Expected 1.2.3.4 to be banned but wasn't")
|
|
}
|
|
if !acls.IsServerBannedFromRoom("1.2.3.4:2345", roomID) {
|
|
t.Fatal("Expected 1.2.3.4:2345 to be banned but wasn't")
|
|
}
|
|
if acls.IsServerBannedFromRoom("foo.com", roomID) {
|
|
t.Fatal("Expected foo.com to be allowed but wasn't")
|
|
}
|
|
if acls.IsServerBannedFromRoom("foo.com:3456", roomID) {
|
|
t.Fatal("Expected foo.com:3456 to be allowed but wasn't")
|
|
}
|
|
if !acls.IsServerBannedFromRoom("bar.com", roomID) {
|
|
t.Fatal("Expected bar.com to be allowed but wasn't")
|
|
}
|
|
if !acls.IsServerBannedFromRoom("baz.com", roomID) {
|
|
t.Fatal("Expected baz.com to be allowed but wasn't")
|
|
}
|
|
if !acls.IsServerBannedFromRoom("qux.com:4567", roomID) {
|
|
t.Fatal("Expected qux.com:4567 to be allowed but wasn't")
|
|
}
|
|
}
|
|
|
|
var (
|
|
content1 = `{"allow":["*"],"allow_ip_literals":false,"deny":["hello.world", "*.hello.world"]}`
|
|
)
|
|
|
|
type dummyACLDB struct{}
|
|
|
|
func (d dummyACLDB) GetKnownRooms(ctx context.Context) ([]string, error) {
|
|
return []string{"1", "2"}, nil
|
|
}
|
|
|
|
func (d dummyACLDB) GetBulkStateContent(ctx context.Context, roomIDs []string, tuples []gomatrixserverlib.StateKeyTuple, allowWildcards bool) ([]tables.StrippedEvent, error) {
|
|
return []tables.StrippedEvent{
|
|
{
|
|
RoomID: "1",
|
|
ContentValue: content1,
|
|
},
|
|
{
|
|
RoomID: "2",
|
|
ContentValue: content1,
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func TestCachedRegex(t *testing.T) {
|
|
db := dummyACLDB{}
|
|
wantBannedServer := spec.ServerName("hello.world")
|
|
|
|
acls := NewServerACLs(db)
|
|
|
|
// Check that hello.world is banned in room 1
|
|
banned := acls.IsServerBannedFromRoom(wantBannedServer, "1")
|
|
assert.True(t, banned)
|
|
|
|
// Check that hello.world is banned in room 2
|
|
banned = acls.IsServerBannedFromRoom(wantBannedServer, "2")
|
|
assert.True(t, banned)
|
|
|
|
// Check that matrix.hello.world is banned in room 2
|
|
banned = acls.IsServerBannedFromRoom("matrix."+wantBannedServer, "2")
|
|
assert.True(t, banned)
|
|
}
|