fix: GECOS subfield trimming and trailing backslash handling (v0.3.1)

display_name() now returns only the first GECOS subfield (before comma)
instead of the full GECOS string with room numbers and phone extensions.

split_shell_words() returns None for trailing backslashes instead of
silently ignoring them.
This commit is contained in:
nevaforget 2026-03-28 00:07:29 +01:00
parent 658328b39b
commit 0e0b1d3cc0
3 changed files with 26 additions and 7 deletions

View File

@ -1,6 +1,6 @@
[package] [package]
name = "moongreet" name = "moongreet"
version = "0.3.0" version = "0.3.1"
edition = "2024" edition = "2024"
description = "A greetd greeter for Wayland with GTK4 and Layer Shell" description = "A greetd greeter for Wayland with GTK4 and Layer Shell"
license = "MIT" license = "MIT"

View File

@ -47,14 +47,16 @@ fn split_shell_words(s: &str) -> Option<Vec<String>> {
} }
'\\' if in_double => { '\\' if in_double => {
// In double quotes, backslash escapes the next char // In double quotes, backslash escapes the next char
if let Some(next) = chars.next() { match chars.next() {
current.push(next); Some(next) => current.push(next),
None => return None, // Trailing backslash
} }
} }
'\\' if !in_single && !in_double => { '\\' if !in_single && !in_double => {
// Outside quotes, backslash escapes the next char // Outside quotes, backslash escapes the next char
if let Some(next) = chars.next() { match chars.next() {
current.push(next); Some(next) => current.push(next),
None => return None, // Trailing backslash
} }
} }
c if c.is_whitespace() && !in_single && !in_double => { c if c.is_whitespace() && !in_single && !in_double => {
@ -1189,6 +1191,12 @@ mod tests {
); );
} }
#[test]
fn shell_words_trailing_backslash() {
assert_eq!(split_shell_words(r"foo\"), None);
assert_eq!(split_shell_words(r#""foo\"#), None);
}
// -- login_worker tests -- // -- login_worker tests --
// These use a real Unix socket pair via UnixListener to simulate greetd. // These use a real Unix socket pair via UnixListener to simulate greetd.

View File

@ -30,12 +30,12 @@ pub struct User {
} }
impl User { impl User {
/// Return the display name (GECOS if available, otherwise username). /// Return the display name (first GECOS subfield if available, otherwise username).
pub fn display_name(&self) -> &str { pub fn display_name(&self) -> &str {
if self.gecos.is_empty() { if self.gecos.is_empty() {
&self.username &self.username
} else { } else {
&self.gecos self.gecos.split(',').next().unwrap_or(&self.username)
} }
} }
} }
@ -150,6 +150,17 @@ mod tests {
assert_eq!(users[0].home, PathBuf::from("/home/testuser")); assert_eq!(users[0].home, PathBuf::from("/home/testuser"));
} }
#[test]
fn gecos_subfield_trimmed() {
let dir = tempfile::tempdir().unwrap();
let path = make_passwd(
dir.path(),
"testuser:x:1000:1000:Test User,Room 123,555-1234:/home/testuser:/bin/bash\n",
);
let users = get_users(Some(&path));
assert_eq!(users[0].display_name(), "Test User");
}
#[test] #[test]
fn skip_system_users() { fn skip_system_users() {
let dir = tempfile::tempdir().unwrap(); let dir = tempfile::tempdir().unwrap();