Cargo.toml

@@ -10,7 +10,7 @@ futures = "0.3"
 tower = "0.4"
 tokio = { version = "1", features = [ "full" ] }
 hyper = { version = "0.14", features = [ "full" ] }
-axum = { version = "0.6", features = [ "headers", "http2", "macros", "tracing", "json" ] }
+axum = { version = "0.6", features = [ "headers", "http2", "macros", "tracing" ] }
 clap = { version = "4.3", features = [ "derive" ] }
 snafu = "0.7"
 log = "0.4"
@@ -20,8 +20,7 @@ env_logger = "0.10"
 ring = "0.16"
 hex = "0.4"
 chrono = { version = "0.4", features = [ "serde" ] }
-yunohost-api = { path = "yunohost-api", features = [ "axum" ] }
+yunohost-api = { path = "yunohost-api" }
 axum_typed_multipart = "0.8"
 async-trait = "0.1"
 serde = { version = "1", features = [ "derive" ] }
-file-owner = { version = "0.1" }

src/error.rs

@@ -16,16 +16,4 @@ pub enum Error {
 
     #[snafu(display("{}", source))]
     Session { source: crate::state::sessions::SessionError },
-
-    #[snafu(display("Failed to executed tokio task"))]
-    TokioTask { source: tokio::task::JoinError },
-
-    #[snafu(display("Failed to set permissions on file {}", path.display()))]
-    Permissions { path: PathBuf, source: std::io::Error },
-
-    #[snafu(display("Failed to set owner on file {}", path.display()))]
-    PermissionsChown { path: PathBuf, source: file_owner::FileOwnerError },
-
-    #[snafu(display("Failed to set group on file {}", path.display()))]
-    PermissionsChgrp { path: PathBuf, source: file_owner::FileOwnerError },
 }

src/main.rs

@@ -1,6 +1,5 @@
 #[macro_use] extern crate async_trait;
 #[macro_use] extern crate axum;
-#[macro_use] extern crate log;
 #[macro_use] extern crate serde;
 
 use clap::Parser;

src/routes/login.rs

@@ -1,19 +1,16 @@
 use axum::{
-    extract::{FromRequest, Form, Json, Query, State},
+    extract::{FromRequest, Form, Json, Query},
     http::{self, Request, StatusCode},
     response::{IntoResponse, Response},
     RequestExt,
 };
 use axum_typed_multipart::{TryFromMultipart, TypedMultipart};
-use yunohost_api::{Username, Password};
-
-use crate::state::RoutableAppState;
 
 #[derive(Debug, TryFromMultipart, Deserialize)]
 pub struct LoginForm {
-    username: Username,
+    username: String,
     #[allow(dead_code)]
-    password: Password,
+    password: String,
 }
 
 #[async_trait]
@@ -55,10 +52,6 @@ where
 }
 
 #[debug_handler]
-pub async fn route(state: State<RoutableAppState>, form: LoginForm) -> String {
+pub async fn route(form: LoginForm) -> String {
-	if state.check_login(&form.username, &form.password).await.unwrap() {
+    format!("Welcome {}", form.username)
-        format!("Welcome {}", &form.username)
-    } else {
-        format!("Invalid login for {}", &form.username)
-    }
 }

src/routes/mod.rs

@@ -13,7 +13,7 @@ mod login;
 pub fn router(subpath: Option<String>, state: RoutableAppState) -> Router {
     let app = Router::new()
         .route("/", get(index::route))
-        .route("/login/", post(login::route))
+        .route("/login/", get(login::route))
         .with_state(state);
     if let Some(p) = subpath {
         Router::new()

src/state/mod.rs

@@ -1,5 +1,5 @@
 use snafu::prelude::*;
-use yunohost_api::{YunohostUsers, Username, Password};
+use yunohost_api::YunohostUsers;
 
 use std::sync::Arc;
 
@@ -23,8 +23,4 @@ impl AppState {
             users: YunohostUsers::new(500).await.context(YunohostSnafu)?,
         })
     }
-
-    pub async fn check_login(&self, username: &Username, password: &Password) -> Result<bool, Error> {
-        self.users.check_credentials(username, password).await.context(YunohostSnafu)
-    }
 }

src/utils/fs.rs

@@ -1,78 +0,0 @@
-use file_owner::PathExt;
-use snafu::prelude::*;
-use tokio::{
-    fs::set_permissions,
-    task::spawn_blocking,
-};
-
-use std::{
-    fs::Permissions,
-    os::unix::fs::PermissionsExt,
-    path::Path,
-};
-
-use crate::error::*;
-
-pub struct FSPermissions {
-    pub owner: Option<String>,
-    pub group: Option<String>,
-    pub mode: Option<u32>,
-}
-
-impl FSPermissions {
-    pub fn new() -> FSPermissions {
-        FSPermissions {
-            owner: None,
-            group: None,
-            mode: None,
-        }
-    }
-
-    pub fn chown(mut self, owner: &str) -> Self {
-        self.owner = Some(owner.to_string());
-        self
-    }
-
-    pub fn chgrp(mut self, group: &str) -> Self {
-        self.group = Some(group.to_string());
-        self
-    }
-
-    pub fn chmod(mut self, mode: u32) -> Self {
-        self.mode = Some(mode);
-        self
-    }
-
-    pub async fn apply_to(&self, path: &Path) -> Result<(), Error> {
-        if let Some(mode) = self.mode {
-            set_permissions(
-                path,
-                Permissions::from_mode(mode)
-            ).await.context(PermissionsSnafu { path: path.to_path_buf()})?;
-        }
-
-        if let Some(owner) = &self.owner {
-            let owner = owner.to_string();
-            let path = path.to_path_buf();
-            let _ = spawn_blocking(move || -> Result<(), Error> {
-                Ok(
-                    path.set_owner(owner.as_str())
-                        .context(PermissionsChownSnafu { path: path.to_path_buf() })?
-                )
-            }).await.context(TokioTaskSnafu)?;
-        }
-
-        if let Some(group) = &self.group {
-            let group = group.to_string();
-            let path = path.to_path_buf();
-            let _ = spawn_blocking(move || -> Result<(), Error> {
-                Ok(
-                    path.set_group(group.as_str())
-                        .context(PermissionsChgrpSnafu { path: path.to_path_buf() })?
-                )
-            }).await.context(TokioTaskSnafu)?;
-        }
-
-        Ok(())
-    }
-}

