Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

adds context to filesystem calls for nginx

Browse Source
This commit is contained in:
Keagan McClelland
2021-09-20 12:32:11 -06:00
parent 80a6a4e1ca
commit 28bb518d6b
1 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
appmgr/src/net/nginx.rs
View File

@@ -2,6 +2,7 @@ use std::collections::HashMap;
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use std::path::PathBuf; use std::path::PathBuf;
use futures::FutureExt;
use indexmap::{IndexMap, IndexSet}; use indexmap::{IndexMap, IndexSet};
use sqlx::SqlitePool; use sqlx::SqlitePool;
use tokio::sync::Mutex; use tokio::sync::Mutex;
@@ -10,7 +11,7 @@ use super::interface::{InterfaceId, LanPortConfig};
use super::ssl::SslManager; use super::ssl::SslManager;
use crate::s9pk::manifest::PackageId; use crate::s9pk::manifest::PackageId;
use crate::util::{Invoke, Port}; use crate::util::{Invoke, Port};
use crate::{Error, ErrorKind}; use crate::{Error, ErrorKind, ResultExt};
pub struct NginxController(Mutex<NginxControllerInner>); pub struct NginxController(Mutex<NginxControllerInner>);
impl NginxController { impl NginxController {
@@ -75,14 +76,23 @@ impl NginxControllerInner {
let (key, chain) = self.ssl_manager.certificate_for(&meta.dns_base).await?; let (key, chain) = self.ssl_manager.certificate_for(&meta.dns_base).await?;
// write nginx ssl certs // write nginx ssl certs
futures::try_join!( futures::try_join!(
tokio::fs::write(&ssl_path_key, key.private_key_to_pem_pkcs8()?), tokio::fs::write(&ssl_path_key, key.private_key_to_pem_pkcs8()?).map(
|res| res.with_ctx(|_| (
ErrorKind::Filesystem,
ssl_path_key.display().to_string()
))
),
tokio::fs::write( tokio::fs::write(
&ssl_path_cert, &ssl_path_cert,
chain chain
.into_iter() .into_iter()
.flat_map(|c| c.to_pem().unwrap()) .flat_map(|c| c.to_pem().unwrap())
.collect::<Vec<u8>>() .collect::<Vec<u8>>()
), )
.map(|res| res.with_ctx(|_| (
ErrorKind::Filesystem,
ssl_path_cert.display().to_string()
))),
)?; )?;
( (
@@ -113,14 +123,17 @@ impl NginxControllerInner {
internal_port = port.0, internal_port = port.0,
), ),
) )
.await?; .await
.with_ctx(|_| (ErrorKind::Filesystem, nginx_conf_path.display().to_string()))?;
let sites_enabled_link_path = self let sites_enabled_link_path = self
.nginx_root .nginx_root
.join(format!("sites-enabled/{}_{}.conf", package, id)); .join(format!("sites-enabled/{}_{}.conf", package, id));
if tokio::fs::metadata(&sites_enabled_link_path).await.is_ok() { if tokio::fs::metadata(&sites_enabled_link_path).await.is_ok() {
tokio::fs::remove_file(&sites_enabled_link_path).await?; tokio::fs::remove_file(&sites_enabled_link_path).await?;
} }
tokio::fs::symlink(&nginx_conf_path, &sites_enabled_link_path).await?; tokio::fs::symlink(&nginx_conf_path, &sites_enabled_link_path)
.await
.with_ctx(|_| (ErrorKind::Filesystem, nginx_conf_path.display().to_string()))?;
} }
} }
match self.interfaces.get_mut(&package) { match self.interfaces.get_mut(&package) {
@@ -143,24 +156,30 @@ impl NginxControllerInner {
let removed = self.interfaces.remove(package); let removed = self.interfaces.remove(package);
if let Some(net_info) = removed { if let Some(net_info) = removed {
for (id, _meta) in net_info.interfaces { for (id, _meta) in net_info.interfaces {
// TODO remove ssl certificates and nginx configs // remove ssl certificates and nginx configs
let key_path = self
.nginx_root
.join(format!("ssl/{}_{}.key.pem", package, id));
let cert_path = self
.nginx_root
.join(format!("ssl/{}_{}.cert.pem", package, id));
let enabled_path = self
.nginx_root
.join(format!("sites-enabled/{}_{}.conf", package, id));
let available_path = self
.nginx_root
.join(format!("sites-available/{}_{}.conf", package, id));
let _ = futures::try_join!( let _ = futures::try_join!(
tokio::fs::remove_file( tokio::fs::remove_file(&key_path).map(|res| res
self.nginx_root .with_ctx(|_| (ErrorKind::Filesystem, key_path.display().to_string()))),
.join(format!("ssl/{}_{}.key.pem", package, id)) tokio::fs::remove_file(&cert_path).map(|res| res
), .with_ctx(|_| (ErrorKind::Filesystem, key_path.display().to_string()))),
tokio::fs::remove_file( tokio::fs::remove_file(&enabled_path).map(|res| res
self.nginx_root .with_ctx(|_| (ErrorKind::Filesystem, enabled_path.display().to_string()))),
.join(format!("ssl/{}_{}.cert.pem", package, id)) tokio::fs::remove_file(&available_path).map(|res| res.with_ctx(|_| (
), ErrorKind::Filesystem,
tokio::fs::remove_file( available_path.display().to_string()
self.nginx_root ))),
.join(format!("sites-enabled/{}_{}.conf", package, id))
),
tokio::fs::remove_file(
self.nginx_root
.join(format!("sites-available/{}_{}.conf", package, id))
),
)?; )?;
} }
} }