Skip to content

Commit 3ee5953

Browse files
committed
Remove starlette testclient name
1 parent eb00836 commit 3ee5953

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

Diff for: frontend/app.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,14 @@ def generate_page(request: Request) -> HTMLResponse:
383383
return templates.TemplateResponse("generate_new.html", generate_template_params)
384384

385385

386+
def _get_src_ip(request):
387+
return request.headers.get(switchboard_settings.REAL_IP_HEADER) or (
388+
request.client.host
389+
if (request.client and request.client.host != "testclient")
390+
else ""
391+
)
392+
393+
386394
@app.post(
387395
"/generate",
388396
tags=["Create Canarytokens"],
@@ -449,10 +457,7 @@ async def generate(request: Request) -> AnyTokenResponse: # noqa: C901 # gen i
449457
else:
450458
kube_config = None
451459
canarytoken = Canarytoken()
452-
print(request.client)
453-
src_ip = request.headers.get(switchboard_settings.REAL_IP_HEADER) or (
454-
request.client.host if request.client else ""
455-
)
460+
src_ip = _get_src_ip(request)
456461
x_forwarded_for = request.headers.get("x-forwarded-for") or ""
457462

458463
canarydrop = Canarydrop(
@@ -776,9 +781,7 @@ async def api_generate( # noqa: C901 # gen is large
776781
kube_config = None
777782
canarytoken = Canarytoken()
778783

779-
src_ip = request.headers.get(switchboard_settings.REAL_IP_HEADER) or (
780-
request.client.host if request.client else ""
781-
)
784+
src_ip = _get_src_ip(request)
782785
x_forwarded_for = request.headers.get("x-forwarded-for") or ""
783786

784787
canarydrop = Canarydrop(

0 commit comments

Comments
 (0)