mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-02-16 19:15:16 +00:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary exceptions from validate_url_domain

Browse source
This commit is contained in:
Bart Schuurmans 2024-04-02 14:27:47 +02:00
parent 3d183a393f
commit c73d1fff6a
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bookwyrm/tests/test_utils.py
View file

@ -25,7 +25,3 @@ class TestUtils(TestCase):
self.assertIsNone( self.assertIsNone(
validate_url_domain("https://up-to-no-good.tld/bad-actor.exe") validate_url_domain("https://up-to-no-good.tld/bad-actor.exe")
) )
def test_default_url_domain(self):
"""Check with a default URL"""
self.assertEqual(validate_url_domain("/"), "/")

7
bookwyrm/utils/validate.py
View file

@ -4,14 +4,11 @@ from typing import Optional
from bookwyrm.settings import DOMAIN, USE_HTTPS from bookwyrm.settings import DOMAIN, USE_HTTPS
def validate_url_domain(url: str) -> Optional[str]: def validate_url_domain(url: Optional[str]) -> Optional[str]:
"""Basic check that the URL starts with the instance domain name""" """Basic check that the URL starts with the instance domain name"""
if not url: if url is None:
return None return None
if url == "/":
return url
protocol = "https://" if USE_HTTPS else "http://" protocol = "https://" if USE_HTTPS else "http://"
origin = f"{protocol}{DOMAIN}" origin = f"{protocol}{DOMAIN}"