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
2 changes: 1 addition & 1 deletion airflow-core/src/airflow/utils/serve_logs/log_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ async def validate_jwt_token(self, request: Request):
payload = await signer.avalidated_claims(auth)
token_filename = payload.get("filename")
# Extract filename from url path
request_filename = request.url.path.lstrip("/log/")
request_filename = request.url.path.removeprefix("/log/")
if token_filename is None:
logger.warning("The payload does not contain 'filename' key: %s.", payload)
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN)
Expand Down
13 changes: 13 additions & 0 deletions airflow-core/tests/unit/utils/test_serve_logs.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,19 @@ def test_forbidden_different_logname(self, client: TestClient, jwt_generator):
)
assert response.status_code == 403

def test_forbidden_lstrip_character_overlap(self, client: TestClient, jwt_generator):
# The request path and the JWT filename intersect on the set {/, l, o, g}:
# str.lstrip("/log/") on "/log/log_sample.log" returns "_sample.log",
# which would have matched the JWT, but StaticFiles serves "log_sample.log".
# removeprefix preserves the literal prefix so the two paths agree.
response = client.get(
"/log/log_sample.log",
headers={
"Authorization": jwt_generator.generate({"filename": "_sample.log"}),
},
)
assert response.status_code == 403

def test_forbidden_expired(self, client: TestClient, jwt_generator):
with time_machine.travel("2010-01-14"):
token = jwt_generator.generate({"filename": "sample.log"})
Expand Down
Loading