core/protocol: split commands into separate files

src/server/input_sanitization.rs

@@ -1,6 +1,6 @@
 use crate::core::{
     common::UnixUser,
-    protocol::server_responses::{NameValidationError, OwnerValidationError},
+    protocol::request_validation::{NameValidationError, OwnerValidationError},
 };
 
 const MAX_NAME_LENGTH: usize = 64;

src/server/server_loop.rs

@@ -18,7 +18,7 @@ use crate::server::sql::database_operations::list_databases;
 use crate::{
     core::{
         common::{DEFAULT_SOCKET_PATH, UnixUser},
-        protocol::request_response::{
+        protocol::{
             Request, Response, ServerToClientMessageStream, create_server_to_client_message_stream,
         },
     },
@@ -233,8 +233,8 @@ async fn handle_requests_for_single_session_with_db_connection(
 
         // TODO: don't clone the request
         let request_to_display = match &request {
-            Request::PasswdUser(db_user, _) => {
-                Request::PasswdUser(db_user.to_owned(), "<REDACTED>".to_string())
+            Request::PasswdUser((db_user, _)) => {
+                Request::PasswdUser((db_user.to_owned(), "<REDACTED>".to_string()))
             }
             request => request.to_owned(),
         };
@@ -289,11 +289,11 @@ async fn handle_requests_for_single_session_with_db_connection(
                 let result = drop_database_users(db_users, unix_user, db_connection).await;
                 Response::DropUsers(result)
             }
-            Request::PasswdUser(db_user, password) => {
+            Request::PasswdUser((db_user, password)) => {
                 let result =
                     set_password_for_database_user(&db_user, &password, unix_user, db_connection)
                         .await;
-                Response::PasswdUser(result)
+                Response::SetUserPassword(result)
             }
             Request::ListUsers(db_users) => match db_users {
                 Some(db_users) => {
@@ -321,8 +321,10 @@ async fn handle_requests_for_single_session_with_db_connection(
 
         // TODO: don't clone the response
         let response_to_display = match &response {
-            Response::PasswdUser(Err(SetPasswordError::MySqlError(_))) => {
-                Response::PasswdUser(Err(SetPasswordError::MySqlError("<REDACTED>".to_string())))
+            Response::SetUserPassword(Err(SetPasswordError::MySqlError(_))) => {
+                Response::SetUserPassword(Err(SetPasswordError::MySqlError(
+                    "<REDACTED>".to_string(),
+                )))
             }
             response => response.to_owned(),
         };

src/server/sql/database_operations.rs

@@ -10,8 +10,9 @@ use crate::{
     core::{
         common::UnixUser,
         protocol::{
-            CreateDatabaseError, CreateDatabasesOutput, DropDatabaseError, DropDatabasesOutput,
-            ListAllDatabasesError, ListAllDatabasesOutput, ListDatabasesError, ListDatabasesOutput,
+            CreateDatabaseError, CreateDatabasesResponse, DropDatabaseError, DropDatabasesResponse,
+            ListAllDatabasesError, ListAllDatabasesResponse, ListDatabasesError,
+            ListDatabasesResponse,
         },
     },
     server::{
@@ -46,7 +47,7 @@ pub async fn create_databases(
     database_names: Vec<MySQLDatabase>,
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> CreateDatabasesOutput {
+) -> CreateDatabasesResponse {
     let mut results = BTreeMap::new();
 
     for database_name in database_names {
@@ -105,7 +106,7 @@ pub async fn drop_databases(
     database_names: Vec<MySQLDatabase>,
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> DropDatabasesOutput {
+) -> DropDatabasesResponse {
     let mut results = BTreeMap::new();
 
     for database_name in database_names {
@@ -177,7 +178,7 @@ pub async fn list_databases(
     database_names: Vec<MySQLDatabase>,
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> ListDatabasesOutput {
+) -> ListDatabasesResponse {
     let mut results = BTreeMap::new();
 
     for database_name in database_names {
@@ -227,7 +228,7 @@ pub async fn list_databases(
 pub async fn list_all_databases_for_user(
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> ListAllDatabasesOutput {
+) -> ListAllDatabasesResponse {
     let result = sqlx::query_as::<_, DatabaseRow>(
         r#"
           SELECT `SCHEMA_NAME` AS `database`

src/server/sql/database_privilege_operations.rs

@@ -28,9 +28,9 @@ use crate::{
             DatabasePrivilegesDiff,
         },
         protocol::{
-            DiffDoesNotApplyError, GetAllDatabasesPrivilegeData, GetAllDatabasesPrivilegeDataError,
-            GetDatabasesPrivilegeData, GetDatabasesPrivilegeDataError,
-            ModifyDatabasePrivilegesError, ModifyDatabasePrivilegesOutput,
+            DiffDoesNotApplyError, GetAllDatabasesPrivilegeDataError,
+            GetDatabasesPrivilegeDataError, ListAllPrivilegesResponse, ListPrivilegesResponse,
+            ModifyDatabasePrivilegesError, ModifyPrivilegesResponse,
         },
         types::{MySQLDatabase, MySQLUser},
     },
@@ -139,7 +139,7 @@ pub async fn get_databases_privilege_data(
     database_names: Vec<MySQLDatabase>,
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> GetDatabasesPrivilegeData {
+) -> ListPrivilegesResponse {
     let mut results = BTreeMap::new();
 
     for database_name in database_names.iter() {
@@ -186,7 +186,7 @@ pub async fn get_databases_privilege_data(
 pub async fn get_all_database_privileges(
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> GetAllDatabasesPrivilegeData {
+) -> ListAllPrivilegesResponse {
     let result = sqlx::query_as::<_, DatabasePrivilegeRow>(&format!(
         indoc! {r#"
           SELECT {} FROM `db` WHERE `db` IN
@@ -393,7 +393,7 @@ pub async fn apply_privilege_diffs(
     database_privilege_diffs: BTreeSet<DatabasePrivilegesDiff>,
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> ModifyDatabasePrivilegesOutput {
+) -> ModifyPrivilegesResponse {
     let mut results: BTreeMap<(MySQLDatabase, MySQLUser), _> = BTreeMap::new();
 
     for diff in database_privilege_diffs {

src/server/sql/user_operations.rs

@@ -12,9 +12,10 @@ use crate::{
         common::UnixUser,
         database_privileges::DATABASE_PRIVILEGE_FIELDS,
         protocol::{
-            CreateUserError, CreateUsersOutput, DropUserError, DropUsersOutput, ListAllUsersError,
-            ListAllUsersOutput, ListUsersError, ListUsersOutput, LockUserError, LockUsersOutput,
-            SetPasswordError, SetPasswordOutput, UnlockUserError, UnlockUsersOutput,
+            CreateUserError, CreateUsersResponse, DropUserError, DropUsersResponse,
+            ListAllUsersError, ListAllUsersResponse, ListUsersError, ListUsersResponse,
+            LockUserError, LockUsersResponse, SetPasswordError, SetUserPasswordResponse,
+            UnlockUserError, UnlockUsersResponse,
         },
         types::MySQLUser,
     },
@@ -54,7 +55,7 @@ pub async fn create_database_users(
     db_users: Vec<MySQLUser>,
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> CreateUsersOutput {
+) -> CreateUsersResponse {
     let mut results = BTreeMap::new();
 
     for db_user in db_users {
@@ -100,7 +101,7 @@ pub async fn drop_database_users(
     db_users: Vec<MySQLUser>,
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> DropUsersOutput {
+) -> DropUsersResponse {
     let mut results = BTreeMap::new();
 
     for db_user in db_users {
@@ -147,7 +148,7 @@ pub async fn set_password_for_database_user(
     password: &str,
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> SetPasswordOutput {
+) -> SetUserPasswordResponse {
     if let Err(err) = validate_name(db_user) {
         return Err(SetPasswordError::SanitizationError(err));
     }
@@ -221,7 +222,7 @@ pub async fn lock_database_users(
     db_users: Vec<MySQLUser>,
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> LockUsersOutput {
+) -> LockUsersResponse {
     let mut results = BTreeMap::new();
 
     for db_user in db_users {
@@ -281,7 +282,7 @@ pub async fn unlock_database_users(
     db_users: Vec<MySQLUser>,
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> UnlockUsersOutput {
+) -> UnlockUsersResponse {
     let mut results = BTreeMap::new();
 
     for db_user in db_users {
@@ -380,7 +381,7 @@ pub async fn list_database_users(
     db_users: Vec<MySQLUser>,
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> ListUsersOutput {
+) -> ListUsersResponse {
     let mut results = BTreeMap::new();
 
     for db_user in db_users {
@@ -422,7 +423,7 @@ pub async fn list_database_users(
 pub async fn list_all_database_users_for_unix_user(
     unix_user: &UnixUser,
     connection: &mut MySqlConnection,
-) -> ListAllUsersOutput {
+) -> ListAllUsersResponse {
     let mut result = sqlx::query_as::<_, DatabaseUser>(
         &(DB_USER_SELECT_STATEMENT.to_string() + "WHERE `user`.`User` REGEXP ?"),
     )