Skip to content

Commit

Permalink
feat: support render-index/render-spa
Browse files Browse the repository at this point in the history 
closes #5
  • Loading branch information
@sigoden
sigoden committed Jun 1, 2022
1 parent 1fe391f commit 830d334
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 30 deletions.
16 changes: 16 additions & 0 deletions src/args.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ fn app() -> clap::Command<'static> {
.long("allow-symlink")
.help("Allow symlink to directories/files outside root directory"),
)
.arg(
Arg::new("render-index")
.long("render-index")
.help("Render existing index.html when requesting a directory"),
)
.arg(
Arg::new("render-spa")
.long("render-spa")
.help("Render spa, rewrite all not-found requests to `index.html"),
)
.arg(
Arg::new("auth")
.short('a')
Expand Down Expand Up @@ -87,6 +97,8 @@ pub struct Args {
pub allow_upload: bool,
pub allow_delete: bool,
pub allow_symlink: bool,
pub render_index: bool,
pub render_spa: bool,
pub cors: bool,
}

Expand All @@ -105,6 +117,8 @@ impl Args {
let allow_upload = matches.is_present("allow-all") || matches.is_present("allow-upload");
let allow_delete = matches.is_present("allow-all") || matches.is_present("allow-delete");
let allow_symlink = matches.is_present("allow-all") || matches.is_present("allow-symlink");
let render_index = matches.is_present("render-index");
let render_spa = matches.is_present("render-spa");

Ok(Args {
address,
Expand All @@ -116,6 +130,8 @@ impl Args {
allow_delete,
allow_upload,
allow_symlink,
render_index,
render_spa,
})
}

Expand Down
114 changes: 84 additions & 30 deletions src/server.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ use async_zip::Compression;
use futures::stream::StreamExt;
use futures::TryStreamExt;
use headers::{
AccessControlAllowHeaders, AccessControlAllowOrigin, ContentRange, ContentType, ETag,
HeaderMap, HeaderMapExt, IfModifiedSince, IfNoneMatch, IfRange, LastModified, Range, ContentLength, AcceptRanges,
AcceptRanges, AccessControlAllowHeaders, AccessControlAllowOrigin, ContentLength, ContentRange,
ContentType, ETag, HeaderMap, HeaderMapExt, IfModifiedSince, IfNoneMatch, IfRange,
LastModified, Range,
};
use hyper::header::{
HeaderValue, ACCEPT, AUTHORIZATION, CONTENT_DISPOSITION, CONTENT_TYPE, ORIGIN, RANGE,
Expand All @@ -35,6 +36,7 @@ type Response = hyper::Response<Body>;
const INDEX_HTML: &str = include_str!("../assets/index.html");
const INDEX_CSS: &str = include_str!("../assets/index.css");
const INDEX_JS: &str = include_str!("../assets/index.js");
const INDEX_NAME: &str = "index.html";
const BUF_SIZE: usize = 1024 * 16;

macro_rules! status {
Expand Down Expand Up @@ -105,65 +107,81 @@ impl InnerService {
return Ok(res);
}

let path = req.uri().path();
let req_path = req.uri().path();

let pathname = match self.extract_path(path) {
let path = match self.extract_path(req_path) {
Some(v) => v,
None => {
status!(res, StatusCode::FORBIDDEN);
return Ok(res);
}
};
let pathname = pathname.as_path();
let path = path.as_path();

let query = req.uri().query().unwrap_or_default();

let meta = fs::metadata(pathname).await.ok();
let meta = fs::metadata(path).await.ok();

let is_miss = meta.is_none();
let is_dir = meta.map(|v| v.is_dir()).unwrap_or_default();
let is_file = !is_miss && !is_dir;

let allow_upload = self.args.allow_upload;
let allow_delete = self.args.allow_delete;
let render_index = self.args.render_index;
let render_spa = self.args.render_spa;

if !self.args.allow_symlink && !is_miss && !self.is_root_contained(pathname).await {
if !self.args.allow_symlink && !is_miss && !self.is_root_contained(path).await {
status!(res, StatusCode::NOT_FOUND);
return Ok(res);
}

match *req.method() {
Method::GET if is_dir && query == "zip" => {
self.handle_zip_dir(pathname, &mut res).await?
}
Method::GET if is_dir && query.starts_with("q=") => {
self.handle_query_dir(pathname, &query[3..], &mut res)
.await?
}
Method::GET if is_dir => self.handle_ls_dir(pathname, true, &mut res).await?,
Method::GET if is_file => {
self.handle_send_file(pathname, req.headers(), &mut res)
.await?
}
Method::GET if allow_upload && is_miss && path.ends_with('/') => {
self.handle_ls_dir(pathname, false, &mut res).await?
Method::GET => {
let headers = req.headers();
if is_dir {
if render_index || render_spa {
self.handle_render_index(path, headers, &mut res).await?;
} else if query == "zip" {
self.handle_zip_dir(path, &mut res).await?;
} else if query.starts_with("q=") {
self.handle_query_dir(path, &query[3..], &mut res).await?;
} else {
self.handle_ls_dir(path, true, &mut res).await?;
}
} else if is_file {
self.handle_send_file(path, headers, &mut res).await?;
} else if render_spa {
self.handle_render_spa(path, headers, &mut res).await?;
} else if allow_upload && req_path.ends_with('/') {
self.handle_ls_dir(path, false, &mut res).await?;
} else {
status!(res, StatusCode::NOT_FOUND);
}
}
Method::OPTIONS => {
status!(res, StatusCode::NO_CONTENT);
}
Method::PUT if !allow_upload || (!allow_delete && is_file) => {
status!(res, StatusCode::FORBIDDEN);
Method::PUT => {
if !allow_upload || (!allow_delete && is_file) {
status!(res, StatusCode::FORBIDDEN);
} else {
self.handle_upload(path, req, &mut res).await?;
}
}
Method::PUT => self.handle_upload(pathname, req, &mut res).await?,
Method::DELETE if !allow_delete => {
status!(res, StatusCode::FORBIDDEN);
Method::DELETE => {
if !allow_delete {
status!(res, StatusCode::FORBIDDEN);
} else if !is_miss {
self.handle_delete(path, is_dir).await?
} else {
status!(res, StatusCode::NOT_FOUND);
}
}
Method::DELETE if !is_miss => self.handle_delete(pathname, is_dir).await?,
_ => {
status!(res, StatusCode::NOT_FOUND);
status!(res, StatusCode::METHOD_NOT_ALLOWED);
}
}

Ok(res)
}

Expand Down Expand Up @@ -305,6 +323,41 @@ impl InnerService {
Ok(())
}

async fn handle_render_index(
&self,
path: &Path,
headers: &HeaderMap<HeaderValue>,
res: &mut Response,
) -> BoxResult<()> {
let path = path.join(INDEX_NAME);
if fs::metadata(&path)
.await
.ok()
.map(|v| v.is_file())
.unwrap_or_default()
{
self.handle_send_file(&path, headers, res).await?;
} else {
status!(res, StatusCode::NOT_FOUND);
}
Ok(())
}

async fn handle_render_spa(
&self,
path: &Path,
headers: &HeaderMap<HeaderValue>,
res: &mut Response,
) -> BoxResult<()> {
if path.extension().is_none() {
let path = self.args.path.join(INDEX_NAME);
self.handle_send_file(&path, headers, res).await?;
} else {
status!(res, StatusCode::NOT_FOUND);
}
Ok(())
}

async fn handle_send_file(
&self,
path: &Path,
Expand Down Expand Up @@ -367,7 +420,8 @@ impl InnerService {
};
*res.body_mut() = body;
res.headers_mut().typed_insert(AcceptRanges::bytes());
res.headers_mut().typed_insert(ContentLength(meta.len() as u64));
res.headers_mut()
.typed_insert(ContentLength(meta.len() as u64));

Ok(())
}
Expand Down

0 comments on commit 830d334

Please sign in to comment.