pesde-pkg/pesde
1
1
Fork 0
mirror of https://github.com/pesde-pkg/pesde.git synced 2024-12-12 11:00:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(registry): handle not found errors for FS storage

Browse source
This commit is contained in:
daimond113 2024-10-30 18:55:39 +01:00
parent 1640dab0c4
commit 241e667bdc
No known key found for this signature in database
GPG key ID: 3A8ECE51328B513C
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
registry/src/storage/fs.rs
View file

@ -5,12 +5,24 @@ use actix_web::{
}; };
use pesde::{names::PackageName, source::version_id::VersionId}; use pesde::{names::PackageName, source::version_id::VersionId};
use std::{fmt::Display, fs::create_dir_all, path::PathBuf}; use std::{fmt::Display, fs::create_dir_all, path::PathBuf};
use std::path::Path;
#[derive(Debug)] #[derive(Debug)]
pub struct FSStorage { pub struct FSStorage {
pub root: PathBuf, pub root: PathBuf,
} }
fn read_file_to_response(path: &Path, content_type: &str) -> Result<HttpResponse, Error> {
Ok(match std::fs::read(path) {
Ok(contents) => HttpResponse::Ok()
.append_header((CONTENT_TYPE, content_type))
.append_header((CONTENT_ENCODING, "gzip"))
.body(contents),
Err(e) if e.kind() == std::io::ErrorKind::NotFound => HttpResponse::NotFound().finish(),
Err(e) => return Err(e.into()),
})
}
impl StorageImpl for FSStorage { impl StorageImpl for FSStorage {
async fn store_package( async fn store_package(
&self, &self,
@ -47,12 +59,7 @@ impl StorageImpl for FSStorage {
.join(version.version().to_string()) .join(version.version().to_string())
.join(version.target().to_string()); .join(version.target().to_string());
let contents = std::fs::read(path.join("pkg.tar.gz"))?; read_file_to_response(&path.join("pkg.tar.gz"), "application/gzip")
Ok(HttpResponse::Ok()
.append_header((CONTENT_TYPE, "application/gzip"))
.append_header((CONTENT_ENCODING, "gzip"))
.body(contents))
} }
async fn store_readme( async fn store_readme(
@ -90,16 +97,11 @@ impl StorageImpl for FSStorage {
.join(version.version().to_string()) .join(version.version().to_string())
.join(version.target().to_string()); .join(version.target().to_string());
let contents = std::fs::read(path.join("readme.gz"))?; read_file_to_response(&path.join("readme.gz"), "text/plain")
Ok(HttpResponse::Ok()
.append_header((CONTENT_TYPE, "text/plain"))
.append_header((CONTENT_ENCODING, "gzip"))
.body(contents))
} }
async fn store_doc(&self, doc_hash: String, contents: Vec<u8>) -> Result<(), Error> { async fn store_doc(&self, doc_hash: String, contents: Vec<u8>) -> Result<(), Error> {
let path = self.root.join("docs"); let path = self.root.join("Doc");
create_dir_all(&path)?; create_dir_all(&path)?;
std::fs::write(path.join(format!("{doc_hash}.gz")), &contents)?; std::fs::write(path.join(format!("{doc_hash}.gz")), &contents)?;
@ -108,14 +110,9 @@ impl StorageImpl for FSStorage {
} }
async fn get_doc(&self, doc_hash: &str) -> Result<HttpResponse, Error> { async fn get_doc(&self, doc_hash: &str) -> Result<HttpResponse, Error> {
let path = self.root.join("docs"); let path = self.root.join("Doc");
let contents = std::fs::read(path.join(format!("{doc_hash}.gz")))?; read_file_to_response(&path.join(format!("{doc_hash}.gz")), "text/plain")
Ok(HttpResponse::Ok()
.append_header((CONTENT_TYPE, "text/plain"))
.append_header((CONTENT_ENCODING, "gzip"))
.body(contents))
} }
} }