Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 [#32] Remove port number before using validate_host #36

Merged
merged 2 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions django_loose_fk/loaders.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from django.utils.functional import LazyObject, empty
from django.utils.module_loading import import_string

from .utils import get_resource_for_path
from .utils import get_resource_for_path, strip_port_number_and_lowercase
from .virtual_models import get_model_instance

SETTING = "DEFAULT_LOOSE_FK_LOADER"
Expand Down Expand Up @@ -55,12 +55,16 @@ def is_local_url(self, url: str) -> bool:
"break django-loose-fk's behaviour. You should use an explicit list.",
RuntimeWarning,
)
return validate_host(parsed.netloc, allowed_hosts)
return validate_host(
strip_port_number_and_lowercase(parsed.netloc), allowed_hosts
)

if local_base_urls:
return any(url.startswith(base_url) for base_url in local_base_urls)

return validate_host(parsed.netloc, allowed_hosts)
return validate_host(
strip_port_number_and_lowercase(parsed.netloc), allowed_hosts
)

def load_local_object(self, url: str, model: ModelBase) -> models.Model:
parsed = urlparse(url)
Expand Down
4 changes: 4 additions & 0 deletions django_loose_fk/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,7 @@ def get_subclasses(cls):
for subclass in cls.__subclasses__():
yield from get_subclasses(subclass)
yield subclass


def strip_port_number_and_lowercase(netloc: str) -> str:
return netloc.split(":")[0].lower()
2 changes: 1 addition & 1 deletion testapp/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ def get_db():

ROOT_URLCONF = "testapp.urls"

ALLOWED_HOSTS = ["testserver.com"]
ALLOWED_HOSTS = ["testserver.com", "testserver.local"]

USE_TZ = False
7 changes: 7 additions & 0 deletions tests/test_loaders.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,10 @@ def test_failed_not_json():

with pytest.raises(FetchJsonError):
default_loader.load("https://example.com", ZaakType)


def test_is_local_url():
assert default_loader.is_local_url("https://testserver.com/some-resource")
assert default_loader.is_local_url("https://testserver.local:443/some-resource")
assert default_loader.is_local_url("https://TESTSERVER.LOCAL:443/some-resource")
assert not default_loader.is_local_url("https://example.com/some-resource")
Loading