.gitignore

@@ -5,7 +5,7 @@ dist
 result
 *.tgz
 *.tar.gz
-*.sqlite
-*.sqlite-shm
-*.sqlite-wal
+file-service/*.sqlite
+file-service/*.sqlite-shm
+file-service/*.sqlite-wal
 file-service/var

Cargo.lock

@@ -937,7 +937,7 @@ dependencies = [
  "cool_asserts",
  "futures-util",
  "hex-string",
- "http 0.2.9",
+ "http",
  "image 0.23.14",
  "log 0.4.20",
  "logger",
@@ -1597,7 +1597,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.9",
+ "http",
  "indexmap 1.9.3",
  "slab",
  "tokio",
@@ -1648,7 +1648,7 @@ dependencies = [
  "base64 0.21.4",
  "bytes",
  "headers-core",
- "http 0.2.9",
+ "http",
  "httpdate",
  "mime 0.3.17",
  "sha1",
@@ -1660,7 +1660,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
 dependencies = [
- "http 0.2.9",
+ "http",
 ]
 
 [[package]]
@@ -1741,17 +1741,6 @@ dependencies = [
  "itoa",
 ]
 
-[[package]]
-name = "http"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
 [[package]]
 name = "http-body"
 version = "0.4.5"
@@ -1759,7 +1748,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes",
- "http 0.2.9",
+ "http",
  "pin-project-lite",
 ]
 
@@ -1811,7 +1800,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http 0.2.9",
+ "http",
  "http-body",
  "httparse",
  "httpdate",
@@ -2348,7 +2337,7 @@ dependencies = [
  "bytes",
  "encoding_rs",
  "futures-util",
- "http 0.2.9",
+ "http",
  "httparse",
  "log 0.4.20",
  "memchr",
@@ -3215,7 +3204,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2",
- "http 0.2.9",
+ "http",
  "http-body",
  "hyper 0.14.27",
  "hyper-tls",
@@ -4307,7 +4296,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 0.2.9",
+ "http",
  "httparse",
  "log 0.4.20",
  "rand 0.8.5",
@@ -4556,11 +4545,6 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 name = "visions"
 version = "0.1.0"
 dependencies = [
- "authdb",
- "http 1.0.0",
- "serde 1.0.188",
- "serde_json",
- "tokio",
  "warp",
 ]
 
@@ -4607,7 +4591,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "headers",
- "http 0.2.9",
+ "http",
  "hyper 0.14.27",
  "log 0.4.20",
  "mime 0.3.17",

visions/server/Cargo.toml

@@ -6,9 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-authdb      = { path = "../../authdb/" }
-http        = { version = "1" }
-serde_json  = { version = "*" }
-serde       = { version = "1" }
-tokio       = { version = "1", features = [ "full" ] }
-warp        = { version = "0.3" }
+warp = "0.3.6"

visions/server/src/handlers.rs

@@ -1,24 +0,0 @@
-use authdb::{AuthDB, AuthToken};
-use http::{response::Response, status::StatusCode, Error};
-
-pub async fn handle_auth(
-    auth_ctx: &AuthDB,
-    auth_token: AuthToken,
-) -> Result<http::Response<String>, Error> {
-    match auth_ctx.authenticate(auth_token).await {
-        Ok(Some(session)) => match serde_json::to_string(&session) {
-            Ok(session_token) => Response::builder()
-                .status(StatusCode::OK)
-                .body(session_token),
-            Err(_) => Response::builder()
-                .status(StatusCode::INTERNAL_SERVER_ERROR)
-                .body("".to_owned()),
-        },
-        Ok(None) => Response::builder()
-            .status(StatusCode::UNAUTHORIZED)
-            .body("".to_owned()),
-        Err(_) => Response::builder()
-            .status(StatusCode::INTERNAL_SERVER_ERROR)
-            .body("".to_owned()),
-    }
-}

visions/server/src/main.rs

@@ -1,105 +1,3 @@
-use authdb::{AuthDB, AuthError, AuthToken, SessionToken, Username};
-use std::{
-    convert::Infallible,
-    net::{IpAddr, Ipv4Addr, SocketAddr},
-    path::PathBuf,
-    sync::Arc,
-};
-use warp::{
-    header,
-    http::StatusCode,
-    reply::{Json, Reply},
-    Filter,
-};
-
-mod handlers;
-use handlers::handle_auth;
-
-#[derive(Debug)]
-struct Unauthorized;
-impl warp::reject::Reject for Unauthorized {}
-
-#[derive(Debug)]
-struct AuthDBError(AuthError);
-impl warp::reject::Reject for AuthDBError {}
-
-fn with_session(
-    auth_ctx: Arc<AuthDB>,
-) -> impl Filter<Extract = (Username,), Error = warp::Rejection> + Clone {
-    header("authentication").and_then({
-        move |value: String| {
-            let auth_ctx = auth_ctx.clone();
-            async move {
-                match auth_ctx.validate_session(SessionToken::from(value)).await {
-                    Ok(Some(username)) => Ok(username),
-                    Ok(None) => Err(warp::reject::custom(Unauthorized)),
-                    Err(err) => Err(warp::reject::custom(AuthDBError(err))),
-                }
-            }
-        }
-    })
-}
-
-fn route_echo_unauthenticated() -> impl Filter<Extract = (Json,), Error = warp::Rejection> + Clone {
-    warp::path!("api" / "v1" / "echo" / String).map(|param: String| {
-        println!("param: {}", param);
-        warp::reply::json(&vec!["unauthenticated", param.as_str()])
-    })
-}
-
-fn route_authenticate(
-    auth_ctx: Arc<AuthDB>,
-) -> impl Filter<Extract = (Json,), Error = warp::Rejection> + Clone {
-    let auth_ctx = auth_ctx.clone();
-    warp::path!("api" / "v1" / "auth")
-        .and(warp::post())
-        .and(warp::body::json())
-        .map(move |param: AuthToken| {
-            let res = handle_auth(&auth_ctx, param.clone());
-            warp::reply::json(&param)
-        })
-}
-
-fn route_echo_authenticated(
-    auth_ctx: Arc<AuthDB>,
-) -> impl Filter<Extract = (Json,), Error = warp::Rejection> + Clone {
-    warp::path!("api" / "v1" / "echo" / String)
-        .and(with_session(auth_ctx.clone()))
-        .map(move |param: String, username: Username| {
-            println!("param: {:?}", username);
-            println!("param: {}", param);
-            warp::reply::json(&vec!["authenticated", username.as_str(), param.as_str()])
-        })
-}
-
-async fn handle_rejection(err: warp::Rejection) -> Result<impl Reply, Infallible> {
-    if let Some(Unauthorized) = err.find() {
-        Ok(warp::reply::with_status(
-            "".to_owned(),
-            StatusCode::UNAUTHORIZED,
-        ))
-    } else {
-        Ok(warp::reply::with_status(
-            "".to_owned(),
-            StatusCode::INTERNAL_SERVER_ERROR,
-        ))
-    }
-}
-
-#[tokio::main]
-pub async fn main() {
-    let auth_db = AuthDB::new(PathBuf::from("./auth_db.sqlite"))
-        .await
-        .expect("AuthDB should initialize");
-    let auth_ctx: Arc<AuthDB> = Arc::new(auth_db);
-
-    let filter = route_echo_authenticated(auth_ctx.clone())
-        .or(route_authenticate(auth_ctx.clone()))
-        .or(route_echo_unauthenticated())
-        .recover(handle_rejection);
-
-    let server = warp::serve(filter);
-    server
-        .run(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 8001))
-        .await;
+fn main() {
+    println!("Hello, world!");
 }