Skip to content
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
1 change: 1 addition & 0 deletions src/edge_proxy/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def serve():
"edge_proxy.server:app",
host=str(settings.server.host),
port=settings.server.port,
proxy_headers=settings.server.proxy_headers,
reload=settings.server.reload,
use_colors=settings.logging.colours,
)
Expand Down
1 change: 1 addition & 0 deletions src/edge_proxy/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class ServerSettings(BaseModel):
host: IPvAnyAddress = "0.0.0.0"
port: int = 8000
reload: bool = False
proxy_headers: bool = False


class HealthCheckSettings(BaseModel):
Expand Down
16 changes: 16 additions & 0 deletions tests/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from fastapi.testclient import TestClient
from pytest_mock import MockerFixture

from edge_proxy.main import serve
from tests.fixtures.response_data import environment_1

if typing.TYPE_CHECKING:
Expand Down Expand Up @@ -217,3 +218,18 @@ def test_get_identities(
assert response.status_code == 200
assert data["traits"] == []
assert data["flags"]


def test_serve_passes_proxy_headers_setting(mocker: MockerFixture) -> None:
# Given
mock_settings = mocker.patch("edge_proxy.main.get_settings")
mock_settings.return_value.server.proxy_headers = True

mock_uvicorn = mocker.patch("edge_proxy.main.uvicorn.run")

# When
serve()

# Then
_, kwargs = mock_uvicorn.call_args
assert kwargs.get("proxy_headers") is True