From f47758a35eadae2425abef5ada9eb592c2edb041 Mon Sep 17 00:00:00 2001 From: TommyLike Date: Mon, 6 May 2024 17:47:18 +0800 Subject: [PATCH] Fix unit testcases --- src/client/cmd/add.rs | 6 ++++-- src/client/file_handler/efi.rs | 8 ++++---- src/client/file_handler/generic.rs | 8 ++++---- src/client/file_handler/kernel_module.rs | 13 ++++++++----- src/client/file_handler/rpm.rs | 8 ++++---- src/control_admin_entrypoint.rs | 5 +---- src/infra/sign_plugin/x509.rs | 14 ++++++++++++-- src/util/options.rs | 2 +- 8 files changed, 38 insertions(+), 26 deletions(-) diff --git a/src/client/cmd/add.rs b/src/client/cmd/add.rs index c118c9c..e495d84 100644 --- a/src/client/cmd/add.rs +++ b/src/client/cmd/add.rs @@ -101,7 +101,7 @@ pub struct CommandAddHandler { sign_type: SignType, token: Option, rpm_v3: bool, - sign_options: Option> + sign_options: Option>, } impl CommandAddHandler { @@ -239,7 +239,9 @@ impl SignCommand for CommandAddHandler { fn validate(&mut self) -> Result<()> { let mut options = self.get_sign_options(); - FileHandlerFactory::get_handler(&self.file_type).validate_options(&mut options).expect("failed to validate add signature command options"); + FileHandlerFactory::get_handler(&self.file_type) + .validate_options(&mut options) + .expect("failed to validate add signature command options"); self.sign_options = Some(options); Ok(()) } diff --git a/src/client/file_handler/efi.rs b/src/client/file_handler/efi.rs index 4a059f8..51c0bcc 100644 --- a/src/client/file_handler/efi.rs +++ b/src/client/file_handler/efi.rs @@ -107,7 +107,7 @@ mod test { let mut options = HashMap::new(); options.insert(options::DETACHED.to_string(), "true".to_string()); let handler: EfiFileHandler = EfiFileHandler::new(); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_err()); assert_eq!( result.unwrap_err().to_string(), @@ -122,13 +122,13 @@ mod test { options::SIGN_TYPE.to_string(), SignType::Authenticode.to_string(), ); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_ok()); *options .get_mut(options::KEY_TYPE.to_string().as_str()) .unwrap() = KeyType::Pgp.to_string(); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_err()); assert_eq!( result.unwrap_err().to_string(), @@ -142,7 +142,7 @@ mod test { *options .get_mut(options::SIGN_TYPE.to_string().as_str()) .unwrap() = SignType::PKCS7.to_string(); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_err()); assert_eq!( result.unwrap_err().to_string(), diff --git a/src/client/file_handler/generic.rs b/src/client/file_handler/generic.rs index 2c8ca8d..2101506 100644 --- a/src/client/file_handler/generic.rs +++ b/src/client/file_handler/generic.rs @@ -89,7 +89,7 @@ mod test { let mut options = HashMap::new(); options.insert(options::DETACHED.to_string(), "false".to_string()); let handler = GenericFileHandler::new(); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_err()); assert_eq!( result.unwrap_err().to_string(), @@ -97,16 +97,16 @@ mod test { ); options.remove(options::DETACHED); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_ok()); options.insert(options::DETACHED.to_string(), "true".to_string()); options.insert(options::KEY_TYPE.to_string(), KeyType::Pgp.to_string()); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_ok()); options.insert(options::KEY_TYPE.to_string(), KeyType::X509EE.to_string()); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_err()); assert_eq!( result.unwrap_err().to_string(), diff --git a/src/client/file_handler/kernel_module.rs b/src/client/file_handler/kernel_module.rs index f0a7b9d..e11896a 100644 --- a/src/client/file_handler/kernel_module.rs +++ b/src/client/file_handler/kernel_module.rs @@ -175,7 +175,10 @@ impl FileHandler for KernelModuleFileHandler { )); } } - sign_options.insert(options::INCLUDE_PARENT_CERT.to_string(), "false".to_string()); + sign_options.insert( + options::INCLUDE_PARENT_CERT.to_string(), + "false".to_string(), + ); Ok(()) } @@ -321,7 +324,7 @@ mod test { let mut options = HashMap::new(); options.insert(options::KEY_TYPE.to_string(), KeyType::Pgp.to_string()); let handler = KernelModuleFileHandler::new(); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_err()); assert_eq!( result.unwrap_err().to_string(), @@ -333,7 +336,7 @@ mod test { options::SIGN_TYPE.to_string(), SignType::Authenticode.to_string(), ); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_err()); assert_eq!( result.unwrap_err().to_string(), @@ -341,11 +344,11 @@ mod test { ); options.insert(options::SIGN_TYPE.to_string(), SignType::Cms.to_string()); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_ok()); options.insert(options::SIGN_TYPE.to_string(), SignType::PKCS7.to_string()); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_ok()); } diff --git a/src/client/file_handler/rpm.rs b/src/client/file_handler/rpm.rs index 737962c..950a17c 100644 --- a/src/client/file_handler/rpm.rs +++ b/src/client/file_handler/rpm.rs @@ -77,7 +77,7 @@ impl RpmFileHandler { //todo: figure our why is much slower when async read & write with tokio is enabled. #[async_trait] impl FileHandler for RpmFileHandler { - fn validate_options(&self, sign_options:&mut HashMap) -> Result<()> { + fn validate_options(&self, sign_options: &mut HashMap) -> Result<()> { if let Some(detached) = sign_options.get(options::DETACHED) { if detached == "true" { return Err(Error::InvalidArgumentError( @@ -240,7 +240,7 @@ mod test { let mut options = HashMap::new(); options.insert(options::KEY_TYPE.to_string(), KeyType::X509EE.to_string()); let handler = RpmFileHandler::new(); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_err()); assert_eq!( result.unwrap_err().to_string(), @@ -249,7 +249,7 @@ mod test { options.insert(options::KEY_TYPE.to_string(), KeyType::Pgp.to_string()); options.insert(options::DETACHED.to_string(), "true".to_string()); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_err()); assert_eq!( result.unwrap_err().to_string(), @@ -257,7 +257,7 @@ mod test { ); options.insert(options::DETACHED.to_string(), "false".to_string()); - let result = handler.validate_options(&options); + let result = handler.validate_options(&mut options); assert!(result.is_ok()); } diff --git a/src/control_admin_entrypoint.rs b/src/control_admin_entrypoint.rs index 2fbdfea..250c28c 100644 --- a/src/control_admin_entrypoint.rs +++ b/src/control_admin_entrypoint.rs @@ -175,10 +175,7 @@ fn generate_keys_parameters(command: &CommandGenerateKeys) -> HashMap { let mut bufs: Vec> = vec![]; - if options.get(options::INCLUDE_PARENT_CERT).unwrap_or(&"true".to_string()) == "true" && self.parent_key.is_some() { + if options + .get(options::INCLUDE_PARENT_CERT) + .unwrap_or(&"true".to_string()) + == "true" + && self.parent_key.is_some() + { bufs.push( self.parent_key .clone() diff --git a/src/util/options.rs b/src/util/options.rs index d17efec..beff556 100644 --- a/src/util/options.rs +++ b/src/util/options.rs @@ -18,4 +18,4 @@ pub const DETACHED: &str = "detached"; pub const KEY_TYPE: &str = "key_type"; pub const SIGN_TYPE: &str = "sign_type"; pub const RPM_V3_SIGNATURE: &str = "rpm_signature_type"; -pub const INCLUDE_PARENT_CERT: &str = "include_parent_cert"; \ No newline at end of file +pub const INCLUDE_PARENT_CERT: &str = "include_parent_cert"; -- Gitee