Projects/mysqladm-rs
12
2
Fork 0
Code Issues 44 Pull Requests Actions Packages Releases Activity

Deduplicate common username/group prefixes in error msg
Some checks failed
Build / check (push) Failing after 5m20s
Details
Build / build (push) Successful in 12m54s
Details
Build / docs (push) Successful in 16m35s
Details

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-11-10 00:50:36 +09:00
parent e8b28f5116
commit 46c5d372b2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/protocol/server_responses.rs
View File

@@ -75,11 +75,13 @@ impl OwnerValidationError {
pub fn to_error_message(self, name: &str, db_or_user: DbOrUser) -> String { pub fn to_error_message(self, name: &str, db_or_user: DbOrUser) -> String {
let user = UnixUser::from_enviroment(); let user = UnixUser::from_enviroment();
let UnixUser { username, groups } = user.unwrap_or(UnixUser { let UnixUser { username, mut groups } = user.unwrap_or(UnixUser {
username: "???".to_string(), username: "???".to_string(),
groups: vec![], groups: vec![],
}); });
groups.sort();
match self { match self {
OwnerValidationError::NoMatch => format!( OwnerValidationError::NoMatch => format!(
indoc! {r#" indoc! {r#"
@@ -97,9 +99,9 @@ impl OwnerValidationError {
db_or_user.lowercased(), db_or_user.lowercased(),
username, username,
groups groups
.iter() .into_iter()
.filter(|g| g != &username)
.map(|g| format!(" - {}", g)) .map(|g| format!(" - {}", g))
.sorted()
.join("\n"), .join("\n"),
) )
.to_owned(), .to_owned(),