.gitignore

@@ -7,4 +7,3 @@ result
 file-service/*.sqlite
 file-service/*.sqlite-shm
 file-service/*.sqlite-wal
-file-service/var

file-service/src/handlers.rs

@@ -1,12 +1,7 @@
 use build_html::Html;
-use bytes::Buf;
-use cookie::time::error::Format;
-use file_service::WriteFileError;
-use futures_util::StreamExt;
 use http::{Error, StatusCode};
 use std::collections::HashMap;
-use std::io::Read;
-use warp::{filters::multipart::FormData, http::Response, multipart::Part};
+use warp::http::Response;
 
 use crate::{pages, App, AuthToken, FileId, FileInfo, ReadFileError, SessionToken};
 
@@ -103,30 +98,13 @@ pub async fn handle_auth(
 }
 
 pub async fn handle_upload(
-    app: App,
-    token: SessionToken,
-    form: FormData,
+    _app: App,
+    _token: SessionToken,
 ) -> Result<http::Response<String>, Error> {
-    match app.validate_session(token).await {
-        Ok(Some(_)) => match process_file_upload(app, form).await {
-            Ok(_) => Response::builder()
-                .header("location", "/")
-                .status(StatusCode::SEE_OTHER)
-                .body("".to_owned()),
-            Err(UploadError::FilenameMissing) => Response::builder()
-                .status(StatusCode::BAD_REQUEST)
-                .body("filename is required for all files".to_owned()),
-            Err(UploadError::WriteFileError(err)) => Response::builder()
-                .status(StatusCode::INTERNAL_SERVER_ERROR)
-                .body(format!("could not write to the file system: {:?}", err)),
-            Err(UploadError::WarpError(err)) => Response::builder()
-                .status(StatusCode::INTERNAL_SERVER_ERROR)
-                .body(format!("error with the app framework: {:?}", err)),
-        },
-        _ => Response::builder()
-            .status(StatusCode::UNAUTHORIZED)
-            .body("".to_owned()),
-    }
+    println!("handle_upload");
+    Response::builder()
+        .status(StatusCode::NOT_IMPLEMENTED)
+        .body("".to_owned())
 }
 
 fn serve_file<F>(
@@ -154,102 +132,3 @@ where
         },
     }
 }
-
-async fn collect_multipart(
-    mut stream: warp::filters::multipart::FormData,
-) -> Result<Vec<(Option<String>, Option<String>, Vec<u8>)>, warp::Error> {
-    let mut content: Vec<(Option<String>, Option<String>, Vec<u8>)> = Vec::new();
-
-    while let Some(part) = stream.next().await {
-        match part {
-            Ok(part) => content.push(collect_content(part).await.unwrap()),
-            Err(err) => return Err(err),
-        }
-    }
-
-    Ok(content)
-}
-
-async fn collect_content(
-    mut part: Part,
-) -> Result<(Option<String>, Option<String>, Vec<u8>), String> {
-    let mut content: Vec<u8> = Vec::new();
-
-    while let Some(Ok(data)) = part.data().await {
-        let mut reader = data.reader();
-        reader.read_to_end(&mut content).unwrap();
-    }
-
-    Ok((
-        part.content_type().map(|s| s.to_owned()),
-        part.filename().map(|s| s.to_owned()),
-        content,
-    ))
-}
-
-/*
-async fn handle_upload(
-    form: warp::filters::multipart::FormData,
-    app: App,
-) -> warp::http::Result<warp::http::Response<String>> {
-    let files = collect_multipart(form).await;
-    match files {
-        Ok(files) => {
-            for (_, filename, content) in files {
-                match filename {
-                    Some(filename) => {
-                        app.add_file(filename, content).unwrap();
-                    }
-                    None => {
-                        return warp::http::Response::builder()
-                            .status(StatusCode::BAD_REQUEST)
-                            .body("".to_owned())
-                    }
-                }
-            }
-        }
-        Err(_err) => {
-            return warp::http::Response::builder()
-                .status(StatusCode::BAD_REQUEST)
-                .body("".to_owned())
-        }
-    }
-
-    // println!("file length: {:?}", files.map(|f| f.len()));
-    warp::http::Response::builder()
-        .header("location", "/")
-        .status(StatusCode::SEE_OTHER)
-        .body("".to_owned())
-}
-*/
-
-enum UploadError {
-    FilenameMissing,
-    WriteFileError(WriteFileError),
-    WarpError(warp::Error),
-}
-
-impl From<WriteFileError> for UploadError {
-    fn from(err: WriteFileError) -> Self {
-        Self::WriteFileError(err)
-    }
-}
-
-impl From<warp::Error> for UploadError {
-    fn from(err: warp::Error) -> Self {
-        Self::WarpError(err)
-    }
-}
-
-async fn process_file_upload(app: App, form: FormData) -> Result<(), UploadError> {
-    let files = collect_multipart(form).await?;
-    for (_, filename, content) in files {
-        match filename {
-            Some(filename) => {
-                app.add_file(filename, content).await?;
-            }
-            None => return Err(UploadError::FilenameMissing),
-        }
-    }
-    Ok(())
-}

file-service/src/main.rs

