aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.rs
diff options
context:
space:
mode:
authorequal-l2 <eng.equall2@gmail.com>2020-07-20 21:54:58 +0000
committerequal-l2 <eng.equall2@gmail.com>2020-07-21 16:53:06 +0000
commitbd6575cc5fa8c973eb845c0143b4a5ea181ed3f9 (patch)
tree5c59b353cb19d40fc0a0bcc9d65af7c6bb357bf3 /src/main.rs
parentUpdate to actix 2 and futures 0.3 (diff)
downloadminiserve-bd6575cc5fa8c973eb845c0143b4a5ea181ed3f9.tar.gz
miniserve-bd6575cc5fa8c973eb845c0143b4a5ea181ed3f9.zip
Use actix-web-httpauth for authentication middleware
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main.rs b/src/main.rs
index 1477652..d27e9c2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,6 +3,7 @@
use actix_web::http::StatusCode;
use actix_web::web;
use actix_web::{middleware, App, HttpRequest, HttpResponse};
+use actix_web_httpauth::middleware::HttpAuthentication;
use std::io::{self, Write};
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
use std::thread;
@@ -233,7 +234,10 @@ async fn run() -> Result<(), ContextualError> {
let srv = actix_web::HttpServer::new(move || {
App::new()
.app_data(inside_config.clone())
- .wrap(auth::Auth)
+ .wrap(middleware::Condition::new(
+ !inside_config.auth.is_empty(),
+ HttpAuthentication::basic(auth::handle_auth),
+ ))
.wrap(middleware::Logger::default())
.configure(|c| configure_app(c, &inside_config))
.default_service(web::get().to(error_404))