backend/.gitignore

@@ -1,4 +0,0 @@
-/target/
-weywot-daemon
-weywot-web
-weywot-web.toml

backend/Cargo.toml

@@ -3,25 +3,6 @@ name = "weywot"
 version = "0.1.0"
 edition = "2018"
 
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
 [dependencies]
-argh = "^0.1"
-chrono = "*"
-figment = "^0.10"
-jsonrpc-core = "~18.0"
-jsonrpc-derive = "~18.0"
-jsonrpc-ipc-server = "~18.0"
-pam-client = "^0.3.1"
-serde = "^1.0"
-serde_json = "^1.0"
-
-[dependencies.jsonrpc-core-client]
-version = "~18.0"
-features = ["ipc"]
-
-[dependencies.procfs]
-version = "^0.12"
-features = ["chrono"]
-
-[dependencies.rocket]
-version = "^0.5.0-rc.1"
-features = ["json", "secrets", "tls"]

backend/rustfmt.toml

@@ -1 +0,0 @@
-max_width = 79

backend/src/daemon/auth.rs

@@ -1,15 +0,0 @@
-use pam_client::{Context, Error, Flag};
-use pam_client::conv_mock::Conversation;
-
-const PAM_SERVICE: &'static str = "weywot";
-
-
-pub fn authenticate(username: &str, password: &str) -> Result<(), Error> {
-    let mut ctx = Context::new(
-        PAM_SERVICE,
-        None,
-        Conversation::with_credentials(username, password)
-    )?;
-    ctx.authenticate(Flag::NONE)?;
-    Ok(())
-}

backend/src/daemon/mod.rs

@@ -1,32 +0,0 @@
-mod auth;
-mod rpc;
-use crate::rpc::WeywotRpc;
-use argh::FromArgs;
-use jsonrpc_core::IoHandler;
-use jsonrpc_ipc_server::ServerBuilder;
-use std::env;
-
-#[derive(Debug, FromArgs)]
-/// Weywot privileged daemon
-struct Arguments {
-    #[argh(option, short = 's')]
-    /// socket path
-    socket: Option<String>,
-}
-
-pub fn main() {
-    let args: Arguments = argh::from_env();
-    let socket = if let Ok(v) = env::var("WEYWOT_SOCKET") {
-        v
-    } else {
-        if let Some(v) = args.socket {
-            v
-        } else {
-            "weywot.sock".into()
-        }
-    };
-    let mut io = IoHandler::new();
-    io.extend_with(rpc::RpcDaemon.to_delegate());
-    let server = ServerBuilder::new(io).start(&socket).unwrap();
-    server.wait();
-}

backend/src/daemon/rpc.rs

@@ -1,50 +0,0 @@
-use super::auth;
-use crate::models::status::DaemonStatus;
-use crate::rpc::WeywotRpc;
-use chrono::Local;
-use jsonrpc_core::Error as JsonRpcError;
-use jsonrpc_core::ErrorCode as JsonRpcErrorCode;
-use jsonrpc_core::Result as JsonRpcResult;
-use procfs::process::Process;
-use std::convert::TryInto;
-use std::error::Error;
-use std::process;
-
-pub struct RpcDaemon;
-
-impl WeywotRpc for RpcDaemon {
-    /// Authenticate a user
-    ///
-    /// Authenticates a user with the given username and password.
-    /// Returns nothing if authetication succeeded, or the PAM error
-    /// code and message if authentication failed.
-    fn authenticate(
-        &self,
-        username: String,
-        password: String,
-    ) -> JsonRpcResult<()> {
-        match auth::authenticate(&username, &password) {
-            Ok(_) => Ok(()),
-            Err(e) => Err(JsonRpcError {
-                code: JsonRpcErrorCode::ServerError(e.code().repr().into()),
-                message: e.message().unwrap_or_default().into(),
-                data: None,
-            })
-        }
-    }
-
-    fn status(&self) -> JsonRpcResult<DaemonStatus> {
-        Ok(DaemonStatus {
-            version: env!("CARGO_PKG_VERSION").into(),
-            runtime: proc_runtime().unwrap_or(0),
-        })
-    }
-}
-
-fn proc_runtime() -> Result<i64, Box<dyn Error>> {
-    let pid: i32 = process::id().try_into()?;
-    let proc = Process::new(pid)?;
-    let starttime = proc.stat.starttime()?;
-    let now = Local::now();
-    Ok((now - starttime).num_seconds())
-}

backend/src/main.rs

