TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-08 21:41:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor is_public

Browse Source
This commit is contained in:
rustdesk
2026-08-21 01:25:51 +08:00
parent 798b73beb1
commit c45f7d2dd2
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common.rs
View File

@@ -1087,8 +1087,15 @@ fn get_api_server_(api: String, custom: String) -> String {
#[inline] #[inline]
pub fn is_public(url: &str) -> bool { pub fn is_public(url: &str) -> bool {
let url = url.to_ascii_lowercase(); let parsed = url::Url::parse(url)
url.contains(".rustdesk.com") .ok()
.filter(|parsed| parsed.has_host())
.or_else(|| url::Url::parse(&format!("http://{url}")).ok());
let Some(host) = parsed.as_ref().and_then(url::Url::host_str) else {
return false;
};
let host = host.strip_suffix('.').unwrap_or(host);
host == "rustdesk.com" || host.ends_with(".rustdesk.com")
} }
pub fn get_udp_punch_enabled() -> bool { pub fn get_udp_punch_enabled() -> bool {
@@ -2880,6 +2887,16 @@ mod tests {
assert!(!is_public("rustdesk.comhello.com")); assert!(!is_public("rustdesk.comhello.com"));
} }
#[test]
fn test_is_public_matches_rustdesk_root_domain() {
assert!(is_public("rustdesk.com/"));
assert!(is_public("rustdesk.com:21117"));
assert!(is_public("api.rustdesk.com:21117"));
assert!(!is_public("hello-rustdesk.com"));
assert!(!is_public("api.rustdesk.com.evil.test"));
assert!(!is_public("https://rustdesk.com@evil.test"));
}
#[test] #[test]
fn test_should_use_tcp_proxy_for_api_url() { fn test_should_use_tcp_proxy_for_api_url() {
assert!(should_use_tcp_proxy_for_api_url( assert!(should_use_tcp_proxy_for_api_url(