Ryan Barrett 2023-09-25 14:45:04 -07:00
rodzic 1a003c8c5b
commit c27404d681
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 6BE31FDF4776E9D4
2 zmienionych plików z 16 dodań i 10 usunięć

Wyświetl plik

@ -1839,14 +1839,23 @@ http://this/404s
def test_check_web_site_bad_url(self, _, __):
got = self.client.post('/web-site', data={'url': '!!!'})
self.assert_equals(200, got.status_code)
self.assertEqual(['No domain found in !!!'], get_flashed_messages())
self.assert_equals(400, got.status_code)
self.assertEqual(['!!! is not a valid or supported web site'],
get_flashed_messages())
self.assertEqual(1, Web.query().count())
def test_check_web_site_bridgy_fed_domain(self, _, __):
got = self.client.post('/web-site', data={'url': 'https://fed.brid.gy/foo'})
self.assert_equals(200, got.status_code)
self.assertEqual(['fed.brid.gy is a Bridgy Fed domain'],
self.assert_equals(400, got.status_code)
self.assertEqual(
['https://fed.brid.gy/foo is not a valid or supported web site'],
get_flashed_messages())
self.assertEqual(1, Web.query().count())
def test_check_web_site_blocklisted(self, _, __):
got = self.client.post('/web-site', data={'url': 'https://t.co/'})
self.assert_equals(400, got.status_code)
self.assertEqual(['https://t.co/ is not a valid or supported web site'],
get_flashed_messages())
self.assertEqual(1, Web.query().count())

9
web.py
Wyświetl plik

@ -464,12 +464,9 @@ def check_web_site():
url = request.values['url']
# this normalizes and lower cases domain
domain = util.domain_from_link(url, minimize=False)
if not domain:
flash(f'No domain found in {url}')
return render_template('enter_web_site.html')
elif domain in common.DOMAINS:
flash(f'{domain} is a Bridgy Fed domain')
return render_template('enter_web_site.html')
if not domain or not is_valid_domain(domain):
flash(f'{url} is not a valid or supported web site')
return render_template('enter_web_site.html'), 400
g.user = Web.get_or_create(domain, direct=True)
try: