Make port numbers configurable

Author: marlonbaeten

Cargo.toml

@@ -6,7 +6,7 @@ edition = "2024"
 [dependencies]
 anyhow = "1.0"
 axum = { version = "0.8", features = ["macros", "ws"] }
-axum-extra = { version = "0.10", default-features = false, features = [
+axum-extra = { version = "0.12", default-features = false, features = [
     "cookie-private",
 ] }
 bytes = "1.8"
@@ -19,16 +19,13 @@ hyper = { version = "1.0", features = ["full"] }
 hyper-util = { version = "0.1", features = ["client-legacy"] }
 oauth2 = "4.4"
 parking_lot = "0.12"
-rand = "0.9"
-reqwest = { version = "0.12", default-features = false, features = [
-    "json",
-    "rustls-tls-webpki-roots",
-] }
+rand = "0.10"
+reqwest = { version = "0.13", default-features = false, features = ["json"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sha2 = "0.10"
 structstruck = "0.5"
-sysinfo = "0.37"
+sysinfo = "0.38"
 tokio = { version = "1", features = ["full", "rt-multi-thread"] }
 tokio-util = "0.7"
 tracing = "0.1"

README.md

@@ -47,6 +47,12 @@ Environment variables overwrite any options from the configuration file and shou
 - `words`: List of words to combine into a unique service name
 - `admins`: Github user names / handles of admins
 
+### Optional configuration values
+
+- `max_services`: Maximum number of concurrent services (default: 1000)
+- `server_port`: Port for the main HTTP server (default: 3000)
+- `proxy_port`: Port for the proxy server (default: 3001)
+
 An example configuration file can be found in this repository.
 
 ## Uploading a binary
@@ -78,7 +84,7 @@ GitHub action example:
 
 ## Configure reverse proxy for Etes
 
-A reverse proxy that terminates TLS connections should be configured. The base domain should point to port 3000 and all sub-domains should point to port 3001.
+A reverse proxy that terminates TLS connections should be configured. The base domain should point to `server_port` (default 3000) and all sub-domains should point to `proxy_port` (default 3001).
 
 Example using caddy:
 

config.toml

@@ -3,6 +3,8 @@ github_token = "a-personal-access-token"
 github_owner = "tweedegolf"
 github_repo = "etes"
 max_services = 10
+server_port = 3000
+proxy_port = 3001
 github_client_id = "some-oauth-client-id"
 github_client_secret = "some-oauth-secret"
 authorize_url = "https://example.com/etes/authorize"

src/config.rs

@@ -34,6 +34,10 @@ pub struct Config {
     pub admins: Vec<String>,
     // Maximum number of concurrent services
     pub max_services: usize,
+    // Port for the main HTTP server
+    pub server_port: u16,
+    // Port for the proxy server
+    pub proxy_port: u16,
 }
 
 impl Config {
@@ -42,6 +46,8 @@ impl Config {
 
         let config: Config = config::Config::builder()
             .set_default("max_services", 1000)?
+            .set_default("server_port", 3000)?
+            .set_default("proxy_port", 3001)?
             .add_source(config::File::with_name(&config_file))
             .add_source(
                 config::Environment::with_prefix("etes")

src/main.rs

@@ -165,10 +165,12 @@ async fn main() -> Result<()> {
 
     let proxy_app: Router = Router::new()
         .fallback(any(proxy::handler))
-        .with_state(state);
+        .with_state(state.clone());
 
-    let listener = tokio::net::TcpListener::bind("127.0.0.1:3000").await?;
-    let proxy_listener = tokio::net::TcpListener::bind("127.0.0.1:3001").await?;
+    let listener_addr = format!("127.0.0.1:{}", state.config.server_port);
+    let proxy_listener_addr = format!("127.0.0.1:{}", state.config.proxy_port);
+    let listener = tokio::net::TcpListener::bind(&listener_addr).await?;
+    let proxy_listener = tokio::net::TcpListener::bind(&proxy_listener_addr).await?;
 
     info!(
         "Starting server on {} and {}",

src/monitor.rs

@@ -2,8 +2,9 @@ use parking_lot::RwLock;
 use serde::Serialize;
 use std::sync::Arc;
 use sysinfo::System;
+use tracing::error;
 
-use crate::{AppState, events::Event};
+use crate::{AppState, events::Event, executable};
 
 #[derive(Clone, Serialize)]
 pub struct MemoryState {
@@ -38,11 +39,19 @@ impl SystemMonitor {
 // Send regular updates to the event manager and thereby the connected clients
 pub async fn send_updates(state: AppState) {
     let mut system = System::new_all();
+    let last_cleanup = std::time::Instant::now();
 
     loop {
+        // if the last cleanup was more than a day ago, run cleanup
+        if last_cleanup.elapsed().as_secs() > 24 * 60 * 60
+            && let Err(e) = executable::remove_unused_executables(state.clone()).await
+        {
+            error!("Failed to remove unused executables: {e:?}");
+        }
+
         system.refresh_all();
 
-        // Store
+        // Store memory state
         state
             .monitor
             .update(system.used_memory(), system.total_memory());

src/proxy.rs

@@ -1,10 +1,9 @@
 use anyhow::{Context, anyhow};
 use axum::{
-    RequestExt,
     extract::{Request, State},
+    http::header::HOST,
     response::{Html, IntoResponse, Redirect, Response},
 };
-use axum_extra::extract::Host;
 use hyper::{StatusCode, Uri};
 
 use crate::{
@@ -51,17 +50,17 @@ pub async fn handler(
     mut req: Request,
 ) -> Result<Response, AppError> {
     let host = req
-        .extract_parts::<Host>()
-        .await
+        .headers()
+        .get(HOST)
+        .and_then(|v| v.to_str().ok())
         .context("No request host found")?;
 
     let subdomain = host
-        .0
         .split('.')
         .next()
         .context("Could not determine subdomain")?;
 
-    let domain = host.0.split('.').skip(1).collect::<Vec<&str>>().join(".");
+    let domain = host.split('.').skip(1).collect::<Vec<&str>>().join(".");
 
     if is_valid_hash(subdomain) {
         let user = User::from_request(random_string(), user)?;

src/util.rs

@@ -1,4 +1,4 @@
-use rand::{Rng, distr::Alphanumeric};
+use rand::{RngExt, distr::Alphanumeric};
 use sha2::Digest;
 use tokio::net::TcpListener;