Compare commits
2 Commits
13bccaffcf
...
f07b64f362
Author | SHA1 | Date |
---|---|---|
Renovate Bot | f07b64f362 | |
Jef Roosens | 3b33cba0d4 |
|
@ -91,12 +91,6 @@ version = "0.20.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
|
||||
|
||||
[[package]]
|
||||
name = "base64"
|
||||
version = "0.21.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
|
@ -462,11 +456,10 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "metrics-exporter-prometheus"
|
||||
version = "0.12.1"
|
||||
version = "0.12.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5"
|
||||
checksum = "5142a593c2be0cf5c2ac5b22ec7a4f74477b851efb6238236af26c6b5ca6e98e"
|
||||
dependencies = [
|
||||
"base64 0.21.0",
|
||||
"hyper",
|
||||
"indexmap",
|
||||
"ipnet",
|
||||
|
@ -992,7 +985,7 @@ version = "0.4.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658"
|
||||
dependencies = [
|
||||
"base64 0.20.0",
|
||||
"base64",
|
||||
"bitflags",
|
||||
"bytes",
|
||||
"futures-core",
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
[toolchain]
|
||||
channel = "1.69"
|
|
@ -8,6 +8,7 @@ use axum::{
|
|||
use flate2::read::GzDecoder;
|
||||
use futures_util::TryStreamExt;
|
||||
use serde::Deserialize;
|
||||
use std::io;
|
||||
use tar::Archive;
|
||||
use tokio_util::io::StreamReader;
|
||||
|
||||
|
@ -22,15 +23,15 @@ pub async fn post_deploy(
|
|||
Extension(data_dir): Extension<String>,
|
||||
Query(params): Query<StaticDirParams>,
|
||||
res: BodyStream,
|
||||
) -> impl IntoResponse {
|
||||
) -> crate::Result<()> {
|
||||
// This converts a stream into something that implements AsyncRead, which we can then use to
|
||||
// asynchronously write the file to disk
|
||||
let mut read =
|
||||
StreamReader::new(res.map_err(|axum_err| std::io::Error::new(ErrorKind::Other, axum_err)));
|
||||
let uuid = uuid::Uuid::new_v4();
|
||||
let file_path = Path::new(&data_dir).join(uuid.as_hyphenated().to_string());
|
||||
let mut file = tokio::fs::File::create(&file_path).await.unwrap();
|
||||
tokio::io::copy(&mut read, &mut file).await;
|
||||
let mut file = tokio::fs::File::create(&file_path).await?;
|
||||
tokio::io::copy(&mut read, &mut file).await?;
|
||||
|
||||
// If no dir is provided, we use the default one. Otherwise, use the provided one.
|
||||
let static_path = Path::new(&data_dir)
|
||||
|
@ -38,34 +39,30 @@ pub async fn post_deploy(
|
|||
.join(params.dir.unwrap_or(DEFAULT_STATIC_SITE.to_string()));
|
||||
|
||||
// Make sure the static directory exists
|
||||
tokio::fs::create_dir_all(&static_path).await;
|
||||
tokio::fs::create_dir_all(&static_path).await?;
|
||||
|
||||
let fp_clone = file_path.clone();
|
||||
// Extract the contents of the tarball synchronously
|
||||
let res =
|
||||
match tokio::task::spawn_blocking(move || process_archive(&fp_clone, &static_path)).await {
|
||||
Ok(_) => StatusCode::OK,
|
||||
Err(_) => StatusCode::INTERNAL_SERVER_ERROR,
|
||||
};
|
||||
tokio::task::spawn_blocking(move || process_archive(&fp_clone, &static_path)).await??;
|
||||
|
||||
// Remove archive file after use
|
||||
tokio::fs::remove_file(&file_path).await;
|
||||
tokio::fs::remove_file(&file_path).await?;
|
||||
|
||||
res
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn process_archive(archive_path: &Path, static_dir: &Path) -> Result<(), ()> {
|
||||
let file = std::fs::File::open(archive_path).map_err(|_| ())?;
|
||||
fn process_archive(archive_path: &Path, static_dir: &Path) -> io::Result<()> {
|
||||
let file = std::fs::File::open(archive_path)?;
|
||||
let tar = GzDecoder::new(file);
|
||||
let mut archive = Archive::new(tar);
|
||||
|
||||
let mut paths = HashSet::new();
|
||||
|
||||
let entries = archive.entries().map_err(|_| ())?;
|
||||
let entries = archive.entries()?;
|
||||
// Extract each entry into the output directory
|
||||
for entry_res in entries {
|
||||
let mut entry = entry_res.map_err(|_| ())?;
|
||||
entry.unpack_in(static_dir).map_err(|_| ())?;
|
||||
for entry in entries {
|
||||
let mut entry = entry?;
|
||||
entry.unpack_in(static_dir)?;
|
||||
|
||||
if let Ok(path) = entry.path() {
|
||||
paths.insert(path.into_owned());
|
||||
|
@ -76,20 +73,20 @@ fn process_archive(archive_path: &Path, static_dir: &Path) -> Result<(), ()> {
|
|||
let mut items = vec![];
|
||||
|
||||
// Start by populating the vec with the initial files
|
||||
let iter = static_dir.read_dir().map_err(|_| ())?;
|
||||
let iter = static_dir.read_dir()?;
|
||||
iter.filter_map(|r| r.ok())
|
||||
.for_each(|e| items.push(e.path()));
|
||||
|
||||
// As long as there are still items in the vec, we keep going
|
||||
while items.len() > 0 {
|
||||
while !items.is_empty() {
|
||||
let item = items.pop().unwrap();
|
||||
tracing::debug!("{:?}", item);
|
||||
|
||||
if !paths.contains(item.strip_prefix(&static_dir).unwrap()) {
|
||||
if item.is_dir() {
|
||||
std::fs::remove_dir_all(item);
|
||||
std::fs::remove_dir_all(item)?;
|
||||
} else {
|
||||
std::fs::remove_file(item);
|
||||
std::fs::remove_file(item)?;
|
||||
}
|
||||
} else if let Ok(iter) = item.read_dir() {
|
||||
iter.filter_map(|r| r.ok())
|
||||
|
|
|
@ -0,0 +1,51 @@
|
|||
use axum::http::StatusCode;
|
||||
use axum::response::{IntoResponse, Response};
|
||||
use std::error::Error;
|
||||
use std::fmt;
|
||||
use std::io;
|
||||
|
||||
pub type Result<T> = std::result::Result<T, ServerError>;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum ServerError {
|
||||
IO(io::Error),
|
||||
Axum(axum::Error),
|
||||
}
|
||||
|
||||
impl fmt::Display for ServerError {
|
||||
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
match self {
|
||||
ServerError::IO(err) => write!(fmt, "{}", err),
|
||||
ServerError::Axum(err) => write!(fmt, "{}", err),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Error for ServerError {}
|
||||
|
||||
impl IntoResponse for ServerError {
|
||||
fn into_response(self) -> Response {
|
||||
match self {
|
||||
ServerError::IO(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
|
||||
ServerError::Axum(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<io::Error> for ServerError {
|
||||
fn from(err: io::Error) -> Self {
|
||||
ServerError::IO(err)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<axum::Error> for ServerError {
|
||||
fn from(err: axum::Error) -> Self {
|
||||
ServerError::Axum(err)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<tokio::task::JoinError> for ServerError {
|
||||
fn from(err: tokio::task::JoinError) -> Self {
|
||||
ServerError::IO(err.into())
|
||||
}
|
||||
}
|
11
src/main.rs
11
src/main.rs
|
@ -1,3 +1,10 @@
|
|||
mod api;
|
||||
mod error;
|
||||
mod matrix;
|
||||
mod metrics;
|
||||
|
||||
pub use error::Result;
|
||||
|
||||
use std::{future::ready, net::SocketAddr};
|
||||
|
||||
use axum::{
|
||||
|
@ -12,10 +19,6 @@ use tower_http::{
|
|||
};
|
||||
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
|
||||
|
||||
mod api;
|
||||
mod matrix;
|
||||
mod metrics;
|
||||
|
||||
/// Name of the directory where static sites are stored inside the data directory
|
||||
const STATIC_DIR_NAME: &str = "static";
|
||||
/// Name of the subdir of STATIC_DIR_NAME where the default (fallback) site is located
|
||||
|
|
Loading…
Reference in New Issue