Mirror
/
acmed
mirror of https://github.com/breard-r/acmed.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Upgrade to clap 4.0

pull/67/head
Rodolphe Bréard 2 years ago
parent
a9b55ff788
commit
2b1ed2a8c2
4 changed files with 59 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      acmed/Cargo.toml
  2. 40
      acmed/src/main.rs
  3. 2
      tacd/Cargo.toml
  4. 62
      tacd/src/main.rs

2
acmed/Cargo.toml
View File

@ -23,7 +23,7 @@ openssl_vendored = ["crypto_openssl", "acme_common/openssl_vendored", "attohttpc
acme_common = { path = "../acme_common" } acme_common = { path = "../acme_common" }
attohttpc = { version = "0.22", default-features = false, features = ["charsets", "json"] } attohttpc = { version = "0.22", default-features = false, features = ["charsets", "json"] }
bincode = "1.3" bincode = "1.3"
clap = "3.0"
clap = { version = "4.0", features = ["string"] }
glob = "0.3" glob = "0.3"
log = "0.4" log = "0.4"
nom = { version = "7.0", default-features = false, features = [] } nom = { version = "7.0", default-features = false, features = [] }

40
acmed/src/main.rs
View File

@ -61,13 +61,13 @@ fn main() {
let default_log_level = DEFAULT_LOG_LEVEL.to_string().to_lowercase(); let default_log_level = DEFAULT_LOG_LEVEL.to_string().to_lowercase();
let matches = Command::new(APP_NAME) let matches = Command::new(APP_NAME)
.version(APP_VERSION) .version(APP_VERSION)
.long_version(full_version.as_str())
.long_version(&full_version)
.arg( .arg(
Arg::new("config") Arg::new("config")
.short('c') .short('c')
.long("config") .long("config")
.help("Path to the main configuration file") .help("Path to the main configuration file")
.takes_value(true)
.num_args(1)
.value_name("FILE") .value_name("FILE")
.default_value(DEFAULT_CONFIG_FILE), .default_value(DEFAULT_CONFIG_FILE),
) )
@ -75,9 +75,9 @@ fn main() {
Arg::new("log-level") Arg::new("log-level")
.long("log-level") .long("log-level")
.help("Specify the log level") .help("Specify the log level")
.takes_value(true)
.num_args(1)
.value_name("LEVEL") .value_name("LEVEL")
.possible_values(&["error", "warn", "info", "debug", "trace"])
.value_parser(["error", "warn", "info", "debug", "trace"])
.default_value(&default_log_level), .default_value(&default_log_level),
) )
.arg( .arg(
@ -102,10 +102,10 @@ fn main() {
Arg::new("pid-file") Arg::new("pid-file")
.long("pid-file") .long("pid-file")
.help("Path to the PID file") .help("Path to the PID file")
.takes_value(true)
.num_args(1)
.value_name("FILE") .value_name("FILE")
.default_value(DEFAULT_PID_FILE) .default_value(DEFAULT_PID_FILE)
.default_value_if("no-pid-file", None, None)
.default_value_if("no-pid-file", clap::builder::ArgPredicate::IsPresent, None)
.conflicts_with("no-pid-file"), .conflicts_with("no-pid-file"),
) )
.arg( .arg(
@ -118,16 +118,16 @@ fn main() {
Arg::new("root-cert") Arg::new("root-cert")
.long("root-cert") .long("root-cert")
.help("Add a root certificate to the trust store (can be set multiple times)") .help("Add a root certificate to the trust store (can be set multiple times)")
.takes_value(true)
.multiple_occurrences(true)
.num_args(1)
.action(clap::ArgAction::Append)
.value_name("FILE"), .value_name("FILE"),
) )
.get_matches(); .get_matches();
match set_log_system( match set_log_system(
matches.value_of("log-level"),
matches.is_present("to-syslog"),
matches.is_present("to-stderr"),
matches.get_one::<String>("log-level").map(|e| e.as_str()),
matches.contains_id("to-syslog"),
matches.contains_id("to-stderr"),
) { ) {
Ok(_) => {} Ok(_) => {}
Err(e) => { Err(e) => {
@ -136,22 +136,24 @@ fn main() {
} }
}; };
let root_certs = match matches.values_of("root-cert") {
Some(v) => v.collect(),
let root_certs = match matches.get_many::<String>("root-cert") {
Some(v) => v.map(|e| e.as_str()).collect(),
None => vec![], None => vec![],
}; };
init_server(
matches.is_present("foreground"),
matches.value_of("pid-file"),
);
let config_file = matches
.get_one::<String>("config")
.map(|e| e.as_str())
.unwrap_or(DEFAULT_CONFIG_FILE);
let pid_file = matches.get_one::<String>("pid-file").map(|e| e.as_str());
init_server(matches.contains_id("foreground"), pid_file);
let config_file = matches.value_of("config").unwrap_or(DEFAULT_CONFIG_FILE);
let mut srv = match MainEventLoop::new(config_file, &root_certs) { let mut srv = match MainEventLoop::new(config_file, &root_certs) {
Ok(s) => s, Ok(s) => s,
Err(e) => { Err(e) => {
error!("{}", e); error!("{}", e);
let _ = clean_pid_file(matches.value_of("pid-file"));
let _ = clean_pid_file(pid_file);
std::process::exit(1); std::process::exit(1);
} }
}; };

2
tacd/Cargo.toml
View File

@ -20,6 +20,6 @@ openssl_vendored = ["crypto_openssl", "acme_common/openssl_vendored"]
[dependencies] [dependencies]
acme_common = { path = "../acme_common" } acme_common = { path = "../acme_common" }
clap = "3.0"
clap = { version = "4.0", features = ["string"] }
log = "0.4" log = "0.4"
openssl = "0.10" openssl = "0.10"

62
tacd/src/main.rs
View File

@ -7,6 +7,7 @@ use acme_common::crypto::{get_lib_name, get_lib_version, HashFunction, KeyType,
use acme_common::error::Error; use acme_common::error::Error;
use acme_common::logs::{set_log_system, DEFAULT_LOG_LEVEL}; use acme_common::logs::{set_log_system, DEFAULT_LOG_LEVEL};
use acme_common::{clean_pid_file, to_idna}; use acme_common::{clean_pid_file, to_idna};
use clap::builder::PossibleValuesParser;
use clap::{Arg, ArgMatches, Command}; use clap::{Arg, ArgMatches, Command};
use log::{debug, error, info}; use log::{debug, error, info};
use std::fs::File; use std::fs::File;
@ -20,7 +21,7 @@ const DEFAULT_CRT_KEY_TYPE: KeyType = KeyType::EcdsaP256;
const DEFAULT_CRT_DIGEST: HashFunction = HashFunction::Sha256; const DEFAULT_CRT_DIGEST: HashFunction = HashFunction::Sha256;
const ALPN_ACME_PROTO_NAME: &[u8] = b"\x0aacme-tls/1"; const ALPN_ACME_PROTO_NAME: &[u8] = b"\x0aacme-tls/1";
fn read_line(path: Option<&str>) -> Result<String, Error> {
fn read_line(path: Option<&String>) -> Result<String, Error> {
let mut input = String::new(); let mut input = String::new();
match path { match path {
Some(p) => File::open(p)?.read_to_string(&mut input)?, Some(p) => File::open(p)?.read_to_string(&mut input)?,
@ -31,30 +32,38 @@ fn read_line(path: Option<&str>) -> Result<String, Error> {
} }
fn get_acme_value(cnf: &ArgMatches, opt: &str, opt_file: &str) -> Result<String, Error> { fn get_acme_value(cnf: &ArgMatches, opt: &str, opt_file: &str) -> Result<String, Error> {
match cnf.value_of(opt) {
match cnf.get_one::<String>(opt) {
Some(v) => Ok(v.to_string()), Some(v) => Ok(v.to_string()),
None => { None => {
debug!( debug!(
"reading {} from {}", "reading {} from {}",
opt, opt,
cnf.value_of(opt_file).unwrap_or("stdin")
cnf.get_one::<String>(opt_file)
.map(|e| e.as_str())
.unwrap_or("stdin")
); );
read_line(cnf.value_of(opt_file))
read_line(cnf.get_one::<String>(opt_file))
} }
} }
} }
fn init(cnf: &ArgMatches) -> Result<(), Error> { fn init(cnf: &ArgMatches) -> Result<(), Error> {
acme_common::init_server(cnf.is_present("foreground"), cnf.value_of("pid-file"));
acme_common::init_server(
cnf.contains_id("foreground"),
cnf.get_one::<String>("pid-file").map(|e| e.as_str()),
);
let domain = get_acme_value(cnf, "domain", "domain-file")?; let domain = get_acme_value(cnf, "domain", "domain-file")?;
let domain = to_idna(&domain)?; let domain = to_idna(&domain)?;
let ext = get_acme_value(cnf, "acme-ext", "acme-ext-file")?; let ext = get_acme_value(cnf, "acme-ext", "acme-ext-file")?;
let listen_addr = cnf.value_of("listen").unwrap_or(DEFAULT_LISTEN_ADDR);
let crt_signature_alg = match cnf.value_of("crt-signature-alg") {
let listen_addr = cnf
.get_one::<String>("listen")
.map(|e| e.as_str())
.unwrap_or(DEFAULT_LISTEN_ADDR);
let crt_signature_alg = match cnf.get_one::<&str>("crt-signature-alg") {
Some(alg) => alg.parse()?, Some(alg) => alg.parse()?,
None => DEFAULT_CRT_KEY_TYPE, None => DEFAULT_CRT_KEY_TYPE,
}; };
let crt_digest = match cnf.value_of("crt-digest") {
let crt_digest = match cnf.get_one::<&str>("crt-digest") {
Some(alg) => alg.parse()?, Some(alg) => alg.parse()?,
None => DEFAULT_CRT_DIGEST, None => DEFAULT_CRT_DIGEST,
}; };
@ -77,13 +86,13 @@ fn main() {
let default_log_level = DEFAULT_LOG_LEVEL.to_string().to_lowercase(); let default_log_level = DEFAULT_LOG_LEVEL.to_string().to_lowercase();
let matches = Command::new(APP_NAME) let matches = Command::new(APP_NAME)
.version(APP_VERSION) .version(APP_VERSION)
.long_version(full_version.as_str())
.long_version(&full_version)
.arg( .arg(
Arg::new("listen") Arg::new("listen")
.long("listen") .long("listen")
.short('l') .short('l')
.help("Host and port to listen on") .help("Host and port to listen on")
.takes_value(true)
.num_args(1)
.value_name("host:port|unix:path") .value_name("host:port|unix:path")
.default_value(DEFAULT_LISTEN_ADDR), .default_value(DEFAULT_LISTEN_ADDR),
) )
@ -92,7 +101,7 @@ fn main() {
.long("domain") .long("domain")
.short('d') .short('d')
.help("The domain that is being validated") .help("The domain that is being validated")
.takes_value(true)
.num_args(1)
.value_name("STRING") .value_name("STRING")
.conflicts_with("domain-file"), .conflicts_with("domain-file"),
) )
@ -100,7 +109,7 @@ fn main() {
Arg::new("domain-file") Arg::new("domain-file")
.long("domain-file") .long("domain-file")
.help("File from which is read the domain that is being validated") .help("File from which is read the domain that is being validated")
.takes_value(true)
.num_args(1)
.value_name("FILE") .value_name("FILE")
.conflicts_with("domain"), .conflicts_with("domain"),
) )
@ -109,7 +118,7 @@ fn main() {
.long("acme-ext") .long("acme-ext")
.short('e') .short('e')
.help("The acmeIdentifier extension to set in the self-signed certificate") .help("The acmeIdentifier extension to set in the self-signed certificate")
.takes_value(true)
.num_args(1)
.value_name("STRING") .value_name("STRING")
.conflicts_with("acme-ext-file"), .conflicts_with("acme-ext-file"),
) )
@ -117,7 +126,7 @@ fn main() {
Arg::new("acme-ext-file") Arg::new("acme-ext-file")
.long("acme-ext-file") .long("acme-ext-file")
.help("File from which is read the acmeIdentifier extension to set in the self-signed certificate") .help("File from which is read the acmeIdentifier extension to set in the self-signed certificate")
.takes_value(true)
.num_args(1)
.value_name("FILE") .value_name("FILE")
.conflicts_with("acme-ext"), .conflicts_with("acme-ext"),
) )
@ -125,27 +134,27 @@ fn main() {
Arg::new("crt-signature-alg") Arg::new("crt-signature-alg")
.long("crt-signature-alg") .long("crt-signature-alg")
.help("The certificate's signature algorithm") .help("The certificate's signature algorithm")
.takes_value(true)
.num_args(1)
.value_name("STRING") .value_name("STRING")
.possible_values(&KeyType::list_possible_values())
.value_parser(PossibleValuesParser::new(KeyType::list_possible_values()))
.default_value(&default_crt_key_type), .default_value(&default_crt_key_type),
) )
.arg( .arg(
Arg::new("crt-digest") Arg::new("crt-digest")
.long("crt-digest") .long("crt-digest")
.help("The certificate's digest algorithm") .help("The certificate's digest algorithm")
.takes_value(true)
.num_args(1)
.value_name("STRING") .value_name("STRING")
.possible_values(&HashFunction::list_possible_values())
.value_parser(PossibleValuesParser::new(HashFunction::list_possible_values()))
.default_value(&default_crt_digest), .default_value(&default_crt_digest),
) )
.arg( .arg(
Arg::new("log-level") Arg::new("log-level")
.long("log-level") .long("log-level")
.help("Specify the log level") .help("Specify the log level")
.takes_value(true)
.num_args(1)
.value_name("LEVEL") .value_name("LEVEL")
.possible_values(&["error", "warn", "info", "debug", "trace"])
.value_parser(["error", "warn", "info", "debug", "trace"])
.default_value(&default_log_level), .default_value(&default_log_level),
) )
.arg( .arg(
@ -170,10 +179,10 @@ fn main() {
Arg::new("pid-file") Arg::new("pid-file")
.long("pid-file") .long("pid-file")
.help("Path to the PID file") .help("Path to the PID file")
.takes_value(true)
.num_args(1)
.value_name("FILE") .value_name("FILE")
.default_value(DEFAULT_PID_FILE) .default_value(DEFAULT_PID_FILE)
.default_value_if("no-pid-file", None, None)
.default_value_if("no-pid-file", clap::builder::ArgPredicate::IsPresent, None)
.conflicts_with("no-pid-file"), .conflicts_with("no-pid-file"),
) )
.arg( .arg(
@ -185,9 +194,9 @@ fn main() {
.get_matches(); .get_matches();
match set_log_system( match set_log_system(
matches.value_of("log-level"),
matches.is_present("to-syslog"),
matches.is_present("to-stderr"),
matches.get_one::<String>("log-level").map(|e| e.as_str()),
matches.contains_id("to-syslog"),
matches.contains_id("to-stderr"),
) { ) {
Ok(_) => {} Ok(_) => {}
Err(e) => { Err(e) => {
@ -200,7 +209,8 @@ fn main() {
Ok(_) => {} Ok(_) => {}
Err(e) => { Err(e) => {
error!("{}", e); error!("{}", e);
let _ = clean_pid_file(matches.value_of("pid-file"));
let pid_file = matches.get_one::<String>("pid-file").map(|e| e.as_str());
let _ = clean_pid_file(pid_file);
std::process::exit(1); std::process::exit(1);
} }
}; };

Write Preview
Loading…
Cancel
Save