hatter/acme-client-rs
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: fix warn

Browse Source
This commit is contained in:
Hatter Jiang
2021-05-05 00:27:53 +08:00
parent 94ce425e37
commit e80dded0ed
3 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/config.rs
View File

@@ -2,14 +2,12 @@ use serde::{Deserialize, Serialize};
use rust_util::util_file;
use rust_util::XResult;
use std::fs;
use std::fs::File;
use std::io::Read;
use acme_lib::DirectoryUrl;
use std::path::PathBuf;
use std::str::FromStr;
use crate::x509;
use crate::x509::{X509PublicKeyAlgo, X509EcPublicKeyAlgo, X509Certificate};
use std::time::{SystemTime, Duration};
use std::time::SystemTime;
pub const CERT_NAME: &str = "cert.pem";
pub const KEY_NAME: &str = "key.pem";
@@ -29,9 +27,9 @@ impl Default for AcmeAlgo {
}
impl AcmeAlgo {
pub fn parse_or_default(s: &str) -> AcmeAlgo {
Self::parse(s).unwrap_or_else(|_| Default::default())
}
// pub fn parse_or_default(s: &str) -> AcmeAlgo {
// Self::parse(s).unwrap_or_else(|_| Default::default())
// }
pub fn parse(s: &str) -> XResult<AcmeAlgo> {
match s {
@@ -59,9 +57,9 @@ impl Default for AcmeMode {
}
impl AcmeMode {
pub fn parse_or_default(s: &str) -> AcmeMode {
Self::parse(s).unwrap_or_else(|_| Default::default())
}
// pub fn parse_or_default(s: &str) -> AcmeMode {
// Self::parse(s).unwrap_or_else(|_| Default::default())
// }
pub fn parse(s: &str) -> XResult<AcmeMode> {
match s {
@@ -90,17 +88,17 @@ pub struct AcmeConfig {
}
impl AcmeConfig {
pub fn get_auth_timeout(&self) -> u64 {
self.auth_timeout.unwrap_or(5_000)
}
pub fn get_csr_timeout(&self) -> u64 {
self.csr_timeout.unwrap_or(5_000)
}
pub fn get_concurrent(&self) -> u32 {
self.concurrent.unwrap_or(0)
}
// pub fn get_auth_timeout(&self) -> u64 {
// self.auth_timeout.unwrap_or(5_000)
// }
//
// pub fn get_csr_timeout(&self) -> u64 {
// self.csr_timeout.unwrap_or(5_000)
// }
//
// pub fn get_concurrent(&self) -> u32 {
// self.concurrent.unwrap_or(0)
// }
}
#[derive(Clone, Debug, Serialize, Deserialize)]
@@ -194,10 +192,10 @@ impl CertConfigItem {
}
}
pub fn load_acme_config(file: Option<&str>, load_default: bool) -> XResult<AcmeConfig> {
pub fn load_acme_config(file: Option<&str>, load_default: bool) -> XResult<Option<AcmeConfig>> {
if let Some(file) = file {
let s = opt_result!(util_file::read_file_content(file), "Read file: {}, failed: {}", file);
return Ok(opt_result!(deser_hjson::from_str(&s), "Parse acme config file: {}, failed: {}", file));
return Ok(Some(opt_result!(deser_hjson::from_str(&s), "Parse acme config file: {}, failed: {}", file)));
}
if load_default {
@@ -207,9 +205,9 @@ pub fn load_acme_config(file: Option<&str>, load_default: bool) -> XResult<AcmeC
]);
if let Some(default_config) = default_config {
let s = opt_result!(fs::read_to_string(default_config.clone()), "Read file: {:?}, failed: {}", default_config);
return Ok(opt_result!(deser_hjson::from_str(&s), "Parse acme config file: {:?}, failed: {}", default_config));
return Ok(Some(opt_result!(deser_hjson::from_str(&s), "Parse acme config file: {:?}, failed: {}", default_config)));
}
}
simple_error!("Acme config file not found!")
Ok(None)
}