Compare commits

...

1 Commits

Author SHA1 Message Date
Lev
fa17bb5cc6 TLS misconfiguration demoted to warning 2023-09-26 10:14:42 -07:00

View File

@@ -1,6 +1,6 @@
/// Parse the configuration file. /// Parse the configuration file.
use arc_swap::ArcSwap; use arc_swap::ArcSwap;
use log::{error, info}; use log::{error, info, warn};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
use serde::{Deserializer, Serializer}; use serde::{Deserializer, Serializer};
@@ -1342,30 +1342,38 @@ impl Config {
} }
// Validate TLS! // Validate TLS!
match self.general.tls_certificate.clone() { match self.general.tls_certificate {
Some(tls_certificate) => { Some(ref mut tls_certificate) => {
match load_certs(Path::new(&tls_certificate)) { match load_certs(Path::new(&tls_certificate)) {
Ok(_) => { Ok(_) => {
// Cert is okay, but what about the private key? // Cert is okay, but what about the private key?
match self.general.tls_private_key.clone() { match self.general.tls_private_key {
Some(tls_private_key) => match load_keys(Path::new(&tls_private_key)) { Some(ref tls_private_key) => {
Ok(_) => (), match load_keys(Path::new(&tls_private_key)) {
Err(err) => { Ok(_) => (),
error!("tls_private_key is incorrectly configured: {:?}", err); Err(err) => {
return Err(Error::BadConfig); warn!(
"tls_private_key is incorrectly configured: {:?}",
err
);
self.general.tls_private_key = None;
self.general.tls_certificate = None;
}
} }
}, }
None => { None => {
error!("tls_certificate is set, but the tls_private_key is not"); warn!("tls_certificate is set, but the tls_private_key is not");
return Err(Error::BadConfig); self.general.tls_private_key = None;
self.general.tls_certificate = None;
} }
}; };
} }
Err(err) => { Err(err) => {
error!("tls_certificate is incorrectly configured: {:?}", err); warn!("tls_certificate is incorrectly configured: {:?}", err);
return Err(Error::BadConfig); self.general.tls_private_key = None;
self.general.tls_certificate = None;
} }
} }
} }