Teknium
45b0d8cab5
Every gateway/plugin platform adapter hard-coded aiohttp.ClientSession(trust_env=True) (~20 sites), so a gateway launched by a Windows Scheduled Task that inherits a stale HTTP_PROXY (Clash/V2Ray on 127.0.0.1:7890) looped on 'Cannot connect to host' with no way to opt out short of NO_PROXY hacks per vendor host. - gateway/platforms/base.py: gateway_trust_env() reads gateway.trust_env (default true); resolve_proxy_url() skips generic HTTP(S)_PROXY/ALL_PROXY + macOS system-proxy auto-detect when false (explicit per-platform vars still win). - All aiohttp ClientSession sites in weixin, qqbot, matrix, line, wecom, slack, sms, teams, google_chat now pass trust_env=gateway_trust_env(); mattermost + homeassistant bare sessions gain the same kwarg (intent of #70119 / #56229). - DEFAULT_CONFIG + cli-config.yaml.example + messaging docs. - tests/gateway/test_gateway_trust_env.py: config flip + no-bare-literal sweep. Reported-by: @ranlingfeng (#48820), @frontnopipe-cloud (#76309) Co-authored-by: rcarrata <rcarratalasanchez@gmail.com> Co-authored-by: Backroads4Me <TEDLANHAM@GMAIL.COM>
48 lines
2.2 KiB
Python
48 lines
2.2 KiB
Python
"""gateway.trust_env — one config key controls aiohttp proxy-env honoring at every adapter site (#48820)."""
|
|
import re
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from gateway.platforms import base as gw_base
|
|
|
|
REPO = Path(__file__).resolve().parents[2]
|
|
_ADAPTER_FILES = sorted(
|
|
list((REPO / "gateway" / "platforms").rglob("*.py"))
|
|
+ list((REPO / "plugins" / "platforms").rglob("*.py"))
|
|
)
|
|
|
|
|
|
def _write_config(tmp_path, monkeypatch, body: str) -> None:
|
|
# load_config caches on (path, mtime) — a fresh tmp HERMES_HOME per test is a fresh cache key.
|
|
monkeypatch.setenv("HERMES_HOME", str(tmp_path))
|
|
(tmp_path / "config.yaml").write_text(body)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"yaml_body, expected",
|
|
[("gateway:\n trust_env: false\n", False), ("gateway:\n trust_env: true\n", True), ("{}\n", True)],
|
|
)
|
|
def test_gateway_trust_env_reads_config(tmp_path, monkeypatch, yaml_body, expected):
|
|
"""gateway.trust_env in config.yaml drives the shared helper; absent → True (default)."""
|
|
_write_config(tmp_path, monkeypatch, yaml_body)
|
|
assert gw_base.gateway_trust_env() is expected
|
|
# The generic-proxy discovery path is gated by the same knob; explicit per-platform vars are not.
|
|
monkeypatch.setenv("HTTPS_PROXY", "http://127.0.0.1:7890")
|
|
monkeypatch.delenv("NO_PROXY", raising=False)
|
|
monkeypatch.delenv("no_proxy", raising=False)
|
|
assert (gw_base.resolve_proxy_url() is not None) is expected
|
|
monkeypatch.setenv("X_PLATFORM_PROXY", "http://127.0.0.1:1080")
|
|
assert gw_base.resolve_proxy_url("X_PLATFORM_PROXY") == "http://127.0.0.1:1080"
|
|
|
|
|
|
def test_no_bare_trust_env_literal_in_adapters():
|
|
"""Every aiohttp session in gateway/ + plugins/platforms/ must go through gateway_trust_env()."""
|
|
bare = re.compile(r"trust_env\s*=\s*(True|False)\b")
|
|
offenders = []
|
|
for path in _ADAPTER_FILES:
|
|
for lineno, line in enumerate(path.read_text(encoding="utf-8").splitlines(), 1):
|
|
if bare.search(line) and "httpx" not in line:
|
|
offenders.append(f"{path.relative_to(REPO)}:{lineno}: {line.strip()}")
|
|
assert not offenders, "hard-coded aiohttp trust_env literal(s); use gateway_trust_env():\n" + "\n".join(offenders)
|