hotel-manage-stack/rates
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Fix proxy test: URL-encode httpx credentials, use Proxy object, improve error detail

Browse source 
DataImpulse username contains semicolons (;sessid.ID) that weren't being
URL-encoded in httpx_proxy_url, causing silent parse failures. Also use
httpx.Proxy object instead of raw string (consistent with httpx_proxy()),
and capture repr(e) so empty-message exceptions show their type.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
jtricerolph 2026-07-10 08:57:25 +00:00
parent ed0a027448
commit f6d5fb27e1
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
backend/api/competitors.py
View file

@ -280,17 +280,18 @@ async def test_proxy_config(
if not (proxy_util.is_enabled(cfg) and cfg['password']): if not (proxy_util.is_enabled(cfg) and cfg['password']):
raise HTTPException(status_code=400, detail="Proxy host, username and password must be saved first.") raise HTTPException(status_code=400, detail="Proxy host, username and password must be saved first.")
proxy_url = proxy_util.httpx_proxy_url(cfg, proxy_util.new_session_id())
import httpx import httpx
proxy = proxy_util.httpx_proxy(cfg, proxy_util.new_session_id())
try: try:
async with httpx.AsyncClient(proxy=proxy_url, timeout=40.0) as client: async with httpx.AsyncClient(proxy=proxy, timeout=40.0) as client:
resp = await client.get("https://ipinfo.io/json") resp = await client.get("https://ipinfo.io/json")
resp.raise_for_status() resp.raise_for_status()
data = resp.json() data = resp.json()
except Exception as e: except Exception as e:
logger.warning(f"Proxy test failed: {e}") detail = repr(e) or str(e) or type(e).__name__
raise HTTPException(status_code=502, detail=f"Proxy test failed: {e}") logger.warning(f"Proxy test failed: {detail}")
raise HTTPException(status_code=400, detail=f"Proxy test failed: {detail}")
return { return {
'ok': True, 'ok': True,

3
backend/services/proxy.py
View file

@ -129,8 +129,9 @@ def httpx_proxy_url(cfg: dict, session_id: Optional[str] = None) -> Optional[str
"""Proxy URL for httpx.AsyncClient(proxy=...). None when disabled.""" """Proxy URL for httpx.AsyncClient(proxy=...). None when disabled."""
if not is_enabled(cfg): if not is_enabled(cfg):
return None return None
from urllib.parse import quote
user, pwd = _build_auth(cfg, session_id) user, pwd = _build_auth(cfg, session_id)
return f"http://{user}:{pwd}@{cfg['host']}:{cfg['port']}" return f"http://{quote(user, safe='')}:{quote(pwd, safe='')}@{cfg['host']}:{cfg['port']}"
def direct_httpx_proxy(db): def direct_httpx_proxy(db):