gitea-admin/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-10-27 16:22:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(sysproxy): use platform-specific bypass separator (#7559)

Browse Source 
* fix(sysproxy): use platform bypass separator

* refactor: squash conditional compilation logic

- Share a single `BYPASS_SEPERATOR` definition between both Linux and macOS

---------

Co-authored-by: Ayanami <ay@nami.ltd>
Co-authored-by: ❤是纱雾酱哟～ <49941141+Dragon1573@users.noreply.github.com>
Co-authored-by: oomeow <oomeow@outlook.com>
This commit is contained in:
ayanamislover
2026-08-19 13:55:40 +00:00
committed by GitHub
co-authored by Ayanami ❤是纱雾酱哟～ oomeow
parent 9b9feb9a39
commit 349c635de0
1 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/core/sysopt.rs
+46 -10
View File
@@ -255,24 +255,32 @@ impl Default for Sysopt {
#[cfg(target_os = "windows")]
static DEFAULT_BYPASS: &str = "localhost;127.*;192.168.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;<local>";
#[cfg(target_os = "windows")]
static BYPASS_SEPARATOR: &str = ";";
#[cfg(target_os = "linux")]
static DEFAULT_BYPASS: &str = "localhost,127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,::1";
#[cfg(any(target_os = "linux", target_os = "macos"))]
static BYPASS_SEPARATOR: &str = ",";
#[cfg(target_os = "macos")]
static DEFAULT_BYPASS: &str =
"127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,localhost,*.local,*.crashlytics.com,<local>";
fn format_bypass(use_default: bool, custom_bypass: &str) -> String {
if custom_bypass.is_empty() {
DEFAULT_BYPASS.into()
} else if use_default {
format!("{DEFAULT_BYPASS}{BYPASS_SEPARATOR}{custom_bypass}").into()
} else {
custom_bypass.into()
}
}
async fn get_bypass() -> String {
let verge = Config::verge().await.latest_arc();
let use_default = verge.use_default_bypass.unwrap_or(true);
let custom_bypass = verge.system_proxy_bypass.as_deref().unwrap_or("");
if custom_bypass.is_empty() {
DEFAULT_BYPASS.into()
} else if use_default {
format!("{DEFAULT_BYPASS},{custom_bypass}").into()
} else {
custom_bypass.into()
}
format_bypass(use_default, custom_bypass)
}
singleton!(Sysopt, SYSOPT);
@@ -560,14 +568,42 @@ impl Sysopt {
#[cfg(test)]
mod tests {
use super::{
AuthoritativeState, OsProxyState, ProxyApplyStep, SystemProxyStateUnknown, authoritative_state,
authoritative_state_from, classify_os_proxy_state, disable_both, disable_until_the_last_write_is_ours,
first_failure, proxy_apply_steps, recover_from_failed_write, target_is_already_in_place,
AuthoritativeState, BYPASS_SEPARATOR, DEFAULT_BYPASS, OsProxyState, ProxyApplyStep, SystemProxyStateUnknown,
authoritative_state, authoritative_state_from, classify_os_proxy_state, disable_both,
disable_until_the_last_write_is_ours, first_failure, format_bypass, proxy_apply_steps,
recover_from_failed_write, target_is_already_in_place,
};
use parking_lot::Mutex;
use std::collections::VecDeque;
use sysproxy::{Autoproxy, Sysproxy};
#[test]
fn empty_custom_bypass_uses_defaults() {
assert_eq!(format_bypass(false, ""), DEFAULT_BYPASS);
}
#[test]
fn custom_bypass_can_replace_defaults() {
assert_eq!(format_bypass(false, "example.com"), "example.com");
}
#[test]
fn default_and_custom_bypass_use_platform_separator() {
assert_eq!(
format_bypass(true, "example.com"),
format!("{DEFAULT_BYPASS}{BYPASS_SEPARATOR}example.com")
);
}
#[cfg(target_os = "windows")]
#[test]
fn windows_default_and_custom_bypass_use_semicolon() {
assert_eq!(
format_bypass(true, "example.com"),
format!("{DEFAULT_BYPASS};example.com")
);
}
async fn record_disable_sequence(
drained: bool,
second_drain: bool,