Added support for upgrade requests

Fixed spelling of shutdown during forceful shutdown
Close any remaining connections once the tui exits
2025-04-20 22:05:37 +02:00 · 2025-04-20 21:45:05 +02:00 · 2025-04-20 21:21:07 +02:00 · 2025-04-20 20:46:31 +02:00
7 changed files with 11 additions and 182 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -173,60 +173,6 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

-[[package]]
-name = "axum"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de45108900e1f9b9242f7f2e254aa3e2c029c921c258fe9e6b4217eeebd54288"
-dependencies = [
- "axum-core",
- "bytes",
- "form_urlencoded",
- "futures-util",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-util",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
-dependencies = [
- "bytes",
- "futures-core",
- "http",
- "http-body",
- "http-body-util",
- "mime",
- "pin-project-lite",
- "rustversion",
- "sync_wrapper",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "backtrace"
 version = "0.3.71"
@@ -1684,16 +1630,6 @@ dependencies = [
 "url",
 ]

-[[package]]
-name = "leon"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a865ffec5587961f5afc6d365bccb304f4feaa1928f4fe94c91c9d210d7310"
-dependencies = [
- "miette",
- "thiserror 2.0.12",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.172"
@@ -1764,12 +1700,6 @@ dependencies = [
 "regex-automata 0.1.10",
 ]

-[[package]]
-name = "matchit"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
-
 [[package]]
 name = "md5"
 version = "0.7.0"
@@ -1782,29 +1712,6 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"

-[[package]]
-name = "miette"
-version = "7.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484"
-dependencies = [
- "cfg-if",
- "miette-derive",
- "thiserror 1.0.69",
- "unicode-width 0.1.14",
-]
-
-[[package]]
-name = "miette-derive"
-version = "7.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -2862,16 +2769,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "serde_path_to_error"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a"
-dependencies = [
- "itoa",
- "serde",
-]
-
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -2965,7 +2862,6 @@ dependencies = [
 name = "siranga"
 version = "0.0.0"
 dependencies = [
- "axum",
 "bytes",
 "clap",
 "clio",
@@ -2978,7 +2874,6 @@ dependencies = [
 "hyper",
 "hyper-util",
 "ldap3",
- "leon",
 "pin-project-lite",
 "rand 0.8.5",
 "ratatui",
@@ -3336,7 +3231,6 @@ dependencies = [
 "tokio",
 "tower-layer",
 "tower-service",
- "tracing",
 ]

 [[package]]
@@ -3357,7 +3251,6 @@ version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
- "log",
 "pin-project-lite",
 "tracing-attributes",
 "tracing-core",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,6 @@ default-run = "siranga"
 license = "AGPL-3.0-only"

 [dependencies]
-axum = "0.8.3"
 bytes = "1.10.1"
 clap = { version = "4.5.35", features = ["derive"] }
 clio = { version = "0.3.5", features = ["clap-parse"] }
@@ -18,7 +17,6 @@ http-body-util = { version = "0.1.3", features = ["full"] }
 hyper = { version = "1.6.0", features = ["full"] }
 hyper-util = { version = "0.1.11", features = ["full"] }
 ldap3 = "0.11.5"
-leon = "3.0.2"
 pin-project-lite = "0.2.16"
 rand = "0.8.5"
 ratatui = { version = "0.29.0", features = ["unstable-backend-writer"] }
--- a/manifests/deployment.yaml
+++ b/manifests/deployment.yaml
@@ -31,12 +31,8 @@ spec:
              cpu: 50m
              memory: 100Mi
          ports:
-            - name: ssh
-              containerPort: 2222
-            - name: http
-              containerPort: 3000
-            - name: metrics
-              containerPort: 4000
+            - containerPort: 3000
+            - containerPort: 2222
          volumeMounts:
            - name: credentials
              readOnly: true
@@ -55,23 +51,12 @@ spec:
              value: ldap://lldap.lldap.svc.cluster.local:3890
            - name: LDAP_BASE
              value: ou=people,dc=huizinga,dc=dev
-            - name: LDAP_SEARCH_FILTER
-              value: (uid={username})
            - name: LDAP_BIND_DN
-              valueFrom:
-                secretKeyRef:
-                  name: siranga-lldap-credentials
-                  key: bind_dn
+              value: uid=siranga.siranga,ou=people,dc=huizinga,dc=dev
            - name: LDAP_PASSWORD_FILE
              value: /secrets/credentials/password
            - name: PRIVATE_KEY_FILE
              value: /secrets/key/private.pem
-          livenessProbe:
-            httpGet:
-              path: /health
-              port: metrics
-            initialDelaySeconds: 3
-            periodSeconds: 3
      volumes:
        - name: credentials
          secret:
--- a/manifests/service.yaml
+++ b/manifests/service.yaml
@@ -6,7 +6,6 @@ spec:
  ports:
    - name: http
      port: 3000
-      targetPort: http
  selector:
    app: siranga
 ---
@@ -21,6 +20,6 @@ spec:
  ports:
    - name: ssh
      port: 22
-      targetPort: ssh
+      targetPort: 2222
  selector:
    app: siranga
--- a/src/io/stats.rs
+++ b/src/io/stats.rs
@@ -39,7 +39,7 @@ impl Stats {
    }

    pub fn set_failed(&self, failed: bool) {
-        self.failed.store(failed, Ordering::Relaxed);
+        self.failed.fetch_and(failed, Ordering::Relaxed);
    }

    pub fn rx(&self) -> Unit {
--- a/src/ldap.rs
+++ b/src/ldap.rs
@@ -1,5 +1,4 @@
 use ldap3::{LdapConnAsync, SearchEntry};
-use leon::{Template, vals};
 use russh::keys::PublicKey;
 use tokio::select;
 use tokio::task::JoinHandle;
@@ -10,7 +9,6 @@ use tracing::{debug, error};
 pub struct Ldap {
    base: String,
    ldap: ldap3::Ldap,
-    search_filter: String,
 }

 #[derive(Debug, thiserror::Error)]
@@ -23,10 +21,6 @@ pub enum LdapError {
    MissingEnvironmentVariable(&'static str),
    #[error("Could not read password file: {0}")]
    CouldNotReadPasswordFile(#[from] std::io::Error),
-    #[error("Failed to parse search filter: {0}")]
-    FailedToParseSearchFilter(#[from] leon::ParseError),
-    #[error("Failed to render search filter: {0}")]
-    FailedToRenderSearchFilter(#[from] leon::RenderError),
 }

 impl Ldap {
@@ -39,8 +33,6 @@ impl Ldap {
            .map_err(|_| LdapError::MissingEnvironmentVariable("LDAP_BASE"))?;
        let bind_dn = std::env::var("LDAP_BIND_DN")
            .map_err(|_| LdapError::MissingEnvironmentVariable("LDAP_BIND_DN"))?;
-        let search_filter = std::env::var("LDAP_SEARCH_FILTER")
-            .map_err(|_| LdapError::MissingEnvironmentVariable("LDAP_SEARCH_FILTER"))?;

        let password = std::env::var("LDAP_PASSWORD_FILE").map_or_else(
            |_| {
@@ -73,39 +65,20 @@ impl Ldap {

        ldap.simple_bind(&bind_dn, &password).await?.success()?;

-        Ok((
-            Self {
-                base,
-                ldap,
-                search_filter,
-            },
-            handle,
-        ))
+        Ok((Self { base, ldap }, handle))
    }

    pub async fn get_ssh_keys(
        &mut self,
        user: impl AsRef<str>,
    ) -> Result<Vec<PublicKey>, LdapError> {
-        let search_filter = Template::parse(&self.search_filter)?;
-
-        let search_filter = search_filter.render(&&vals(|key| {
-            if key == "username" {
-                Some(user.as_ref().to_string().into())
-            } else {
-                None
-            }
-        }))?;
-
-        debug!("search_filter = {search_filter}");
-
        Ok(self
            .ldap
            .search(
                &self.base,
                ldap3::Scope::Subtree,
                // TODO: Make this not hardcoded
-                &search_filter,
+                &format!("(uid={})", user.as_ref()),
                vec!["sshkeys"],
            )
            .await?
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,8 +4,6 @@ use std::net::SocketAddr;
 use std::path::Path;
 use std::time::Duration;

-use axum::routing::get;
-use axum::{Json, Router};
 use color_eyre::eyre::Context;
 use dotenvy::dotenv;
 use rand::rngs::OsRng;
@@ -56,10 +54,6 @@ async fn shutdown_task(token: CancellationToken) {
    }
 }

-async fn axum_graceful_shutdown(token: CancellationToken) {
-    token.cancelled().await;
-}
-
 #[tokio::main]
 async fn main() -> color_eyre::Result<()> {
    color_eyre::install()?;
@@ -91,18 +85,12 @@ async fn main() -> color_eyre::Result<()> {
        russh::keys::PrivateKey::random(&mut OsRng, russh::keys::Algorithm::Ed25519)?
    };

-    let ssh_port = std::env::var("SSH_PORT")
-        .map(|port| port.parse().wrap_err_with(|| format!("SSH_PORT={port}")))
-        .unwrap_or(Ok(2222))?;
    let http_port = std::env::var("HTTP_PORT")
        .map(|port| port.parse().wrap_err_with(|| format!("HTTP_PORT={port}")))
        .unwrap_or(Ok(3000))?;
-    let metrics_port = std::env::var("METRICS_PORT")
-        .map(|port| {
-            port.parse()
-                .wrap_err_with(|| format!("METRICS_PORT={port}"))
-        })
-        .unwrap_or(Ok(4000))?;
+    let ssh_port = std::env::var("SSH_PORT")
+        .map(|port| port.parse().wrap_err_with(|| format!("SSH_PORT={port}")))
+        .unwrap_or(Ok(2222))?;

    let domain =
        std::env::var("TUNNEL_DOMAIN").unwrap_or_else(|_| format!("localhost:{http_port}"));
@@ -126,15 +114,8 @@ async fn main() -> color_eyre::Result<()> {
    let http_task = service.serve(http_listener, token.clone());
    info!("HTTP is available on {http_addr}");

-    let metrics_app = Router::new().route("/health", get(async || Json("healthy")));
-    let metrics_addr = SocketAddr::from(([0, 0, 0, 0], metrics_port));
-    let metrics_listener = TcpListener::bind(metrics_addr).await?;
-    let metrics = axum::serve(metrics_listener, metrics_app)
-        .with_graceful_shutdown(axum_graceful_shutdown(token.clone()));
-    info!("Metrics are available on {http_addr}");
-
    select! {
-        _ = join!(ldap_handle, ssh_task, http_task, metrics.into_future()) => {
+        _ = join!(ldap_handle, ssh_task, http_task) => {
            info!("Shutdown gracefully");
        }
        _ = shutdown_task(token.clone()) => {
Author	SHA1	Message	Date
Dreaded_X	453718b936	Added support for upgrade requests All checks were successful Build and deploy / Build container and manifests (push) Successful in 5m31s Details	2025-04-20 22:05:37 +02:00
Dreaded_X	c65b4d725d	Fixed spelling of shutdown during forceful shutdown	2025-04-20 21:45:05 +02:00
Dreaded_X	78bc46c56b	Close any remaining connections once the tui exits All checks were successful Build and deploy / Build container and manifests (push) Successful in 6m1s Details	2025-04-20 21:21:07 +02:00
Dreaded_X	3e726c713f	Fixed stats All checks were successful Build and deploy / Build container and manifests (push) Successful in 5m45s Details	2025-04-20 20:46:31 +02:00