@@ -1,42 +1,3 @@
-mod daemon;
-mod models;
-mod rpc;
-mod server;
-
-use std::env;
-use std::path::Path;
-
-const NAME: &'static str = "weywot";
-
 fn main() {
-    let mut args = env::args();
-    let arg0 = args.next();
-    let command = Path::new(arg0.as_ref().map_or(NAME, |x| x.as_str()))
-        .file_name()
-        .map_or(NAME, |x| x.to_str().unwrap_or(NAME));
-    match command {
-        "weywot-daemon" => daemon_main(),
-        "weywot-web" => web_main(),
-        _ => cli_main(),
-    }
-}
-
-/// Main entry point for the privileged daemon
-fn daemon_main() {
-    daemon::main();
-}
-
-/// Main entry point for the web server
-fn web_main() {
-    match server::main() {
-        Ok(_) => {}
-        Err(e) => {
-            eprintln!("Failed to start web server: {}", e);
-        }
-    }
-}
-
-/// Main entry point for the CLI/REPL
-fn cli_main() {
-    /* start the CLI */
+    println!("Hello, world!");
 }

backend/src/models/auth.rs

@@ -1,4 +0,0 @@
-use serde::Serialize;
-
-#[derive(Debug, Serialize)]
-pub struct LoginResponse {}

backend/src/models/mod.rs

@@ -1,2 +0,0 @@
-pub mod auth;
-pub mod status;

backend/src/models/status.rs

@@ -1,18 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Deserialize, Serialize)]
-pub struct DaemonStatus {
-    pub version: String,
-    pub runtime: i64,
-}
-
-#[derive(Debug, Serialize)]
-pub struct WebServerStatus {
-    pub version: String,
-}
-
-#[derive(Debug, Serialize)]
-pub struct StatusResponse {
-    pub daemon: DaemonStatus,
-    pub web: WebServerStatus,
-}

backend/src/rpc.rs

@@ -1,12 +0,0 @@
-use crate::models::status::DaemonStatus;
-use jsonrpc_core::Result;
-use jsonrpc_derive::rpc;
-
-#[rpc]
-pub trait WeywotRpc {
-    #[rpc(name = "status")]
-    fn status(&self) -> Result<DaemonStatus>;
-
-    #[rpc(name = "authenticate")]
-    fn authenticate(&self, username: String, password: String) -> Result<()>;
-}

backend/src/server/config.rs

@@ -1,18 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Deserialize, Serialize)]
-pub struct Config {
-    pub address: String,
-    pub port: u16,
-    pub socket: String
-}
-
-impl Default for Config {
-    fn default() -> Config {
-        Config {
-            address: "::".into(),
-            port: 8998,
-            socket: "weywot.sock".into(),
-        }
-    }
-}

backend/src/server/context.rs

@@ -1,30 +0,0 @@
-use super::config::Config;
-use crate::rpc::gen_client::Client;
-use crate::server::error::Error;
-use jsonrpc_core_client::transports::ipc::connect;
-
-pub struct Context {
-    config: Config,
-}
-
-impl Context {
-    /// Construct a new Context
-    ///
-    /// The context takes ownership of the configuration.  To access it,
-    /// use [`Self::config()`].
-    pub fn new(config: Config) -> Self {
-        Self { config }
-    }
-
-    pub async fn client(&self) -> Result<Client, Error> {
-        match connect(&self.config.socket).await {
-            Ok(client) => Ok(client),
-            Err(e) => Err(format!("Cannot connect to daemon: {}", e)),
-        }
-    }
-
-    /// Get a reference to the web server application configuration
-    pub fn config(&self) -> &Config {
-        &self.config
-    }
-}

backend/src/server/error.rs

@@ -1,50 +0,0 @@
-use jsonrpc_core_client::RpcError;
-use rocket::response::Responder;
-use rocket::serde::json::Json;
-use rocket::serde::Serialize;
-
-#[derive(Debug, Serialize)]
-pub struct ErrorResponse {
-    pub error: String,
-}
-
-impl ErrorResponse {
-    pub fn new<S: Into<String>>(message: S) -> Self {
-        Self {
-            error: message.into(),
-        }
-    }
-}
-
-#[derive(Debug, Responder)]
-pub enum ApiError {
-    #[response(status = 503, content_type = "json")]
-    ServiceUnavailable(Json<ErrorResponse>),
-
-    #[response(status = 401, content_type = "json")]
-    AuthError(Json<ErrorResponse>),
-}
-
-pub enum Error {
-    ServiceUnavailable(String),
-    AuthError(String),
-}
-
-impl From<Error> for ApiError {
-    fn from(error: Error) -> Self {
-        match error {
-            Error::ServiceUnavailable(e) => {
-                Self::ServiceUnavailable(Json(ErrorResponse::new(e)))
-            }
-            Error::AuthError(e) => {
-                Self::AuthError(Json(ErrorResponse::new(e)))
-            }
-        }
-    }
-}
-
-impl From<RpcError> for Error {
-    fn from(error: RpcError) -> Self {
-        Self::ServiceUnavailable(error.to_string())
-    }
-}

