feat: add configurable PID1-owned DoH forwarding
Default managed SOCKS hostname DNS to verified HTTPS with literal-IP bootstrap and no plaintext fallback. Supervise the loopback forwarder with private anchored readiness and preserve foreign markers. Include configuration, deployment, documentation and offline checks. Co-authored-by: GPT-6 <gpt-6@openai.com>
This commit is contained in:
1 parent
ea886e5bc8
commit
367d956ae3
20 files changed
+2383
-37
No files matched your search
@@ -32,7 +32,7 @@ with tempfile.TemporaryDirectory(prefix='target-config-') as tmp:
|
||||
('example.org', False), ('8.8.8.8\n', False), ('-d 8.8.8.8', False)):
|
||||
for path in private.iterdir():
|
||||
path.unlink()
|
||||
result = subprocess.run(['sh', str(entry)], env=dict(base, SS_DNS_SERVER=dns),
|
||||
result = subprocess.run(['sh', str(entry)], env=dict(base, ZAPRET_AUTOTUNE_DNS_MODE='native', SS_DNS_SERVER=dns),
|
||||
capture_output=True, timeout=5)
|
||||
assert result.returncode == (0 if valid else 64), result.stderr
|
||||
assert not result.stdout and base['SS_PASSWORD'].encode() not in result.stderr
|
||||
@@ -43,6 +43,24 @@ with tempfile.TemporaryDirectory(prefix='target-config-') as tmp:
|
||||
path = private / (name + '.json')
|
||||
assert path.stat().st_mode & 0o777 == 0o600
|
||||
assert json.loads(path.read_text())['password'] == base['SS_PASSWORD']
|
||||
for overrides, valid in (({}, True), ({'SS_DNS_SERVER': 'ignored.example'}, True),
|
||||
({'ZAPRET_AUTOTUNE_DOH_BOOTSTRAP_IPS': ''}, True),
|
||||
({'ZAPRET_AUTOTUNE_DNS_MODE': ''}, False),
|
||||
({'ZAPRET_AUTOTUNE_DOH_URL': 'http://secret.invalid/token'}, False),
|
||||
({'ZAPRET_AUTOTUNE_DOH_URL': 'https://secret.invalid/token'}, False),
|
||||
({'ZAPRET_AUTOTUNE_DOH_URL': 'https://secret.invalid/token',
|
||||
'ZAPRET_AUTOTUNE_DOH_BOOTSTRAP_IPS': ''}, False),
|
||||
({'ZAPRET_AUTOTUNE_DOH_URL': 'https://secret.invalid/token',
|
||||
'ZAPRET_AUTOTUNE_DOH_BOOTSTRAP_IPS': '192.0.2.1'}, True),
|
||||
({'ZAPRET_AUTOTUNE_DOH_TIMEOUT_SEC': '31'}, False)):
|
||||
for path in private.iterdir():
|
||||
path.unlink()
|
||||
result = subprocess.run(['sh', str(entry)], env=dict(base, **overrides), capture_output=True, timeout=5)
|
||||
assert result.returncode == (0 if valid else 64), result.stderr
|
||||
assert b'secret.invalid' not in result.stderr and b'token' not in result.stderr
|
||||
assert base['SS_PASSWORD'].encode() not in result.stdout + result.stderr
|
||||
if not valid:
|
||||
assert not list(private.iterdir())
|
||||
# Render privately, never print the config/password; config does not deploy.
|
||||
compose_env = {k: v for k, v in base.items() if not k.startswith('ZAPRET_AUTOTUNE_')}
|
||||
factory_cases = []
|
||||
@@ -74,9 +92,36 @@ with tempfile.TemporaryDirectory(prefix='target-config-') as tmp:
|
||||
assert settings['ZAPRET_AUTOTUNE_GOOGLEVIDEO_MODE'] == mode
|
||||
assert settings['ZAPRET_AUTOTUNE_GOOGLEVIDEO_VIDEO_IDS'] == overrides.get('ZAPRET_AUTOTUNE_GOOGLEVIDEO_VIDEO_IDS', '')
|
||||
assert settings['SS_DNS_SERVER'] == overrides.get('SS_DNS_SERVER', '')
|
||||
assert settings['ZAPRET_AUTOTUNE_DNS_MODE'] == 'doh'
|
||||
assert settings['ZAPRET_AUTOTUNE_DOH_URL'] == 'https://dns.google/dns-query'
|
||||
assert settings['ZAPRET_AUTOTUNE_DOH_BOOTSTRAP_IPS'] == ''
|
||||
assert settings['ZAPRET_AUTOTUNE_DOH_TIMEOUT_SEC'] == '5'
|
||||
assert settings['ZAPRET_AUTOTUNE_SOCKS_PROXY'] == 'socks5h://127.0.0.1:1080'
|
||||
factory_cases.append({'environment': {k: v for k, v in settings.items()
|
||||
if k.startswith('ZAPRET_AUTOTUNE_')}, 'ids': ids})
|
||||
# Validate the actual rendered DNS environment, not an invented equivalent.
|
||||
# Compose must not inject Google bootstrap into a custom-provider request.
|
||||
for service in ('0', '1'):
|
||||
for provider in ({}, {'ZAPRET_AUTOTUNE_DOH_URL': 'https://secret.invalid/token'}):
|
||||
for bootstrap in ({}, {'ZAPRET_AUTOTUNE_DOH_BOOTSTRAP_IPS': ''},
|
||||
{'ZAPRET_AUTOTUNE_DOH_BOOTSTRAP_IPS': '192.0.2.1'}):
|
||||
overrides = dict(provider, **bootstrap, ZAPRET_AUTOTUNE_YOUTUBE_SERVICE=service)
|
||||
result = subprocess.run(['docker', 'compose', '--env-file', '/dev/null', '-f',
|
||||
str(ROOT / 'deploy/managed-target/compose.yaml'),
|
||||
'config', '--format', 'json'], env=dict(compose_env, **overrides),
|
||||
capture_output=True, timeout=10)
|
||||
assert result.returncode == 0, 'Compose config failed (output suppressed)'
|
||||
settings = json.loads(result.stdout)['services']['target']['environment']
|
||||
assert settings['ZAPRET_AUTOTUNE_DOH_BOOTSTRAP_IPS'] == bootstrap.get('ZAPRET_AUTOTUNE_DOH_BOOTSTRAP_IPS', '')
|
||||
for path in private.iterdir():
|
||||
path.unlink()
|
||||
validated = subprocess.run(['sh', str(entry)], env=dict(env, **settings), capture_output=True, timeout=5)
|
||||
valid = not provider or bool(bootstrap.get('ZAPRET_AUTOTUNE_DOH_BOOTSTRAP_IPS'))
|
||||
assert validated.returncode == (0 if valid else 64), 'Rendered DNS config validation failed'
|
||||
assert b'secret.invalid' not in validated.stderr and b'token' not in validated.stderr
|
||||
assert base['SS_PASSWORD'].encode() not in validated.stdout + validated.stderr
|
||||
if not valid:
|
||||
assert not list(private.iterdir()), 'Invalid DNS config created service configs'
|
||||
# Only sanitized fixture settings cross into Go; never persist the password.
|
||||
fixture = root / 'compose-factory.json'
|
||||
fixture.write_text(json.dumps(factory_cases))
|
||||
|
||||
Reference in new issue
Block a user