-
-
Notifications
You must be signed in to change notification settings - Fork 305
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
ahti
wants to merge
2
commits into
svenstaro:master
Choose a base branch
from
ahti:webdav
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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}; | ||
|
||
|
@@ -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"); | ||
|
||
|
@@ -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 | ||
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 { | ||
|
@@ -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:.*}") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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() | ||
} | ||
} | ||
|
||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?