Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e9595c7868 |
@@ -28,7 +28,3 @@
|
||||
**Vulnerability:** The `/process-url` endpoint used `httpx.AsyncClient(follow_redirects=True)` after validating the initial user-provided URL against SSRF protections. However, it did not validate the target URLs of any subsequent HTTP redirects, allowing an attacker to provide a safe URL that redirects to an internal/private IP, bypassing the security check.
|
||||
**Learning:** Initial URL validation is insufficient when the HTTP client is configured to follow redirects automatically. The client must be explicitly configured to validate every redirect target.
|
||||
**Prevention:** When using `httpx.AsyncClient(follow_redirects=True)` for user-provided URLs, always implement a redirect validator hook function (e.g., using `event_hooks={'response': [validate_redirect]}`) that resolves the `Location` header and passes it through the same SSRF validation logic before the redirect is followed.
|
||||
## 2026-03-27 - SyntaxError: keyword argument repeated in httpx event hooks
|
||||
**Vulnerability:** The `/process-url` endpoint in `app/api/url_upload.py` initialized `httpx.AsyncClient` with the `event_hooks` keyword argument twice. This caused a Python SyntaxError, effectively crashing the API endpoint and preventing any execution.
|
||||
**Learning:** Python does not allow duplicate keyword arguments. In scenarios where multiple hooks (like local and module-level SSRF interceptors) must be provided to a client, they must be merged into a single list value.
|
||||
**Prevention:** Combine multiple callables for the same event key into a single list, e.g., `event_hooks={"response": [hook1, hook2]}`.
|
||||
|
||||
@@ -194,10 +194,10 @@ async def process_url(
|
||||
async with httpx.AsyncClient(
|
||||
timeout=settings.http_request_timeout,
|
||||
follow_redirects=True,
|
||||
event_hooks={"response": [validate_redirect, verify_redirect]},
|
||||
headers={
|
||||
"User-Agent": "DocuElevate/1.0", # Identify ourselves
|
||||
},
|
||||
event_hooks={"response": [validate_redirect, verify_redirect]},
|
||||
) as client:
|
||||
async with client.stream("GET", url) as response:
|
||||
response.raise_for_status()
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
import pytest
|
||||
from unittest.mock import patch, MagicMock, AsyncMock
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_validate_redirect_hook_direct():
|
||||
import httpx
|
||||
from fastapi import HTTPException
|
||||
|
||||
# We will test the inline validate_redirect function by calling process_url with a mocked httpx.AsyncClient
|
||||
# that extracts the hook and calls it directly.
|
||||
from app.api.url_upload import process_url
|
||||
|
||||
# We can capture the validate_redirect function by mocking httpx.AsyncClient
|
||||
hook_funcs = []
|
||||
|
||||
class MockAsyncClient:
|
||||
def __init__(self, **kwargs):
|
||||
if "event_hooks" in kwargs and "response" in kwargs["event_hooks"]:
|
||||
hook_funcs.extend(kwargs["event_hooks"]["response"])
|
||||
|
||||
async def __aenter__(self):
|
||||
return self
|
||||
|
||||
async def __aexit__(self, exc_type, exc_val, exc_tb):
|
||||
pass
|
||||
|
||||
def stream(self, method, url):
|
||||
class MockStreamContext:
|
||||
async def __aenter__(self):
|
||||
response = MagicMock()
|
||||
response.headers = {}
|
||||
response.aiter_bytes = AsyncMock(return_value=[])
|
||||
return response
|
||||
async def __aexit__(self, exc_type, exc_val, exc_tb):
|
||||
pass
|
||||
return MockStreamContext()
|
||||
|
||||
with patch("app.api.url_upload.httpx.AsyncClient", new=MockAsyncClient):
|
||||
from app.api.url_upload import URLUploadRequest
|
||||
from fastapi import Request
|
||||
request = MagicMock(spec=Request)
|
||||
url_request = URLUploadRequest(url="http://example.com")
|
||||
|
||||
try:
|
||||
await process_url(request, url_request)
|
||||
except Exception:
|
||||
pass # we just want to get the hooks out
|
||||
|
||||
assert len(hook_funcs) == 2
|
||||
validate_redirect = hook_funcs[0] # it was the first one
|
||||
|
||||
# Now we can test the hook
|
||||
with patch("app.api.url_upload.validate_url_safety", side_effect=HTTPException(status_code=400, detail="bad")):
|
||||
resp = MagicMock(spec=httpx.Response)
|
||||
resp.is_redirect = True
|
||||
resp.headers = {"Location": "http://bad.com"}
|
||||
resp.url = httpx.URL("http://example.com")
|
||||
resp.request = httpx.Request("GET", "http://example.com")
|
||||
|
||||
with pytest.raises(httpx.RequestError) as exc:
|
||||
await validate_redirect(resp)
|
||||
assert "Unsafe redirect target: bad" in str(exc.value)
|
||||
|
||||
with patch("app.api.url_upload.validate_url_safety", return_value=None):
|
||||
resp = MagicMock(spec=httpx.Response)
|
||||
resp.is_redirect = True
|
||||
resp.headers = {"Location": "http://good.com"}
|
||||
resp.url = httpx.URL("http://example.com")
|
||||
resp.request = httpx.Request("GET", "http://example.com")
|
||||
|
||||
await validate_redirect(resp) # should not raise
|
||||
|
||||
# Test no location
|
||||
resp.headers = {}
|
||||
await validate_redirect(resp) # should not raise
|
||||
|
||||
# Test not redirect
|
||||
resp.is_redirect = False
|
||||
await validate_redirect(resp) # should not raise
|
||||
+79
-23
@@ -912,29 +912,6 @@ class TestURLUploadCoverageGaps:
|
||||
|
||||
assert "Redirect to unsafe URL blocked" in str(exc_info.value)
|
||||
|
||||
@patch("app.api.url_upload.validate_url_safety")
|
||||
@patch("app.api.url_upload.httpx.AsyncClient.stream")
|
||||
def test_process_url_validate_redirect_hook_blocks_unsafe_url(self, mock_stream, mock_validate, client):
|
||||
"""Test that the local validate_redirect hook successfully aborts the request when redirect is unsafe"""
|
||||
import httpx
|
||||
|
||||
# The local validate_redirect hook intercepts 301/302 and throws an httpx.RequestError
|
||||
# Here we mock the behavior of that hook executing during the stream context
|
||||
def side_effect(*args, **kwargs):
|
||||
# Raise a simulated RequestError caused by validate_redirect
|
||||
raise httpx.RequestError(
|
||||
"Unsafe redirect target: Access to private IP addresses is not allowed",
|
||||
request=httpx.Request("GET", "http://example.com"),
|
||||
)
|
||||
|
||||
mock_stream.side_effect = side_effect
|
||||
|
||||
response = client.post("/api/process-url", json={"url": "http://example.com"})
|
||||
|
||||
# Our exception handler in process_url converts RequestError to a 500 HTTPException
|
||||
assert response.status_code == 500
|
||||
assert "Unsafe redirect target" in response.json()["detail"]
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_verify_redirect_ignores_non_redirects(self):
|
||||
"""Test verify_redirect ignores 200 OK responses"""
|
||||
@@ -947,3 +924,82 @@ class TestURLUploadCoverageGaps:
|
||||
|
||||
# Should not raise any exception and should ignore missing Location header
|
||||
await verify_redirect(resp)
|
||||
import pytest
|
||||
from unittest.mock import patch, MagicMock, AsyncMock
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_validate_redirect_hook_direct():
|
||||
import httpx
|
||||
from fastapi import HTTPException
|
||||
|
||||
# We will test the inline validate_redirect function by calling process_url with a mocked httpx.AsyncClient
|
||||
# that extracts the hook and calls it directly.
|
||||
from app.api.url_upload import process_url
|
||||
|
||||
# We can capture the validate_redirect function by mocking httpx.AsyncClient
|
||||
hook_funcs = []
|
||||
|
||||
class MockAsyncClient:
|
||||
def __init__(self, **kwargs):
|
||||
if "event_hooks" in kwargs and "response" in kwargs["event_hooks"]:
|
||||
hook_funcs.extend(kwargs["event_hooks"]["response"])
|
||||
|
||||
async def __aenter__(self):
|
||||
return self
|
||||
|
||||
async def __aexit__(self, exc_type, exc_val, exc_tb):
|
||||
pass
|
||||
|
||||
def stream(self, method, url):
|
||||
class MockStreamContext:
|
||||
async def __aenter__(self):
|
||||
response = MagicMock()
|
||||
response.headers = {}
|
||||
response.aiter_bytes = AsyncMock(return_value=[])
|
||||
return response
|
||||
async def __aexit__(self, exc_type, exc_val, exc_tb):
|
||||
pass
|
||||
return MockStreamContext()
|
||||
|
||||
with patch("app.api.url_upload.httpx.AsyncClient", new=MockAsyncClient):
|
||||
from app.api.url_upload import URLUploadRequest
|
||||
from fastapi import Request
|
||||
request = MagicMock(spec=Request)
|
||||
url_request = URLUploadRequest(url="http://example.com")
|
||||
|
||||
try:
|
||||
await process_url(request, url_request)
|
||||
except Exception:
|
||||
pass # we just want to get the hooks out
|
||||
|
||||
assert len(hook_funcs) == 2
|
||||
validate_redirect = hook_funcs[0] # it was the first one
|
||||
|
||||
# Now we can test the hook
|
||||
with patch("app.api.url_upload.validate_url_safety", side_effect=HTTPException(status_code=400, detail="bad")):
|
||||
resp = MagicMock(spec=httpx.Response)
|
||||
resp.is_redirect = True
|
||||
resp.headers = {"Location": "http://bad.com"}
|
||||
resp.url = httpx.URL("http://example.com")
|
||||
resp.request = httpx.Request("GET", "http://example.com")
|
||||
|
||||
with pytest.raises(httpx.RequestError) as exc:
|
||||
await validate_redirect(resp)
|
||||
assert "Unsafe redirect target: bad" in str(exc.value)
|
||||
|
||||
with patch("app.api.url_upload.validate_url_safety", return_value=None):
|
||||
resp = MagicMock(spec=httpx.Response)
|
||||
resp.is_redirect = True
|
||||
resp.headers = {"Location": "http://good.com"}
|
||||
resp.url = httpx.URL("http://example.com")
|
||||
resp.request = httpx.Request("GET", "http://example.com")
|
||||
|
||||
await validate_redirect(resp) # should not raise
|
||||
|
||||
# Test no location
|
||||
resp.headers = {}
|
||||
await validate_redirect(resp) # should not raise
|
||||
|
||||
# Test not redirect
|
||||
resp.is_redirect = False
|
||||
await validate_redirect(resp) # should not raise
|
||||
|
||||
Reference in New Issue
Block a user