don't allow blocklisted domains in Web, ActivityPub ids

for #597
pull/598/head
Ryan Barrett 2023-07-22 20:09:16 -10:00
rodzic 405ca4145f
commit 9a7597b365
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6BE31FDF4776E9D4
2 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -78,8 +78,8 @@ class ActivityPub(User, Protocol):
assert util.is_web(id), f'{id} is not a URL'
domain = util.domain_from_link(id)
assert domain, 'missing domain'
assert util.domain_from_link(id) not in common.DOMAINS, \
f'{id} is a Bridgy Fed domain'
assert domain not in common.DOMAIN_BLOCKLIST, \
f'{id} is a blocked domain'
def web_url(self):
"""Returns this user's web URL aka web_url, eg 'https://foo.com/'."""

2
web.py
Wyświetl plik

@ -69,7 +69,7 @@ class Web(User, Protocol):
id = self.key.id()
assert re.match(common.DOMAIN_RE, id)
assert id.lower() == id, f'upper case is not allowed in Web key id: {id}'
assert id not in common.DOMAINS, f'{id} is a Bridgy Fed domain'
assert id not in common.DOMAIN_BLOCKLIST, f'{id} is a blocked domain'
@classmethod
def get_or_create(cls, id, **kwargs):