src/cli/user_command.rs

@@ -6,8 +6,7 @@ use futures_util::{SinkExt, StreamExt};
 use crate::core::protocol::{
     print_create_users_output_status, print_drop_users_output_status,
     print_lock_users_output_status, print_set_password_output_status,
-    print_unlock_users_output_status, ClientToServerMessageStream, ListUsersError, Request,
+    print_unlock_users_output_status, ClientToServerMessageStream, Request, Response,
-    Response,
 };
 
 use super::common::erroneous_server_response;
@@ -208,28 +207,6 @@ async fn passwd_user(
     args: UserPasswdArgs,
     mut server_connection: ClientToServerMessageStream,
 ) -> anyhow::Result<()> {
-    // TODO: create a "user" exists check" command
-    let message = Request::ListUsers(Some(vec![args.username.clone()]));
-    if let Err(err) = server_connection.send(message).await {
-        server_connection.close().await.ok();
-        anyhow::bail!(err);
-    }
-    let response = match server_connection.next().await {
-        Some(Ok(Response::ListUsers(users))) => users,
-        response => return erroneous_server_response(response),
-    };
-    match response
-        .get(&args.username)
-        .unwrap_or(&Err(ListUsersError::UserDoesNotExist))
-    {
-        Ok(_) => {}
-        Err(err) => {
-            server_connection.send(Request::Exit).await?;
-            server_connection.close().await.ok();
-            anyhow::bail!("{}", err.to_error_message(&args.username));
-        }
-    }
-
     let password = if let Some(password_file) = args.password_file {
         std::fs::read_to_string(password_file)
             .context("Failed to read password file")?

src/core/protocol/server_responses.rs

@@ -76,7 +76,6 @@ impl OwnerValidationError {
                 indoc! {r#"
                   Invalid {} name prefix: '{}' does not match your username or any of your groups.
                   Are you sure you are allowed to create {} names with this prefix?
-                  The format should be: <prefix>_<{} name>
 
                   Allowed prefixes:
                     - {}
@@ -85,7 +84,6 @@ impl OwnerValidationError {
                 db_or_user.lowercased(),
                 name,
                 db_or_user.lowercased(),
-                db_or_user.lowercased(),
                 user.as_ref()
                     .map(|u| u.username.clone())
                     .unwrap_or("???".to_string()),

src/server/input_sanitization.rs

@@ -45,7 +45,7 @@ pub fn validate_ownership_by_prefixes(
 
     if prefixes
         .iter()
-        .filter(|p| name.starts_with(&(p.to_string() + "_")))
+        .filter(|p| name.starts_with(*p))
         .collect::<Vec<_>>()
         .is_empty()
     {