hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix get_custom_server_from_string, relay= is not used (#9069)

Browse Source 
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
21pages 2024-08-15 09:57:12 +08:00 committed by GitHub
parent cc9b7e64eb
commit 85ae3916cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/custom_server.rs
View File

@ -59,30 +59,30 @@ pub fn get_custom_server_from_string(s: &str) -> ResultType<CustomServer> {
if s.contains("host=") { if s.contains("host=") {
let stripped = &s[s.find("host=").unwrap_or(0)..s.len()]; let stripped = &s[s.find("host=").unwrap_or(0)..s.len()];
let strs: Vec<&str> = stripped.split(",").collect(); let strs: Vec<&str> = stripped.split(",").collect();
let mut host = ""; let mut host = String::default();
let mut key = ""; let mut key = String::default();
let mut api = ""; let mut api = String::default();
let mut relay = ""; let mut relay = String::default();
let strs_iter = strs.iter(); let strs_iter = strs.iter();
for el in strs_iter { for el in strs_iter {
if el.starts_with("host=") { if el.starts_with("host=") {
host = &el[5..el.len()]; host = el.chars().skip(5).collect();
} }
if el.starts_with("key=") { if el.starts_with("key=") {
key = &el[4..el.len()]; key = el.chars().skip(4).collect();
} }
if el.starts_with("api=") { if el.starts_with("api=") {
api = &el[4..el.len()]; api = el.chars().skip(4).collect();
} }
if el.starts_with("relay=") { if el.starts_with("relay=") {
relay = &el[4..el.len()]; relay = el.chars().skip(6).collect();
} }
} }
return Ok(CustomServer { return Ok(CustomServer {
host: host.to_owned(), host,
key: key.to_owned(), key,
api: api.to_owned(), api,
relay: relay.to_owned(), relay,
}); });
} else { } else {
let s = s let s = s
@ -146,7 +146,9 @@ mod test {
} }
); );
assert_eq!( assert_eq!(
get_custom_server_from_string("rustdesk-host=server.example.net,key=Zm9vYmFyLiwyCg==,.exe") get_custom_server_from_string(
"rustdesk-host=server.example.net,key=Zm9vYmFyLiwyCg==,.exe"
)
.unwrap(), .unwrap(),
CustomServer { CustomServer {
host: "server.example.net".to_owned(), host: "server.example.net".to_owned(),
@ -155,6 +157,18 @@ mod test {
relay: "".to_owned(), relay: "".to_owned(),
} }
); );
assert_eq!(
get_custom_server_from_string(
"rustdesk-host=server.example.net,key=Zm9vYmFyLiwyCg==,relay=server.example.net.exe"
)
.unwrap(),
CustomServer {
host: "server.example.net".to_owned(),
key: "Zm9vYmFyLiwyCg==".to_owned(),
api: "".to_owned(),
relay: "server.example.net".to_owned(),
}
);
let lic = CustomServer { let lic = CustomServer {
host: "1.1.1.1".to_owned(), host: "1.1.1.1".to_owned(),
key: "5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=".to_owned(), key: "5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=".to_owned(),