src/utils/mod.rs

@@ -1,3 +1,2 @@
-pub mod fs;
 pub mod time;
 pub mod socket;

src/utils/socket.rs

@@ -21,10 +21,7 @@ use tokio::{
 };
 use tower::BoxError;
 
-use crate::{
+use crate::error::*;
-    error::*,
-    utils::fs::FSPermissions,
-};
 
 pub struct ServerAccept {
     uds: UnixListener,
@@ -121,9 +118,7 @@ pub async fn serve(path: &Path, app: Router) -> Result<(), Error> {
         .await
         .unwrap();
 
-    // TODO: make proper permissions
+    // TODO: set permissions
-    // Apply 777 permissions
-    FSPermissions::new().chmod(0o777).apply_to(&path).await?;
     
     let uds = UnixListener::bind(path.clone())
         .context(SocketCreateSnafu { path: path.clone() })?;

yunohost-api/Cargo.toml

@@ -15,13 +15,7 @@ serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
 regex = "1.9"
 url = "2.4"
-futures-util = { version = "0.3", optional = true }
-axum = { version = "0.6", optional = true }
-axum_typed_multipart = { version = "0.8", optional = true }
 
 [dev-dependencies]
 scan-rules = "0.2"
 tokio = { version = "1", features = [ "sync", "rt" ] }
-
-[features]
-axum = [ "dep:futures-util", "dep:axum", "dep:axum_typed_multipart" ]

yunohost-api/src/credentials.rs

@@ -1,17 +1,6 @@
 use ldap3::dn_escape;
-use snafu::prelude::*;
+use serde::{Serialize, Deserialize};
-
+use snafu::OptionExt;
-#[cfg(feature="axum")]
-use axum::{
-    async_trait,
-    body::Bytes,
-};
-#[cfg(feature="axum")]
-use axum_typed_multipart::{FieldMetadata, TryFromChunks, TypedMultipartError};
-#[cfg(feature="axum")]
-use futures_util::stream::Stream;
-
-use serde::{Serialize, Deserialize, Deserializer};
 
 use std::str::FromStr;
 
@@ -25,7 +14,7 @@ fn non_empty_string(s: &str) -> Option<String> {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct Username(String);
 
 impl Username {
@@ -67,29 +56,7 @@ impl std::fmt::Display for Username {
     }
 }
 
-impl<'de> Deserialize<'de> for Username {
+#[derive(Clone, Debug)]
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-        where D: Deserializer<'de>
-    {
-        let s = String::deserialize(deserializer)?;
-        FromStr::from_str(&s).map_err(serde::de::Error::custom)
-    }
-}
-
-#[cfg(feature="axum")]
-#[async_trait]
-impl TryFromChunks for Username {
-    async fn try_from_chunks(
-        chunks: impl Stream<Item = Result<Bytes, TypedMultipartError>> + Send + Sync + Unpin,
-        metadata: FieldMetadata,
-    ) -> Result<Self, TypedMultipartError> {
-        let string = String::try_from_chunks(chunks, metadata).await?;
-        let data = Self::from_str(&string).map_err(|e| TypedMultipartError::Other { source: e.into() })?;
-        Ok(data)
-    }
-}
-
-#[derive(Clone, Debug, Serialize)]
 pub struct Password(String);
 
 impl Password {
@@ -114,25 +81,3 @@ impl FromStr for Password {
         Password::new(s)
     }
 }
-
-impl<'de> Deserialize<'de> for Password {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-        where D: Deserializer<'de>
-    {
-        let s = String::deserialize(deserializer)?;
-        FromStr::from_str(&s).map_err(serde::de::Error::custom)
-    }
-}
-
-#[cfg(feature="axum")]
-#[async_trait]
-impl TryFromChunks for Password {
-    async fn try_from_chunks(
-        chunks: impl Stream<Item = Result<Bytes, TypedMultipartError>> + Send + Sync + Unpin,
-        metadata: FieldMetadata,
-    ) -> Result<Self, TypedMultipartError> {
-        let string = String::try_from_chunks(chunks, metadata).await?;
-        let data = Self::from_str(&string).map_err(|e| TypedMultipartError::Other { source: e.into() })?;
-        Ok(data)
-    }
-}

yunohost-api/src/permissions/ssowat.rs

@@ -5,7 +5,7 @@ use std::collections::HashMap;
 
 use crate::Username;
 
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq)]
 pub struct SSOWatConfig {
     domains: Vec<String>,
     permissions: HashMap<PermissionName, Permission>,
@@ -32,7 +32,7 @@ impl SSOWatConfig {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
 pub struct Permission {
     auth_header: bool,
     label: String,
@@ -43,7 +43,7 @@ pub struct Permission {
     users: Vec<Username>,
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct PermissionName {
     #[serde(flatten)]
     name: String,