Projects/mysqladm-rs
Projects
/
mysqladm-rs
12
2
Fork 0
Code Issues 36 Pull Requests Releases Activity

Don't validate prefixes and postfixes for db item ownership

This commit is contained in:
Oystein Kristoffer Tveit 2024-08-17 22:30:30 +02:00
parent 54a38255e6
commit f957bbd9da
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
3 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/database_privileges.rs
View File

@ -160,7 +160,9 @@ pub fn generate_editor_content_from_privilege_data(
database_name: Option<&str>,
) -> String {
let example_user = format!("{}_user", unix_user);
let example_db = database_name.unwrap_or(&format!("{}_db", unix_user)).to_string();
let example_db = database_name
.unwrap_or(&format!("{}_db", unix_user))
.to_string();
// NOTE: `.max()`` fails when the iterator is empty.
// In this case, we know that the only fields in the

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

@ -95,8 +95,7 @@ impl OwnerValidationError {
.join("\n"),
)
.to_owned(),
_ => format!(
OwnerValidationError::StringEmpty => format!(
"'{}' is not a valid {} name.",
name,
db_or_user.lowercased()
@ -113,12 +112,6 @@ pub enum OwnerValidationError {
// The name is empty, which is invalid
StringEmpty,
// The name is in the format "_<postfix>", which is invalid
MissingPrefix,
// The name is in the format "<prefix>_", which is invalid
MissingPostfix,
}
pub type CreateDatabasesOutput = BTreeMap<String, Result<(), CreateDatabaseError>>;

36
src/server/input_sanitization.rs
View File

@ -43,18 +43,14 @@ pub fn validate_ownership_by_prefixes(
return Err(OwnerValidationError::StringEmpty);
}
if name.starts_with('_') {
return Err(OwnerValidationError::MissingPrefix);
}
let (prefix, _) = match name.split_once('_') {
Some(pair) => pair,
None => return Err(OwnerValidationError::MissingPostfix),
};
if !prefixes.iter().any(|g| g == prefix) {
if prefixes
.iter()
.filter(|p| name.starts_with(*p))
.collect::<Vec<_>>()
.is_empty()
{
return Err(OwnerValidationError::NoMatch);
}
};
Ok(())
}
@ -115,24 +111,6 @@ mod tests {
Err(OwnerValidationError::StringEmpty)
);
assert_eq!(
validate_ownership_by_prefixes("user", &prefixes),
Err(OwnerValidationError::MissingPostfix)
);
assert_eq!(
validate_ownership_by_prefixes("something", &prefixes),
Err(OwnerValidationError::MissingPostfix)
);
assert_eq!(
validate_ownership_by_prefixes("user-testdb", &prefixes),
Err(OwnerValidationError::MissingPostfix)
);
assert_eq!(
validate_ownership_by_prefixes("_testdb", &prefixes),
Err(OwnerValidationError::MissingPrefix)
);
assert_eq!(
validate_ownership_by_prefixes("user_testdb", &prefixes),
Ok(())