rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make I/O and parsing TLS file errors distinct.

This commit is contained in:
Sergio Benitez 2017-05-12 14:38:18 -07:00
parent a9d9ef3867
commit 5e345e99d0
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/src/config/config.rs
View File

@ -382,12 +382,24 @@ impl Config {
#[cfg(feature = "tls")]
pub fn set_tls(&mut self, certs_path: &str, key_path: &str) -> Result<()> {
use hyper_rustls::util as tls;
use hyper_rustls::util::Error::Io;
let err = "nonexistent or invalid file";
let io_err = "nonexistent or unreadable file";
let pem_err = "malformed PEM file";
// Load the certificates.
let certs = tls::load_certs(certs_path)
.map_err(|_| self.bad_type("tls", err, "a readable certificates file"))?;
.map_err(|e| match e {
Io(_) => self.bad_type("tls", io_err, "a valid certificates file"),
_ => self.bad_type("tls", pem_err, "a valid certificates file")
})?;
// And now the private key.
let key = tls::load_private_key(key_path)
.map_err(|_| self.bad_type("tls", err, "a readable private key file"))?;
.map_err(|e| match e {
Io(_) => self.bad_type("tls", io_err, "a valid private key file"),
_ => self.bad_type("tls", pem_err, "a valid private key file")
})?;
self.tls = Some(TlsConfig { certs, key });
Ok(())