diff --git a/config/client.toml b/config/client.toml index 7219f28b12fa524a1c7f985fd7d79b7929c9a75a..23fa22b597c7428af7d84df61afb9d7b28cf5f6c 100644 --- a/config/client.toml +++ b/config/client.toml @@ -1,12 +1,12 @@ -working_dir = "/Users/tommylike/Work/codes/rust-projects/signatrust/.data/tempdir" +working_dir = "/Users/tommylike/Work/codes/rust-projects/gitee-signatrust/signatrust/.data/tempdir" worker_threads = 8 buffer_size = 20480 # consider the memory consumption if number bumped since all binaries will be stored in memory max_concurrency = 100 [server] domain_name = "signatrust.test.osinfra.cn" -tls_cert = "/Users/tommylike/Work/codes/rust-projects/gitee-signatrust/signatrust/.data/certs/client/server.crt" -tls_key = "/Users/tommylike/Work/codes/rust-projects/gitee-signatrust/signatrust/.data/certs/client/server.key" +#tls_cert = "/Users/tommylike/Work/codes/rust-projects/gitee-signatrust/signatrust/.data/certs/client/server.crt" +#tls_key = "/Users/tommylike/Work/codes/rust-projects/gitee-signatrust/signatrust/.data/certs/client/server.key" type = "single" server_address = "0.0.0.0" server_port = "8088" diff --git a/config/server.toml b/config/server.toml index b56f092a290bccbf2cdf5936702041670e250db9..065da47677f7c2dd7c035d1d15a77201719fd694 100644 --- a/config/server.toml +++ b/config/server.toml @@ -1,7 +1,7 @@ name = "application" -tls_cert = "/Users/tommylike/Work/codes/rust-projects/signatrust/.data/certs/server/server.crt" -tls_key = "/Users/tommylike/Work/codes/rust-projects/signatrust/.data/certs/server/server.key" -ca_root = "/Users/tommylike/Work/codes/rust-projects/signatrust/.data/certs/server/ca_root.pem" +#tls_cert = "/Users/tommylike/Work/codes/rust-projects/gitee-signatrust/signatrust/.data/certs/server/server.crt" +#tls_key = "/Users/tommylike/Work/codes/rust-projects/gitee-signatrust/signatrust/.data/certs/server/server.key" +#ca_root = "/Users/tommylike/Work/codes/rust-projects/gitee-signatrust/signatrust/.data/certs/server/ca_root.pem" [data-server] server_ip = "0.0.0.0" server_port = "8088" diff --git a/src/client/cmd/add.rs b/src/client/cmd/add.rs index 1e057696673e1dc81da1d04b8414a2bd246ea275..6e465bc7adfc8a46437ada67e54477d8e70da87a 100644 --- a/src/client/cmd/add.rs +++ b/src/client/cmd/add.rs @@ -142,14 +142,31 @@ impl CommandAddHandler { } } return Ok(container); - } else if self.file_candidates(self.path.extension().unwrap().to_str().unwrap())? { - return Ok(vec![sign_identity::SignIdentity::new( - self.file_type.clone(), - self.path.clone(), - self.key_type.clone(), - self.key_name.clone(), - self.get_sign_options(), - )]); + } else { + match self.path.extension() { + Some(extension) => { + if self.file_candidates(extension.to_str().unwrap()).is_ok() { + return Ok(vec![sign_identity::SignIdentity::new( + self.file_type.clone(), + self.path.clone(), + self.key_type.clone(), + self.key_name.clone(), + self.get_sign_options(), + )]); + } + } + None => { + if self.file_candidates("").is_ok() { + return Ok(vec![sign_identity::SignIdentity::new( + self.file_type.clone(), + self.path.clone(), + self.key_type.clone(), + self.key_name.clone(), + self.get_sign_options(), + )]); + } + } + } } Err(error::Error::NoFileCandidateError) }