Revert "fix: ci: macos: allow signed but not notarized dmg (#15530)"

This reverts commit 29e1852a68.

Cargo.lock

@@ -771,26 +771,6 @@ dependencies = [
  "syn 2.0.98",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.72.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
-dependencies = [
- "bitflags 2.9.1",
- "cexpr",
- "clang-sys",
- "itertools 0.12.1",
- "log",
- "prettyplease",
- "proc-macro2 1.0.93",
- "quote 1.0.36",
- "regex",
- "rustc-hash 2.1.1",
- "shlex",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "bit_field"
 version = "0.10.2"
@@ -2349,7 +2329,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.8.4",
+ "libloading 0.7.4",
 ]
 
 [[package]]
@@ -2714,7 +2694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -4514,7 +4494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
  "cfg-if 1.0.0",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -7454,7 +7434,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.11.0",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -7511,7 +7491,7 @@ dependencies = [
  "security-framework 3.5.1",
  "security-framework-sys",
  "webpki-root-certs",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -7598,7 +7578,7 @@ name = "scrap"
 version = "0.5.0"
 dependencies = [
  "android_logger",
- "bindgen 0.72.1",
+ "bindgen 0.65.1",
  "block",
  "cfg-if 1.0.0",
  "dbus",

flutter/lib/desktop/pages/server_page.dart

@@ -495,14 +495,14 @@ class _CmHeaderState extends State<_CmHeader>
                 if (client.type_() == ClientType.file)
                   FittedBox(
                     child: Text(
-                      translate("Transfer file"),
+                      translate("File Transfer"),
                       style: TextStyle(color: Colors.white70, fontSize: 12),
                     ),
                   ),
                 if (client.type_() == ClientType.camera)
                   FittedBox(
                     child: Text(
-                      translate("View camera"),
+                      translate("View Camera"),
                       style: TextStyle(color: Colors.white70, fontSize: 12),
                     ),
                   ),

libs/scrap/Cargo.toml

@@ -48,7 +48,7 @@ quest = "0.3"
 
 [build-dependencies]
 target_build_utils = "0.3"
-bindgen = "0.72.1"
+bindgen = "0.65"
 pkg-config = { version = "0.3.27", optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]

src/common.rs

@@ -2623,20 +2623,6 @@ pub fn is_direct_ip_access(peer: &str) -> bool {
     hbb_common::is_ip_str(peer) || hbb_common::is_domain_port_str(peer)
 }
 
-// Align the maximum length of the peer id to the maximum length of the peer id in the server.
-const MAX_UNTRUSTED_PEER_ID_LEN: usize = 253;
-const UNTRUSTED_PEER_ID_FORBIDDEN_CHARS: &[char] = &['"', '<', '>', '/', '\\', '|', '?', '*'];
-
-// Shared validation for peer/connect ids that cross untrusted boundaries before
-// they are stored or written into command/script contexts.
-pub fn is_valid_untrusted_peer_id(id: &str) -> bool {
-    !id.is_empty()
-        && id.len() <= MAX_UNTRUSTED_PEER_ID_LEN
-        && !id.chars().any(|ch| {
-            ch.is_control() || ch.is_whitespace() || UNTRUSTED_PEER_ID_FORBIDDEN_CHARS.contains(&ch)
-        })
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -2667,29 +2653,6 @@ mod tests {
         )
     }
 
-    #[test]
-    fn untrusted_peer_id_validation() {
-        let cases = [
-            ("123456789", true),
-            ("m\u{00FC}nchen-pc", true),
-            ("192.168.1.10:21118", true),
-            ("9123456234@public", true),
-            (
-                r#"1" & oWS.Run("cmd.exe /k whoami /priv",1,False) & ""#,
-                false,
-            ),
-            ("", false),
-            ("peer id", false),
-            ("peer\nid", false),
-            ("peer/id", false),
-            ("peer?id", false),
-        ];
-
-        for (id, expected) in cases {
-            assert_eq!(is_valid_untrusted_peer_id(id), expected, "{id:?}");
-        }
-    }
-
     // ThrottledInterval tick at the same time as tokio interval, if no sleeps
     #[allow(non_snake_case)]
     #[tokio::test]

src/lan.rs

@@ -241,14 +241,6 @@ fn wait_response(
                     Some(rendezvous_message::Union::PeerDiscovery(p)) => {
                         last_recv_time = Instant::now();
                         if p.cmd == "pong" {
-                            if !crate::common::is_valid_untrusted_peer_id(&p.id) {
-                                log::warn!(
-                                    "Ignoring LAN discovery response from {} with invalid peer id",
-                                    addr
-                                );
-                                continue;
-                            }
-
                             let local_mac = if try_get_ip_by_peer {
                                 if let Some(self_addr) = get_ipaddr_by_peer(&addr) {
                                     get_mac(&self_addr)

src/lang/ptbr.rs

@@ -112,7 +112,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Waiting", "Aguardando"),
         ("Finished", "Concluído"),
         ("Speed", "Velocidade"),
-        ("Custom Image Quality", "Qualidade de imagem personalizada"),
+        ("Custom Image Quality", "Qualidade Visual Personalizada"),
         ("Privacy mode", "Modo privado"),
         ("Block user input", "Bloquear entrada do usuário"),
         ("Unblock user input", "Desbloquear entrada do usuário"),
@@ -122,15 +122,15 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Stretch", "Aumentar"),
         ("Scrollbar", "Barra de rolagem"),
         ("ScrollAuto", "Rolagem automática"),
-        ("Good image quality", "Melhor qualidade"),
+        ("Good image quality", "Boa qualidade de imagem"),
         ("Balanced", "Balanceada"),
         ("Optimize reaction time", "Otimizar tempo de resposta"),
-        ("Custom", "Personalizada"),
+        ("Custom", "Personalizado"),
         ("Show remote cursor", "Mostrar cursor remoto"),
         ("Show quality monitor", "Exibir monitor de qualidade"),
         ("Disable clipboard", "Desabilitar área de transferência"),
         ("Lock after session end", "Bloquear após o fim da sessão"),
-        ("Insert Ctrl + Alt + Del", "Enviar Ctrl+Alt+Del"),
+        ("Insert Ctrl + Alt + Del", "Enviar Ctrl + Alt + Del"),
         ("Insert Lock", "Bloquear computador"),
         ("Refresh", "Atualizar"),
         ("ID does not exist", "ID não existe"),
@@ -332,7 +332,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("Relay Connection", "Conexão via Relay"),
         ("Secure Connection", "Conexão Segura"),
         ("Insecure Connection", "Conexão Insegura"),
-        ("Continue", "Continuar"),
+        ("Continue", ""),
         ("Scale original", "Escala original"),
         ("Scale adaptive", "Escala adaptada"),
         ("General", "Geral"),

src/platform/windows.rs

@@ -2278,10 +2278,6 @@ fn get_shortcut_icon_location(install_dir: &str, exe: &str) -> String {
 }
 
 pub fn create_shortcut(id: &str) -> ResultType<()> {
-    if !crate::common::is_valid_untrusted_peer_id(id) {
-        bail!("Invalid peer id for shortcut");
-    }
-
     let exe = std::env::current_exe()?.to_str().unwrap_or("").to_owned();
     // https://github.com/rustdesk/rustdesk/issues/13735
     // Replace ':' with '_' for filename since ':' is not allowed in Windows filenames