@@ -42,12 +42,75 @@ async fn authenticate_user(app: App, auth_token: String) -> Result<Username, war
 */
 
 /*
+async fn collect_content(
+    mut part: Part,
+) -> Result<(Option<String>, Option<String>, Vec<u8>), String> {
+    let mut content: Vec<u8> = Vec::new();
+
+    while let Some(Ok(data)) = part.data().await {
+        let mut reader = data.reader();
+        reader.read_to_end(&mut content).unwrap();
+    }
+
+    Ok((
+        part.content_type().map(|s| s.to_owned()),
+        part.filename().map(|s| s.to_owned()),
+        content,
+    ))
+}
 */
 
 /*
+async fn collect_multipart(
+    mut stream: warp::filters::multipart::FormData,
+) -> Result<Vec<(Option<String>, Option<String>, Vec<u8>)>, warp::Error> {
+    let mut content: Vec<(Option<String>, Option<String>, Vec<u8>)> = Vec::new();
+
+    while let Some(part) = stream.next().await {
+        match part {
+            Ok(part) => content.push(collect_content(part).await.unwrap()),
+            Err(err) => return Err(err),
+        }
+    }
+
+    Ok(content)
+}
 */
 
 /*
+async fn handle_upload(
+    form: warp::filters::multipart::FormData,
+    app: App,
+) -> warp::http::Result<warp::http::Response<String>> {
+    let files = collect_multipart(form).await;
+    match files {
+        Ok(files) => {
+            for (_, filename, content) in files {
+                match filename {
+                    Some(filename) => {
+                        app.add_file(filename, content).unwrap();
+                    }
+                    None => {
+                        return warp::http::Response::builder()
+                            .status(StatusCode::BAD_REQUEST)
+                            .body("".to_owned())
+                    }
+                }
+            }
+        }
+        Err(_err) => {
+            return warp::http::Response::builder()
+                .status(StatusCode::BAD_REQUEST)
+                .body("".to_owned())
+        }
+    }
+
+    // println!("file length: {:?}", files.map(|f| f.len()));
+    warp::http::Response::builder()
+        .header("location", "/")
+        .status(StatusCode::SEE_OTHER)
+        .body("".to_owned())
+}
 */
 
 #[derive(Clone)]
@@ -96,25 +159,26 @@ fn with_app(app: App) -> impl Filter<Extract = (App,), Error = Infallible> + Clo
     warp::any().map(move || app.clone())
 }
 
-fn parse_cookies(cookie_str: &str) -> Result<HashMap<String, String>, cookie::ParseError> {
-    Cookie::split_parse(cookie_str)
-        .map(|c| c.map(|c| (c.name().to_owned(), c.value().to_owned())))
-        .collect::<Result<HashMap<String, String>, cookie::ParseError>>()
-}
-
-fn get_session_token(cookies: HashMap<String, String>) -> Option<SessionToken> {
-    cookies
-        .get("session")
-        .cloned()
-        .and_then(|session| Some(SessionToken::from(session)))
-}
-
 fn maybe_with_session() -> impl Filter<Extract = (Option<SessionToken>,), Error = Rejection> + Copy
 {
     warp::any()
         .and(warp::header::optional::<String>("cookie"))
-        .map(|cookie_str: Option<String>| match cookie_str {
-            Some(cookie_str) => parse_cookies(&cookie_str).ok().and_then(get_session_token),
+        .map(|cookies| match cookies {
+            Some(cookies) => {
+                let c = Cookie::split_parse(cookies)
+                    .collect::<Result<Vec<Cookie>, cookie::ParseError>>();
+                match c {
+                    Ok(cookies) => {
+                        for c in cookies {
+                            if c.name() == "session" {
+                                return Some(SessionToken::from(c.value()));
+                            }
+                        }
+                        None
+                    }
+                    Err(_) => None,
+                }
+            }
             None => None,
         })
 }
@@ -122,12 +186,7 @@ fn maybe_with_session() -> impl Filter<Extract = (Option<SessionToken>,), Error
 fn with_session() -> impl Filter<Extract = (SessionToken,), Error = Rejection> + Copy {
     warp::any()
         .and(warp::header::<String>("cookie"))
-        .and_then(|cookie_str: String| async move {
-            match parse_cookies(&cookie_str).ok().and_then(get_session_token) {
-                Some(session_token) => Ok(session_token),
-                None => Err(warp::reject()),
-            }
-        })
+        .map(|token: String| SessionToken::from(token))
 }
 
 #[tokio::main]
@@ -141,6 +200,13 @@ pub async fn main() {
 
     let app = App::new(authdb, store);
 
+    /*
+    let with_app = {
+        let app = app.clone();
+        warp::any().map(move || app.clone())
+    };
+    */
+
     let log = warp::log("file_service");
     let root = warp::path!()
         .and(warp::get())
@@ -154,11 +220,10 @@ pub async fn main() {
         .and(warp::filters::body::form())
         .then(handle_auth);
 
-    let upload_via_form = warp::path!("upload")
+    let upload_handler = warp::path!("upload")
         .and(warp::post())
         .and(with_app(app.clone()))
         .and(with_session())
-        .and(warp::multipart::form())
         .then(handle_upload);
 
     let thumbnail = warp::path!(String / "tn")
@@ -174,11 +239,13 @@ pub async fn main() {
         .then(move |id, old_etags, app: App| file(app, id, old_etags));
 
     let server = warp::serve(
-        root.or(auth)
-            .or(upload_via_form)
-            .or(thumbnail)
-            .or(file)
-            .with(log),
+        root.or(auth).with(log), /*
+                                 root.or(auth)
+                                     .or(thumbnail)
+                                     .or(file)
+                                     .or(upload_handler)
+                                     .with(log),
+                                     */
     );
 
     server