backend/src/server/mod.rs

@@ -1,68 +0,0 @@
-mod config;
-mod context;
-mod error;
-mod routes;
-use config::Config;
-
-use argh::FromArgs;
-use context::Context;
-use rocket;
-use rocket::figment::providers::{Env, Format, Serialized, Toml};
-use rocket::figment::Figment;
-
-const DEFAULT_CONFIG: &'static str = "weywot-web.toml";
-
-#[derive(Debug, FromArgs)]
-/// Weywot web server
-struct Arguments {
-    /// bind address
-    #[argh(option)]
-    address: Option<String>,
-
-    /// bind port
-    #[argh(option)]
-    port: Option<u16>,
-
-    /// configuration file
-    #[argh(option, short = 'c')]
-    config: Option<String>,
-
-    /// weywot daemon socket path
-    #[argh(option, short = 's')]
-    socket: Option<String>,
-}
-
-#[rocket::main]
-pub async fn main() -> Result<(), rocket::Error> {
-    let args: Arguments = argh::from_env();
-    let mut figment = Figment::from(rocket::Config::default())
-        .merge(Serialized::defaults(Config::default()))
-        .merge(Toml::file(
-            args.config.as_ref().map_or(DEFAULT_CONFIG, |x| x.as_str()),
-        ))
-        .merge(Env::prefixed("WEYWOT_WEB_").global())
-        .merge(("ident", "Weywot/web"));
-    if let Some(address) = args.address {
-        figment = figment.merge(("address", address));
-    }
-    if let Some(port) = args.port {
-        figment = figment.merge(("port", port));
-    }
-    if let Some(socket) = args.socket {
-        figment = figment.merge(("socket", socket));
-    }
-
-    let config: Config = figment.extract().unwrap();
-    let context = Context::new(config);
-
-    rocket::custom(figment)
-        .mount(
-            "/",
-            rocket::routes![routes::status::get_status, routes::auth::login],
-        )
-        .manage(context)
-        .ignite()
-        .await?
-        .launch()
-        .await
-}

backend/src/server/routes/auth.rs

@@ -1,44 +0,0 @@
-use super::super::context::Context;
-use super::super::error::{ApiError, Error};
-use crate::models::auth::LoginResponse;
-use rocket::form::{Form, FromForm};
-use rocket::http::{Cookie, CookieJar};
-use rocket::serde::json::Json;
-use rocket::serde::Serialize;
-use rocket::State;
-use serde_json;
-
-#[derive(FromForm)]
-pub struct LoginForm<'r> {
-    username: &'r str,
-    password: &'r str,
-}
-
-#[derive(Serialize)]
-struct AuthCookie {
-    username: String,
-}
-
-#[rocket::post("/auth/login", data = "<form>")]
-pub async fn login(
-    context: &State<Context>,
-    cookies: &CookieJar<'_>,
-    form: Form<LoginForm<'_>>,
-) -> Result<Json<LoginResponse>, ApiError> {
-    let client = context.client().await?;
-    match client
-        .authenticate(form.username.into(), form.password.into())
-        .await
-    {
-        Ok(_) => {}
-        Err(e) => return Err(Error::AuthError(e.to_string()).into()),
-    };
-    let cookie = AuthCookie {
-        username: form.username.into(),
-    };
-    cookies.add_private(Cookie::new(
-        "weywot.auth",
-        serde_json::to_string(&cookie).unwrap(),
-    ));
-    Ok(Json(LoginResponse {}))
-}

backend/src/server/routes/mod.rs

@@ -1,2 +0,0 @@
-pub mod auth;
-pub mod status;

backend/src/server/routes/status.rs

@@ -1,18 +0,0 @@
-use crate::models::status::{StatusResponse, WebServerStatus};
-use crate::server::context::Context;
-use crate::server::error::ApiError;
-use rocket::serde::json::Json;
-use rocket::State;
-
-#[rocket::get("/status")]
-pub async fn get_status(
-    state: &State<Context>,
-) -> Result<Json<StatusResponse>, ApiError> {
-    let client = state.client().await?;
-    Ok(Json(StatusResponse {
-        daemon: client.status().await.unwrap(),
-        web: WebServerStatus {
-            version: env!("CARGO_PKG_VERSION").into(),
-        },
-    }))
-}