Skip to content

Add path validation for cert and key #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 23, 2022
Merged

Add path validation for cert and key #181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d11df68
Add non empty path validation
trueleo Oct 23, 2022
eeb2374
Validate file as well
trueleo Oct 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions server/src/option.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,21 @@ where
S: Clone + clap::Args + StorageOpt,
{
/// The location of TLS Cert file
#[arg(long, env = "P_TLS_CERT_PATH", value_name = "path")]
#[arg(
long,
env = "P_TLS_CERT_PATH",
value_name = "path",
value_parser = validation::file_path
)]
pub tls_cert_path: Option<PathBuf>,

/// The location of TLS Private Key file
#[arg(long, env = "P_TLS_KEY_PATH", value_name = "path")]
#[arg(
long,
env = "P_TLS_KEY_PATH",
value_name = "path",
value_parser = validation::file_path
)]
pub tls_key_path: Option<PathBuf>,

/// The address on which the http server will listen.
Expand Down Expand Up @@ -251,3 +261,21 @@ where
"http".to_string()
}
}

pub(self) mod validation {
use std::path::PathBuf;

pub fn file_path(s: &str) -> Result<PathBuf, String> {
if s.is_empty() {
return Err("empty path".to_owned());
}

let path = PathBuf::from(s);

if !path.is_file() {
return Err("path specified does not point to an accessible file".to_string());
}

Ok(path)
}
}