fix: accept explicit socks5h for one-shot health
Preserve configured proxy DNS semantics while reusing strict URL and loopback validation. Cover proxy forwarding, legacy socks5, and unsafe endpoints with offline tests; document the managed DoH boundary. Co-authored-by: GPT-6 <gpt-6@openai.com>
This commit is contained in:
1 parent
721cad42ce
commit
544dda7c85
3 files changed
+26
-12
No files matched your search
@@ -109,8 +109,9 @@ not used and there is no direct fallback. The request times out after 30 seconds
|
|||||||
| `ZAPRET_AUTOTUNE_FAILURE_THRESHOLD` | `3` |
|
| `ZAPRET_AUTOTUNE_FAILURE_THRESHOLD` | `3` |
|
||||||
| `ZAPRET_AUTOTUNE_RECOVERY_COOLDOWN` | `30m` |
|
| `ZAPRET_AUTOTUNE_RECOVERY_COOLDOWN` | `30m` |
|
||||||
|
|
||||||
Configuration is parsed once per health invocation. The proxy must use `socks5`
|
Configuration is parsed once per health invocation. The proxy must use `socks5` or `socks5h`
|
||||||
with a loopback IP or `localhost`, port 1–65535, and no credentials/path/query.
|
with a loopback IP or `localhost`, port 1–65535, and no credentials/path/query/fragment.
|
||||||
|
Explicit `socks5h` uses proxy-side hostname resolution (encrypted DNS only with managed DoH configured); explicit `socks5` retains local DNS semantics.
|
||||||
Video IDs must be 11 characters; durations and the failure threshold must be
|
Video IDs must be 11 characters; durations and the failure threshold must be
|
||||||
positive. Explicit empty values are invalid. Interval, consecutive-failure
|
positive. Explicit empty values are invalid. Interval, consecutive-failure
|
||||||
threshold and cooldown configure `managed monitor` (the one-shot command still
|
threshold and cooldown configure `managed monitor` (the one-shot command still
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ func parseHealthConfig(lookup func(string) (string, bool)) (healthConfig, error)
|
|||||||
return healthConfig{}, err
|
return healthConfig{}, err
|
||||||
}
|
}
|
||||||
if !validLoopbackSOCKS(cfg.SOCKSProxy) {
|
if !validLoopbackSOCKS(cfg.SOCKSProxy) {
|
||||||
return healthConfig{}, fmt.Errorf("ZAPRET_AUTOTUNE_SOCKS_PROXY requires socks5://LOOPBACK:PORT without credentials")
|
return healthConfig{}, fmt.Errorf("ZAPRET_AUTOTUNE_SOCKS_PROXY requires socks5:// or socks5h://LOOPBACK:PORT without credentials")
|
||||||
}
|
}
|
||||||
if !videoIDPattern.MatchString(cfg.VideoID) {
|
if !videoIDPattern.MatchString(cfg.VideoID) {
|
||||||
return healthConfig{}, fmt.Errorf("ZAPRET_AUTOTUNE_VIDEO_ID requires an 11-character video ID")
|
return healthConfig{}, fmt.Errorf("ZAPRET_AUTOTUNE_VIDEO_ID requires an 11-character video ID")
|
||||||
@@ -112,11 +112,11 @@ func managedServiceEnabled(lookup func(string) (string, bool)) (bool, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func validLoopbackSOCKS(raw string) bool {
|
func validLoopbackSOCKS(raw string) bool {
|
||||||
if !validDiscoveryProxy(raw) {
|
u, err := url.Parse(raw)
|
||||||
|
if err != nil || (u.Scheme != "socks5" && u.Scheme != "socks5h") || strings.IndexFunc(raw, func(r rune) bool { return r < 32 || r == 127 }) >= 0 {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
u, err := url.Parse(raw)
|
if !validDiscoveryProxy(strings.Replace(raw, "socks5h://", "socks5://", 1)) {
|
||||||
if err != nil {
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
host := u.Hostname()
|
host := u.Hostname()
|
||||||
@@ -124,7 +124,7 @@ func validLoopbackSOCKS(raw string) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Managed probes send hostnames through the owned SS listener, not local DNS.
|
// Managed probes send hostnames through the owned SS listener, not local DNS.
|
||||||
// Legacy public discovery/health parsing deliberately keeps socks5 semantics.
|
// Public health preserves the explicit scheme; public discovery keeps socks5.
|
||||||
func managedProbeProxy(raw string) (string, error) {
|
func managedProbeProxy(raw string) (string, error) {
|
||||||
u, err := url.Parse(raw)
|
u, err := url.Parse(raw)
|
||||||
if err != nil || (u.Scheme != "socks5" && u.Scheme != "socks5h") || strings.IndexFunc(raw, func(r rune) bool { return r < 32 || r == 127 }) >= 0 {
|
if err != nil || (u.Scheme != "socks5" && u.Scheme != "socks5h") || strings.IndexFunc(raw, func(r rune) bool { return r < 32 || r == 127 }) >= 0 {
|
||||||
|
|||||||
@@ -37,8 +37,8 @@ func TestHealthConfigDefaultsAndOverrides(t *testing.T) {
|
|||||||
if err != nil || !reflect.DeepEqual(cfg, want) {
|
if err != nil || !reflect.DeepEqual(cfg, want) {
|
||||||
t.Fatalf("overrides = %+v, %v; want %+v", cfg, err, want)
|
t.Fatalf("overrides = %+v, %v; want %+v", cfg, err, want)
|
||||||
}
|
}
|
||||||
for _, proxy := range []string{"socks5://localhost:1", "socks5://LOCALHOST:65535", "socks5://127.0.0.2:11080", "socks5://[::1]:11080"} {
|
for _, proxy := range []string{"socks5://localhost:1", "socks5://LOCALHOST:65535", "socks5://127.0.0.2:11080", "socks5://[::1]:11080", "socks5h://localhost:1", "socks5h://LOCALHOST:65535", "socks5h://127.0.0.2:11080", "socks5h://[::1]:11080"} {
|
||||||
if _, err := parseHealthConfig(configLookup(map[string]string{"ZAPRET_AUTOTUNE_SOCKS_PROXY": proxy})); err != nil {
|
if cfg, err := parseHealthConfig(configLookup(map[string]string{"ZAPRET_AUTOTUNE_SOCKS_PROXY": proxy})); err != nil || cfg.SOCKSProxy != proxy {
|
||||||
t.Errorf("valid loopback rejected: %s: %v", proxy, err)
|
t.Errorf("valid loopback rejected: %s: %v", proxy, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -47,12 +47,14 @@ func TestHealthConfigDefaultsAndOverrides(t *testing.T) {
|
|||||||
func TestHealthConfigRejectsInvalid(t *testing.T) {
|
func TestHealthConfigRejectsInvalid(t *testing.T) {
|
||||||
invalid := map[string][]string{
|
invalid := map[string][]string{
|
||||||
"ZAPRET_AUTOTUNE_SOCKS_PROXY": {
|
"ZAPRET_AUTOTUNE_SOCKS_PROXY": {
|
||||||
"", "http://127.0.0.1:11080", "socks5h://127.0.0.1:11080",
|
"", "http://127.0.0.1:11080", "https://127.0.0.1:11080", "socks4://127.0.0.1:11080",
|
||||||
"socks5://192.168.1.1:11080", "socks5://0.0.0.0:11080", "socks5://[::]:11080",
|
"socks5://192.168.1.1:11080", "socks5://0.0.0.0:11080", "socks5://[::]:11080",
|
||||||
"socks5://proxy.example:11080", "socks5://localhost.evil:11080",
|
"socks5://proxy.example:11080", "socks5://localhost.evil:11080",
|
||||||
"socks5://user:SECRET@localhost:11080", "socks5://localhost", "socks5://localhost:0",
|
"socks5://user:SECRET@localhost:11080", "socks5://localhost", "socks5://localhost:0",
|
||||||
"socks5://localhost:65536", "socks5://localhost:bad", "socks5://localhost:11080/path",
|
"socks5://localhost:65536", "socks5://localhost:bad", "socks5://localhost:11080/path",
|
||||||
"socks5://localhost:11080?SECRET", "socks5://localhost:11080#SECRET", " socks5://localhost:11080",
|
"socks5://localhost:11080?SECRET", "socks5://localhost:11080#SECRET", " socks5://localhost:11080",
|
||||||
|
"socks5://@localhost:11080", "socks5://SECRET@localhost:11080", "socks5://localhost:11080?", "socks5://localhost:11080#",
|
||||||
|
"socks5://localhost:11080\x00", "socks5://localhost:11080\x1f", "socks5://localhost:11080\x7f",
|
||||||
},
|
},
|
||||||
"ZAPRET_AUTOTUNE_VIDEO_ID": {"", "short", "dQw4w9WgXc!"},
|
"ZAPRET_AUTOTUNE_VIDEO_ID": {"", "short", "dQw4w9WgXc!"},
|
||||||
"ZAPRET_AUTOTUNE_HEALTH_INTERVAL": {"", "0", "-5m", "5", "SECRET", "999999999999999999999h"},
|
"ZAPRET_AUTOTUNE_HEALTH_INTERVAL": {"", "0", "-5m", "5", "SECRET", "999999999999999999999h"},
|
||||||
@@ -60,6 +62,13 @@ func TestHealthConfigRejectsInvalid(t *testing.T) {
|
|||||||
"ZAPRET_AUTOTUNE_FAILURE_THRESHOLD": {"", "0", "-3", "1.5", "SECRET", "999999999999999999999"},
|
"ZAPRET_AUTOTUNE_FAILURE_THRESHOLD": {"", "0", "-3", "1.5", "SECRET", "999999999999999999999"},
|
||||||
}
|
}
|
||||||
for key, values := range invalid {
|
for key, values := range invalid {
|
||||||
|
if key == "ZAPRET_AUTOTUNE_SOCKS_PROXY" {
|
||||||
|
for _, value := range values {
|
||||||
|
if strings.HasPrefix(value, "socks5://") {
|
||||||
|
values = append(values, strings.Replace(value, "socks5://", "socks5h://", 1))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
for _, value := range values {
|
for _, value := range values {
|
||||||
if _, err := parseHealthConfig(configLookup(map[string]string{key: value})); err == nil || !strings.Contains(err.Error(), key) || strings.Contains(err.Error(), "SECRET") {
|
if _, err := parseHealthConfig(configLookup(map[string]string{key: value})); err == nil || !strings.Contains(err.Error(), key) || strings.Contains(err.Error(), "SECRET") {
|
||||||
t.Errorf("%s=%q: expected sanitized config error, got %v", key, value, err)
|
t.Errorf("%s=%q: expected sanitized config error, got %v", key, value, err)
|
||||||
@@ -105,8 +114,10 @@ func setHealthEnvironment(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestRunHealthYoutube(t *testing.T) {
|
func TestRunHealthYoutube(t *testing.T) {
|
||||||
|
for _, proxy := range []string{"socks5://[::1]:12080", "socks5h://[::1]:12080", "socks5h://127.0.0.1:11082"} {
|
||||||
|
t.Run(proxy, func(t *testing.T) {
|
||||||
setHealthEnvironment(t)
|
setHealthEnvironment(t)
|
||||||
t.Setenv("ZAPRET_AUTOTUNE_SOCKS_PROXY", "socks5://[::1]:12080")
|
t.Setenv("ZAPRET_AUTOTUNE_SOCKS_PROXY", proxy)
|
||||||
t.Setenv("ZAPRET_AUTOTUNE_VIDEO_ID", "abcdefghijk")
|
t.Setenv("ZAPRET_AUTOTUNE_VIDEO_ID", "abcdefghijk")
|
||||||
for _, key := range []string{"ALL_PROXY", "HTTPS_PROXY", "https_proxy", "all_proxy"} {
|
for _, key := range []string{"ALL_PROXY", "HTTPS_PROXY", "https_proxy", "all_proxy"} {
|
||||||
t.Setenv(key, "http://untrusted.example:8080")
|
t.Setenv(key, "http://untrusted.example:8080")
|
||||||
@@ -120,7 +131,7 @@ func TestRunHealthYoutube(t *testing.T) {
|
|||||||
if !ok || time.Until(deadline) <= 0 || time.Until(deadline) > 35*time.Second {
|
if !ok || time.Until(deadline) <= 0 || time.Until(deadline) > 35*time.Second {
|
||||||
t.Error("request must have bounded deadline")
|
t.Error("request must have bounded deadline")
|
||||||
}
|
}
|
||||||
prefix := []string{"--disable", "--silent", "--show-error", "--fail", "--max-time", "30", "--noproxy", "", "--proxy", "socks5://[::1]:12080", "--user-agent", playerUserAgent, "--json"}
|
prefix := []string{"--disable", "--silent", "--show-error", "--fail", "--max-time", "30", "--noproxy", "", "--proxy", proxy, "--user-agent", playerUserAgent, "--json"}
|
||||||
if len(args) != len(prefix)+2 || !reflect.DeepEqual(args[:len(prefix)], prefix) || args[len(args)-1] != playerURL {
|
if len(args) != len(prefix)+2 || !reflect.DeepEqual(args[:len(prefix)], prefix) || args[len(args)-1] != playerURL {
|
||||||
t.Fatalf("unexpected proxy/API arguments: %q", args)
|
t.Fatalf("unexpected proxy/API arguments: %q", args)
|
||||||
}
|
}
|
||||||
@@ -137,6 +148,8 @@ func TestRunHealthYoutube(t *testing.T) {
|
|||||||
if code := runWithPlayer([]string{"health", "youtube"}, &stdout, &stderr, runner); code != 0 || calls != 1 || stderr.Len() != 0 || !strings.Contains(stdout.String(), "Player API: OK (not a playback check)") {
|
if code := runWithPlayer([]string{"health", "youtube"}, &stdout, &stderr, runner); code != 0 || calls != 1 || stderr.Len() != 0 || !strings.Contains(stdout.String(), "Player API: OK (not a playback check)") {
|
||||||
t.Fatalf("code=%d calls=%d stdout=%q stderr=%q", code, calls, &stdout, &stderr)
|
t.Fatalf("code=%d calls=%d stdout=%q stderr=%q", code, calls, &stdout, &stderr)
|
||||||
}
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestHealthYoutubeFailures(t *testing.T) {
|
func TestHealthYoutubeFailures(t *testing.T) {
|
||||||
|
|||||||
Reference in new issue
Block a user