Skip to content

Add first user into wheel group #3030

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
mchf merged 6 commits into from
Jan 15, 2026
+26 −47
Merged

Add first user into wheel group #3030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b629dc1
Cleared several warnings on unused code
mchf Jan 15, 2026
49f40f0
Automatically add first user into wheel group
mchf Jan 15, 2026
9cbf204
Formatting
mchf Jan 15, 2026
a41bfec
Moved implementation of logic from ModelAdapter into Model
mchf Jan 15, 2026
021537a
Set addidional user groups in time of user creation
mchf Jan 15, 2026
66e4dec
Formatting
mchf Jan 15, 2026
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
6 changes: 1 addition & 5 deletions rust/agama-server/src/users/web.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
use crate::{error::Error, users::password::PasswordChecker};
use agama_lib::{
error::ServiceError,
users::{model::RootPatchSettings, proxies::Users1Proxy, FirstUser, RootUser, UsersClient},
users::{model::RootPatchSettings, FirstUser, RootUser, UsersClient},
};
use axum::{
extract::State,
Expand All @@ -37,7 +37,6 @@ use axum::{
Json, Router,
};
use serde::Deserialize;
use tokio_stream::{Stream, StreamExt};

use super::password::PasswordCheckResult;

Expand All @@ -48,9 +47,6 @@ struct UsersState<'a> {

/// Sets up and returns the axum service for the users module.
pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
const DBUS_SERVICE: &str = "org.opensuse.Agama.Manager1";
const DBUS_PATH: &str = "/org/opensuse/Agama/Users1";

let users = UsersClient::new(dbus.clone()).await?;
let state = UsersState { users };
// FIXME: use anyhow temporarily until we adapt all these methods to return
Expand Down
67 changes: 25 additions & 42 deletions rust/agama-users/src/model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,6 @@ pub trait ModelAdapter: Send + 'static {
fn install(&self, _config: &Config) -> Result<(), service::Error> {
Ok(())
}

fn add_first_user(&self, _user: &FirstUserConfig) -> Result<(), service::Error> {
Ok(())
}

fn add_root_user(&self, _root: &RootUserConfig) -> Result<(), service::Error> {
Ok(())
}

fn set_user_password(
&self,
_user_name: &str,
_user_password: &UserPassword,
) -> Result<(), service::Error> {
Ok(())
}

fn update_authorized_keys(&self, _ssh_key: &str) -> Result<(), service::Error> {
Ok(())
}

fn update_user_fullname(&self, _user: &FirstUserConfig) -> Result<(), service::Error> {
Ok(())
}
}

/// [ModelAdapter] implementation for systemd-based systems.
Expand All @@ -72,18 +48,14 @@ impl Model {
install_dir: PathBuf::from(install_dir.as_ref()),
}
}
}

impl ModelAdapter for Model {
fn install(&self, config: &Config) -> Result<(), service::Error> {
if let Some(first_user) = &config.first_user {
self.add_first_user(&first_user)?;
}
if let Some(root_user) = &config.root {
self.add_root_user(&root_user)?;
}
/// Wrapper for creating Command which works in installation chroot
fn chroot_command(&self) -> Command {
Copy link
Copy Markdown
Contributor

@imobachgs imobachgs Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good idea. Thinking about it, and having into account that there is some repetitive code when running the commands, perhaps we could even think about having our own struct.

Something like:

struct ChrootedCommand(Command);

And you could do:

ChrootedCommand::on("/mnt")
  .command("adduser")
  .arg("blah")
  .output()?; // we could even have a more convenient way of running it if we want to

It is just an idea. WDYT? We could even reuse it in other parts of Agama.

let mut cmd = Command::new("chroot");

Copy link
Copy Markdown
Contributor

@imobachgs imobachgs Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why

those

empty

lines? ;-)

Copy link
Copy Markdown
Contributor Author

@mchf mchf Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well just my way of formatting .. kind of separates things into logical blocks

Ok(())
cmd.arg(&self.install_dir);

cmd
}

/// Reads first user's data from given config and updates its setup accordingly
Expand All @@ -95,9 +67,9 @@ impl ModelAdapter for Model {
return Err(service::Error::MissingUserData);
};

let useradd = Command::new("chroot")
.arg(&self.install_dir)
.args(["useradd", &user_name])
let useradd = self
.chroot_command()
.args(["useradd", "-G", "wheel", &user_name])
.output()?;

if !useradd.status.success() {
Expand All @@ -109,7 +81,6 @@ impl ModelAdapter for Model {
}

self.set_user_password(user_name, user_password)?;

self.update_user_fullname(user)
}

Expand Down Expand Up @@ -140,8 +111,7 @@ impl ModelAdapter for Model {
user_name: &str,
user_password: &UserPassword,
) -> Result<(), service::Error> {
let mut passwd_cmd = Command::new("chroot");
passwd_cmd.arg(&self.install_dir);
let mut passwd_cmd = self.chroot_command();
passwd_cmd.arg("chpasswd");

if user_password.hashed_password {
Expand Down Expand Up @@ -193,8 +163,8 @@ impl ModelAdapter for Model {
return Ok(());
};

let chfn = Command::new("chroot")
.arg(&self.install_dir)
let chfn = self
.chroot_command()
.args(["chfn", "-f", &full_name, &user_name])
.output()?;

Expand All @@ -213,3 +183,16 @@ impl ModelAdapter for Model {
Ok(())
}
}

impl ModelAdapter for Model {
fn install(&self, config: &Config) -> Result<(), service::Error> {
if let Some(first_user) = &config.first_user {
self.add_first_user(&first_user)?;
}
if let Some(root_user) = &config.root {
self.add_root_user(&root_user)?;
}

Ok(())
}
}
Loading