Skip to content

Server Manager: Dynamic User ID Detection #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cylae merged 1 commit into from
Jan 27, 2026
Merged

Server Manager: Dynamic User ID Detection #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion server_manager/src/core/hardware.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use sysinfo::{System, SystemExt, DiskExt};
use std::process::Command;
use std::path::Path;
use log::{info};
use log::{info, warn};

#[derive(Debug, Clone, Copy, PartialEq)]
pub enum HardwareProfile {
Expand All @@ -19,10 +19,13 @@ pub struct HardwareInfo {
pub has_intel_quicksync: bool,
pub disk_gb: u64,
pub swap_gb: u64,
pub user_id: String,
pub group_id: String,
}

impl HardwareInfo {
pub fn detect() -> Self {
let (user_id, group_id) = Self::detect_user();
let mut sys = System::new_all();
sys.refresh_memory();
sys.refresh_cpu();
Expand All @@ -49,6 +52,7 @@ impl HardwareInfo {
info!("Hardware Detected: RAM={}GB, Swap={}GB, Disk={}GB, Cores={}, Profile={:?}", ram_gb, swap_gb, disk_gb, cpu_cores, profile);
if has_nvidia { info!("Nvidia GPU Detected"); }
if has_intel_quicksync { info!("Intel QuickSync Detected"); }
info!("User Context: UID={}, GID={}", user_id, group_id);

Self {
profile,
Expand All @@ -58,6 +62,23 @@ impl HardwareInfo {
has_intel_quicksync,
disk_gb,
swap_gb,
user_id,
group_id,
}
}

fn detect_user() -> (String, String) {
if let Ok(user) = std::env::var("SUDO_USER") {
let uid = Command::new("id").arg("-u").arg(&user).output()
.map(|o| String::from_utf8_lossy(&o.stdout).trim().to_string())
.unwrap_or_else(|_| "1000".to_string());
let gid = Command::new("id").arg("-g").arg(&user).output()
.map(|o| String::from_utf8_lossy(&o.stdout).trim().to_string())
.unwrap_or_else(|_| "1000".to_string());
(uid, gid)
} else {
warn!("SUDO_USER not found. Defaulting to UID/GID 1000.");
("1000".to_string(), "1000".to_string())
}
}

Expand Down
6 changes: 3 additions & 3 deletions server_manager/src/services/apps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ $AUTOCONFIG = array(
Ok(())
}

fn env_vars(&self, _hw: &HardwareInfo, secrets: &Secrets) -> HashMap<String, String> {
fn env_vars(&self, hw: &HardwareInfo, secrets: &Secrets) -> HashMap<String, String> {
let mut vars = HashMap::new();
vars.insert("PUID".to_string(), "1000".to_string());
vars.insert("PGID".to_string(), "1000".to_string());
vars.insert("PUID".to_string(), hw.user_id.clone());
vars.insert("PGID".to_string(), hw.group_id.clone());
vars.insert("MYSQL_HOST".to_string(), "mariadb".to_string());
vars.insert("MYSQL_DATABASE".to_string(), "nextcloud".to_string());
vars.insert("MYSQL_USER".to_string(), "nextcloud".to_string());
Expand Down
4 changes: 2 additions & 2 deletions server_manager/src/services/arr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ macro_rules! define_arr_service {
}
fn env_vars(&self, hw: &HardwareInfo, _secrets: &Secrets) -> HashMap<String, String> {
let mut vars = HashMap::new();
vars.insert("PUID".to_string(), "1000".to_string());
vars.insert("PGID".to_string(), "1000".to_string());
vars.insert("PUID".to_string(), hw.user_id.clone());
vars.insert("PGID".to_string(), hw.group_id.clone());
vars.insert("COMPlus_EnableDiagnostics".to_string(), "0".to_string());

if let HardwareProfile::Low = hw.profile {
Expand Down
6 changes: 3 additions & 3 deletions server_manager/src/services/download.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ impl Service for QBittorrentService {
vec!["8080:8080".to_string(), "6881:6881".to_string(), "6881:6881/udp".to_string()]
}

fn env_vars(&self, _hw: &HardwareInfo, _secrets: &Secrets) -> HashMap<String, String> {
fn env_vars(&self, hw: &HardwareInfo, _secrets: &Secrets) -> HashMap<String, String> {
let mut vars = HashMap::new();
vars.insert("PUID".to_string(), "1000".to_string());
vars.insert("PGID".to_string(), "1000".to_string());
vars.insert("PUID".to_string(), hw.user_id.clone());
vars.insert("PGID".to_string(), hw.group_id.clone());
vars.insert("WEBUI_PORT".to_string(), "8080".to_string());
vars
}
Expand Down
6 changes: 3 additions & 3 deletions server_manager/src/services/infra.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ impl Service for MariaDBService {
Ok(())
}

fn env_vars(&self, _hw: &HardwareInfo, secrets: &Secrets) -> HashMap<String, String> {
fn env_vars(&self, hw: &HardwareInfo, secrets: &Secrets) -> HashMap<String, String> {
let mut vars = HashMap::new();
vars.insert("PUID".to_string(), "1000".to_string());
vars.insert("PGID".to_string(), "1000".to_string());
vars.insert("PUID".to_string(), hw.user_id.clone());
vars.insert("PGID".to_string(), hw.group_id.clone());
vars.insert("MYSQL_ROOT_PASSWORD".to_string(), secrets.mysql_root_password.clone().unwrap_or_default());
vars.insert("MYSQL_DATABASE".to_string(), "server_manager".to_string());
vars.insert("MYSQL_USER".to_string(), "server_manager".to_string());
Expand Down
4 changes: 2 additions & 2 deletions server_manager/src/services/media.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ impl Service for PlexService {

fn env_vars(&self, hw: &HardwareInfo, _secrets: &Secrets) -> HashMap<String, String> {
let mut vars = HashMap::new();
vars.insert("PUID".to_string(), "1000".to_string());
vars.insert("PGID".to_string(), "1000".to_string());
vars.insert("PUID".to_string(), hw.user_id.clone());
vars.insert("PGID".to_string(), hw.group_id.clone());
vars.insert("VERSION".to_string(), "docker".to_string());

// Legacy requirement
Expand Down
6 changes: 6 additions & 0 deletions server_manager/tests/integration_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ fn test_generate_compose_structure() {
has_intel_quicksync: false,
disk_gb: 512,
swap_gb: 2,
user_id: "1000".to_string(),
group_id: "1000".to_string(),
};
let secrets = Secrets {
mysql_root_password: Some("rootpass".to_string()),
Expand Down Expand Up @@ -65,6 +67,8 @@ fn test_profile_logic_low() {
has_intel_quicksync: false,
disk_gb: 100,
swap_gb: 0,
user_id: "1000".to_string(),
group_id: "1000".to_string(),
};
let secrets = Secrets::default();

Expand All @@ -90,6 +94,8 @@ fn test_profile_logic_standard() {
has_intel_quicksync: false,
disk_gb: 512,
swap_gb: 4,
user_id: "1000".to_string(),
group_id: "1000".to_string(),
};
let secrets = Secrets::default();

Expand Down
Loading