Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add read-only webdav support #1415

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 121 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ clap_complete = "4"
clap_mangen = "0.2"
colored = "2"
comrak = { version = "0.28", default-features = false }
dav-server = { version = "0.7", features = ["actix-compat"] }
fast_qr = { version = "0.12", features = ["svg"] }
futures = "0.3"
grass = { version = "0.13", features = ["macro"], default-features = false }
Expand Down
43 changes: 41 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@ use std::time::Duration;
use actix_files::NamedFile;
use actix_web::{
dev::{fn_service, ServiceRequest, ServiceResponse},
http::header::ContentType,
guard,
http::{header::ContentType, Method},
middleware, web, App, HttpRequest, HttpResponse, Responder,
};
use actix_web_httpauth::middleware::HttpAuthentication;
use anyhow::Result;
use clap::{crate_version, CommandFactory, Parser};
use colored::*;
use dav_server::{
actix::{DavRequest, DavResponse},
DavConfig, DavHandler,
};
use fast_qr::QRBuilder;
use log::{error, warn};

Expand All @@ -27,9 +32,11 @@ mod file_utils;
mod listing;
mod pipe;
mod renderer;
mod webdav_fs;

use crate::config::MiniserveConfig;
use crate::errors::{RuntimeError, StartupError};
use crate::webdav_fs::RestrictedFs;

static STYLESHEET: &str = grass::include!("data/style.scss");

Expand Down Expand Up @@ -307,7 +314,9 @@ fn configure_header(conf: &MiniserveConfig) -> middleware::DefaultHeaders {
/// This is where we configure the app to serve an index file, the file listing, or a single file.
fn configure_app(app: &mut web::ServiceConfig, conf: &MiniserveConfig) {
let dir_service = || {
let mut files = actix_files::Files::new("", &conf.path);
// use routing guard so propfind and options requests fall through to the webdav handler
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want all Options requests to fall through? Can we be more specific?

let mut files = actix_files::Files::new("", &conf.path)
.guard(guard::Any(guard::Get()).or(guard::Head()));

// Use specific index file if one was provided.
if let Some(ref index_file) = conf.index {
Expand Down Expand Up @@ -375,6 +384,36 @@ fn configure_app(app: &mut web::ServiceConfig, conf: &MiniserveConfig) {
}
// Handle directories
app.service(dir_service());

if !conf.disable_indexing {
let restricted = RestrictedFs::new(&conf.path, conf.show_hidden);
let dav_server = DavHandler::builder()
.filesystem(restricted)
.hide_symlinks(conf.no_symlinks)
.strip_prefix(conf.route_prefix.to_owned())
.build_handler();

app.app_data(web::Data::new(dav_server.clone()));

// order is important: the dir service above is checked first, but has a method guard,
// so options and propfind go here. if this service was registered first, it would swallow the gets/heads
app.service(
web::resource("/{tail:.*}")
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where does this come from?

.guard(guard::Any(guard::Options()).or(guard::Method(
Method::from_bytes(b"PROPFIND").unwrap(),
)))
.to(dav_handler),
);
}
}
}

async fn dav_handler(req: DavRequest, davhandler: web::Data<DavHandler>) -> DavResponse {
if let Some(prefix) = req.prefix() {
let config = DavConfig::new().strip_prefix(prefix);
davhandler.handle_with(config, req.request).await.into()
} else {
davhandler.handle(req.request).await.into()
}
}

Expand Down
Loading
Loading