-
Notifications
You must be signed in to change notification settings - Fork 186
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
An federation whitelist query endpoint extension (#16848)
This is to allow clients to query the configured federation whitelist. Disabled by default. --------- Co-authored-by: Devon Hudson <[email protected]> Co-authored-by: devonh <[email protected]> Co-authored-by: Andrew Morgan <[email protected]>
- Loading branch information
1 parent
59ac541
commit 038b9ec
Showing
8 changed files
with
243 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Add a feature that allows clients to query the configured federation whitelist. Disabled by default. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
# | ||
# This file is licensed under the Affero General Public License (AGPL) version 3. | ||
# | ||
# Copyright (C) 2024 New Vector, Ltd | ||
# | ||
# This program is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU Affero General Public License as | ||
# published by the Free Software Foundation, either version 3 of the | ||
# License, or (at your option) any later version. | ||
# | ||
# See the GNU Affero General Public License for more details: | ||
# <https://www.gnu.org/licenses/agpl-3.0.html>. | ||
# | ||
|
||
import logging | ||
from typing import TYPE_CHECKING, Tuple | ||
|
||
from synapse.http.server import DirectServeJsonResource | ||
from synapse.http.site import SynapseRequest | ||
from synapse.types import JsonDict | ||
|
||
if TYPE_CHECKING: | ||
from synapse.server import HomeServer | ||
|
||
logger = logging.getLogger(__name__) | ||
|
||
|
||
class FederationWhitelistResource(DirectServeJsonResource): | ||
"""Custom endpoint (disabled by default) to fetch the federation whitelist | ||
config. | ||
Only enabled if `federation_whitelist_endpoint_enabled` feature is enabled. | ||
Response format: | ||
{ | ||
"whitelist_enabled": true, // Whether the federation whitelist is being enforced | ||
"whitelist": [ // Which server names are allowed by the whitelist | ||
"example.com" | ||
] | ||
} | ||
""" | ||
|
||
PATH = "/_synapse/client/v1/config/federation_whitelist" | ||
|
||
def __init__(self, hs: "HomeServer"): | ||
super().__init__() | ||
|
||
self._federation_whitelist = hs.config.federation.federation_domain_whitelist | ||
|
||
self._auth = hs.get_auth() | ||
|
||
async def _async_render_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]: | ||
await self._auth.get_user_by_req(request) | ||
|
||
whitelist = [] | ||
if self._federation_whitelist: | ||
# federation_whitelist is actually a dict, not a list | ||
whitelist = list(self._federation_whitelist) | ||
|
||
return_dict: JsonDict = { | ||
"whitelist_enabled": self._federation_whitelist is not None, | ||
"whitelist": whitelist, | ||
} | ||
|
||
return 200, return_dict |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# | ||
# This file is licensed under the Affero General Public License (AGPL) version 3. | ||
# | ||
# Copyright (C) 2024 New Vector, Ltd | ||
# | ||
# This program is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU Affero General Public License as | ||
# published by the Free Software Foundation, either version 3 of the | ||
# License, or (at your option) any later version. | ||
# | ||
# See the GNU Affero General Public License for more details: | ||
# <https://www.gnu.org/licenses/agpl-3.0.html>. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# | ||
# This file is licensed under the Affero General Public License (AGPL) version 3. | ||
# | ||
# Copyright (C) 2024 New Vector, Ltd | ||
# | ||
# This program is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU Affero General Public License as | ||
# published by the Free Software Foundation, either version 3 of the | ||
# License, or (at your option) any later version. | ||
# | ||
# See the GNU Affero General Public License for more details: | ||
# <https://www.gnu.org/licenses/agpl-3.0.html>. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
# | ||
# This file is licensed under the Affero General Public License (AGPL) version 3. | ||
# | ||
# Copyright (C) 2024 New Vector, Ltd | ||
# | ||
# This program is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU Affero General Public License as | ||
# published by the Free Software Foundation, either version 3 of the | ||
# License, or (at your option) any later version. | ||
# | ||
# See the GNU Affero General Public License for more details: | ||
# <https://www.gnu.org/licenses/agpl-3.0.html>. | ||
|
||
from typing import Dict | ||
|
||
from twisted.web.resource import Resource | ||
|
||
from synapse.rest import admin | ||
from synapse.rest.client import login | ||
from synapse.rest.synapse.client import build_synapse_client_resource_tree | ||
|
||
from tests import unittest | ||
|
||
|
||
class FederationWhitelistTests(unittest.HomeserverTestCase): | ||
servlets = [ | ||
admin.register_servlets_for_client_rest_resource, | ||
login.register_servlets, | ||
] | ||
|
||
def create_resource_dict(self) -> Dict[str, Resource]: | ||
base = super().create_resource_dict() | ||
base.update(build_synapse_client_resource_tree(self.hs)) | ||
return base | ||
|
||
def test_default(self) -> None: | ||
"If the config option is not enabled, the endpoint should 404" | ||
channel = self.make_request( | ||
"GET", "/_synapse/client/v1/config/federation_whitelist", shorthand=False | ||
) | ||
|
||
self.assertEqual(channel.code, 404) | ||
|
||
@unittest.override_config({"federation_whitelist_endpoint_enabled": True}) | ||
def test_no_auth(self) -> None: | ||
"Endpoint requires auth when enabled" | ||
|
||
channel = self.make_request( | ||
"GET", "/_synapse/client/v1/config/federation_whitelist", shorthand=False | ||
) | ||
|
||
self.assertEqual(channel.code, 401) | ||
|
||
@unittest.override_config({"federation_whitelist_endpoint_enabled": True}) | ||
def test_no_whitelist(self) -> None: | ||
"Test when there is no whitelist configured" | ||
|
||
self.register_user("user", "password") | ||
tok = self.login("user", "password") | ||
|
||
channel = self.make_request( | ||
"GET", | ||
"/_synapse/client/v1/config/federation_whitelist", | ||
shorthand=False, | ||
access_token=tok, | ||
) | ||
|
||
self.assertEqual(channel.code, 200) | ||
self.assertEqual( | ||
channel.json_body, {"whitelist_enabled": False, "whitelist": []} | ||
) | ||
|
||
@unittest.override_config( | ||
{ | ||
"federation_whitelist_endpoint_enabled": True, | ||
"federation_domain_whitelist": ["example.com"], | ||
} | ||
) | ||
def test_whitelist(self) -> None: | ||
"Test when there is a whitelist configured" | ||
|
||
self.register_user("user", "password") | ||
tok = self.login("user", "password") | ||
|
||
channel = self.make_request( | ||
"GET", | ||
"/_synapse/client/v1/config/federation_whitelist", | ||
shorthand=False, | ||
access_token=tok, | ||
) | ||
|
||
self.assertEqual(channel.code, 200) | ||
self.assertEqual( | ||
channel.json_body, {"whitelist_enabled": True, "whitelist": ["example.com"]} | ||
) | ||
|
||
@unittest.override_config( | ||
{ | ||
"federation_whitelist_endpoint_enabled": True, | ||
"federation_domain_whitelist": ["example.com", "example.com"], | ||
} | ||
) | ||
def test_whitelist_no_duplicates(self) -> None: | ||
"Test when there is a whitelist configured with duplicates, no duplicates are returned" | ||
|
||
self.register_user("user", "password") | ||
tok = self.login("user", "password") | ||
|
||
channel = self.make_request( | ||
"GET", | ||
"/_synapse/client/v1/config/federation_whitelist", | ||
shorthand=False, | ||
access_token=tok, | ||
) | ||
|
||
self.assertEqual(channel.code, 200) | ||
self.assertEqual( | ||
channel.json_body, {"whitelist_enabled": True, "whitelist": ["example.com"]} | ||
) |