Projects/muscl
12
4
Fork 0
Code Issues 73 Pull Requests Actions Packages Releases Activity

Rename AuthorizationError to ValidationError, rename suberrors
All checks were successful
Build and test / build (push) Successful in 2m55s
Details
Build and test / check (push) Successful in 3m4s
Details
Build and test / test (push) Successful in 4m33s
Details
Build and test / check-license (push) Successful in 5m35s
Details
Build and test / docs (push) Successful in 8m23s
Details

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-12-15 14:54:51 +09:00
parent 5f03b55eb5
commit 3f014f073e
17 changed files with 135 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/sql/database_operations.rs
View File

@@ -95,7 +95,7 @@ pub async fn create_databases(
for database_name in database_names {
if let Err(err) =
validate_db_or_user_request(&DbOrUser::Database(database_name.clone()), unix_user)
.map_err(CreateDatabaseError::AuthorizationError)
.map_err(CreateDatabaseError::ValidationError)
{
results.insert(database_name.to_owned(), Err(err));
continue;
@@ -147,7 +147,7 @@ pub async fn drop_databases(
for database_name in database_names {
if let Err(err) =
validate_db_or_user_request(&DbOrUser::Database(database_name.clone()), unix_user)
.map_err(DropDatabaseError::AuthorizationError)
.map_err(DropDatabaseError::ValidationError)
{
results.insert(database_name.to_owned(), Err(err));
continue;
@@ -242,7 +242,7 @@ pub async fn list_databases(
for database_name in database_names {
if let Err(err) =
validate_db_or_user_request(&DbOrUser::Database(database_name.clone()), unix_user)
.map_err(ListDatabasesError::AuthorizationError)
.map_err(ListDatabasesError::ValidationError)
{
results.insert(database_name.to_owned(), Err(err));
continue;

6
src/server/sql/database_privilege_operations.rs
View File

@@ -149,7 +149,7 @@ pub async fn get_databases_privilege_data(
for database_name in database_names.iter() {
if let Err(err) =
validate_db_or_user_request(&DbOrUser::Database(database_name.clone()), unix_user)
.map_err(GetDatabasesPrivilegeDataError::AuthorizationError)
.map_err(GetDatabasesPrivilegeDataError::ValidationError)
{
results.insert(database_name.to_owned(), Err(err));
continue;
@@ -409,7 +409,7 @@ pub async fn apply_privilege_diffs(
&DbOrUser::Database(diff.get_database_name().to_owned()),
unix_user,
)
.map_err(ModifyDatabasePrivilegesError::UserAuthorizationError)
.map_err(ModifyDatabasePrivilegesError::UserValidationError)
{
results.insert(key, Err(err));
continue;
@@ -417,7 +417,7 @@ pub async fn apply_privilege_diffs(
if let Err(err) =
validate_db_or_user_request(&DbOrUser::User(diff.get_user_name().to_owned()), unix_user)
.map_err(ModifyDatabasePrivilegesError::UserAuthorizationError)
.map_err(ModifyDatabasePrivilegesError::UserValidationError)
{
results.insert(key, Err(err));
continue;

12
src/server/sql/user_operations.rs
View File

@@ -102,7 +102,7 @@ pub async fn create_database_users(
for db_user in db_users {
if let Err(err) = validate_db_or_user_request(&DbOrUser::User(db_user.clone()), unix_user)
.map_err(CreateUserError::AuthorizationError)
.map_err(CreateUserError::ValidationError)
{
results.insert(db_user, Err(err));
continue;
@@ -146,7 +146,7 @@ pub async fn drop_database_users(
for db_user in db_users {
if let Err(err) = validate_db_or_user_request(&DbOrUser::User(db_user.clone()), unix_user)
.map_err(DropUserError::AuthorizationError)
.map_err(DropUserError::ValidationError)
{
results.insert(db_user, Err(err));
continue;
@@ -188,7 +188,7 @@ pub async fn set_password_for_database_user(
_db_is_mariadb: bool,
) -> SetUserPasswordResponse {
validate_db_or_user_request(&DbOrUser::User(db_user.clone()), unix_user)
.map_err(SetPasswordError::AuthorizationError)?;
.map_err(SetPasswordError::ValidationError)?;
match unsafe_user_exists(db_user, &mut *connection).await {
Ok(false) => return Err(SetPasswordError::UserDoesNotExist),
@@ -274,7 +274,7 @@ pub async fn lock_database_users(
for db_user in db_users {
if let Err(err) = validate_db_or_user_request(&DbOrUser::User(db_user.clone()), unix_user)
.map_err(LockUserError::AuthorizationError)
.map_err(LockUserError::ValidationError)
{
results.insert(db_user, Err(err));
continue;
@@ -332,7 +332,7 @@ pub async fn unlock_database_users(
for db_user in db_users {
if let Err(err) = validate_db_or_user_request(&DbOrUser::User(db_user.clone()), unix_user)
.map_err(UnlockUserError::AuthorizationError)
.map_err(UnlockUserError::ValidationError)
{
results.insert(db_user, Err(err));
continue;
@@ -438,7 +438,7 @@ pub async fn list_database_users(
for db_user in db_users {
if let Err(err) = validate_db_or_user_request(&DbOrUser::User(db_user.clone()), unix_user)
.map_err(ListUsersError::AuthorizationError)
.map_err(ListUsersError::ValidationError)
{
results.insert(db_user, Err(err));
continue;