From 7a897dcf6be90a80019cc6ca48cddac4a284692b Mon Sep 17 00:00:00 2001 From: fufesou Date: Tue, 16 May 2023 18:11:28 +0800 Subject: [PATCH 1/3] plugin_framework, add uuid on plugin signature verification Signed-off-by: fufesou --- src/plugin/callback_msg.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugin/callback_msg.rs b/src/plugin/callback_msg.rs index 9a82adfec..9024349ff 100644 --- a/src/plugin/callback_msg.rs +++ b/src/plugin/callback_msg.rs @@ -80,6 +80,7 @@ pub(super) struct MsgToExtSupport { #[derive(Debug, Serialize)] struct PluginSignReq { + uuid: Vec, peer_id: String, plugin_id: String, version: String, @@ -284,6 +285,7 @@ fn request_plugin_sign(id: String, msg_to_rustdesk: MsgToRustDesk) -> PluginRetu let sign_url = format!("{}/lic/web/api/plugin-sign", get_api_server()); let client = reqwest::blocking::Client::new(); let req = PluginSignReq { + uuid: hbb_common::get_uuid(), peer_id: crate::ui_interface::get_id(), plugin_id: id.clone(), version: signature_data.version, From 3d4abe046cf41d3d4b4f1b7dac448a726bf0c707 Mon Sep 17 00:00:00 2001 From: fufesou Date: Tue, 16 May 2023 20:29:58 +0800 Subject: [PATCH 2/3] plugin_framework, remove unused fields for plugin signature verification Signed-off-by: fufesou --- src/plugin/callback_msg.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/plugin/callback_msg.rs b/src/plugin/callback_msg.rs index 9024349ff..e510369a6 100644 --- a/src/plugin/callback_msg.rs +++ b/src/plugin/callback_msg.rs @@ -80,8 +80,6 @@ pub(super) struct MsgToExtSupport { #[derive(Debug, Serialize)] struct PluginSignReq { - uuid: Vec, - peer_id: String, plugin_id: String, version: String, msg: Vec, @@ -285,8 +283,6 @@ fn request_plugin_sign(id: String, msg_to_rustdesk: MsgToRustDesk) -> PluginRetu let sign_url = format!("{}/lic/web/api/plugin-sign", get_api_server()); let client = reqwest::blocking::Client::new(); let req = PluginSignReq { - uuid: hbb_common::get_uuid(), - peer_id: crate::ui_interface::get_id(), plugin_id: id.clone(), version: signature_data.version, msg: signature_data.data, From db5242aed3ee9ebe9dd6aed6bbb01865c6467339 Mon Sep 17 00:00:00 2001 From: fufesou Date: Tue, 16 May 2023 20:30:50 +0800 Subject: [PATCH 3/3] remove to-do Signed-off-by: fufesou --- src/plugin/callback_msg.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugin/callback_msg.rs b/src/plugin/callback_msg.rs index e510369a6..06b2e0165 100644 --- a/src/plugin/callback_msg.rs +++ b/src/plugin/callback_msg.rs @@ -278,7 +278,6 @@ fn request_plugin_sign(id: String, msg_to_rustdesk: MsgToRustDesk) -> PluginRetu "parse signature data '{}'", signature_data ); - // to-do: Request server to sign the data. thread::spawn(move || { let sign_url = format!("{}/lic/web/api/plugin-sign", get_api_server()); let client = reqwest::blocking::Client::new();