From 695649f329f9bf0a4d3d1a6cf4d5eebd9bc20901 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 11 Aug 2020 16:12:30 +0100 Subject: [PATCH] Ignore port when matching servername --- currentstateserver/acls/acls.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/currentstateserver/acls/acls.go b/currentstateserver/acls/acls.go index 23e236e1f..70913c0a0 100644 --- a/currentstateserver/acls/acls.go +++ b/currentstateserver/acls/acls.go @@ -84,11 +84,15 @@ func (s *ServerACLs) OnServerACLUpdate(state *gomatrixserverlib.Event) { s.acls[state.RoomID()] = acls } -func (s *ServerACLs) IsServerBannedFromRoom(serverName gomatrixserverlib.ServerName, roomID string) bool { +func (s *ServerACLs) IsServerBannedFromRoom(serverNameAndPort gomatrixserverlib.ServerName, roomID string) bool { acls, ok := s.acls[roomID] if !ok { return false } + serverName, _, err := net.SplitHostPort(string(serverNameAndPort)) + if err != nil { + return true + } if _, _, err := net.ParseCIDR(fmt.Sprintf("%s/0", serverName)); err == nil { if !acls.AllowIPLiterals { return true