rest-server: check permissions on proxy.key and proxy.pem files
To avoid openssl's unhelpful error messages when the proxy.key or proxy.pem files have the wrong permissions, we open the files. To load the private key, we can simply read from the file and pass it to the `set_private_key` openssl function. Sadly such a function does not exist for loading certificate chains, so we have to open and close the file before calling the `set_certificate_chain_file` fn. Motivation: https://forum.proxmox.com/threads/proxmox-backup-tailscale-proxmox-backup-proxy-service-wont-boot.153204 Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
This commit is contained in:
parent
db69867d4d
commit
d8fa495a50
@ -12,13 +12,13 @@ use std::pin::{pin, Pin};
|
|||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use anyhow::{format_err, Context as _, Error};
|
use anyhow::{format_err, Context, Error};
|
||||||
use futures::FutureExt;
|
use futures::FutureExt;
|
||||||
use hyper::server::accept;
|
use hyper::server::accept;
|
||||||
use openssl::ec::{EcGroup, EcKey};
|
use openssl::ec::{EcGroup, EcKey};
|
||||||
use openssl::nid::Nid;
|
use openssl::nid::Nid;
|
||||||
use openssl::pkey::{PKey, Private};
|
use openssl::pkey::{PKey, Private};
|
||||||
use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod};
|
use openssl::ssl::{SslAcceptor, SslMethod};
|
||||||
use openssl::x509::X509;
|
use openssl::x509::X509;
|
||||||
use tokio::net::{TcpListener, TcpStream};
|
use tokio::net::{TcpListener, TcpStream};
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
@ -99,9 +99,17 @@ impl TlsAcceptorBuilder {
|
|||||||
.context("failed to set tls acceptor certificate")?;
|
.context("failed to set tls acceptor certificate")?;
|
||||||
}
|
}
|
||||||
Some(Tls::FilesPem(key, cert)) => {
|
Some(Tls::FilesPem(key, cert)) => {
|
||||||
|
let key_content = std::fs::read(&key)
|
||||||
|
.with_context(|| format!("Failed to read from private key file {:?}", key))?;
|
||||||
acceptor
|
acceptor
|
||||||
.set_private_key_file(key, SslFiletype::PEM)
|
.set_private_key(PKey::private_key_from_pem(&key_content)?.as_ref())
|
||||||
.context("failed to set tls acceptor private key file")?;
|
.context("failed to set tls acceptor private key file")?;
|
||||||
|
|
||||||
|
{
|
||||||
|
// Check the permissions by opening the file
|
||||||
|
let _cert_fd = std::fs::File::open(&cert)
|
||||||
|
.with_context(|| format!("Failed to open certificate at {:?}", cert))?;
|
||||||
|
}
|
||||||
acceptor
|
acceptor
|
||||||
.set_certificate_chain_file(cert)
|
.set_certificate_chain_file(cert)
|
||||||
.context("failed to set tls acceptor certificate chain file")?;
|
.context("failed to set tls acceptor certificate chain file")?;
|
||||||
|
Loading…
Reference in New Issue
Block a user