poe: make sure username is always normalized

shared/src/user.rs

@@ -10,20 +10,18 @@ use crate::UrlSafe;
 pub struct User(String);
 
 impl User {
-    pub fn new_unchecked(user: String) -> Self {
-        Self(user)
+    /// Creates a new [`Self`] from a user name.
+    ///
+    /// The user name is normalized.
+    pub fn new(user: &str) -> Self {
+        // Normalize to lowercase, usernames generally are accepted case insensitive.
+        Self(user.to_lowercase())
     }
 
     pub fn as_str(&self) -> &str {
         self.0.as_str()
     }
 
-    /// Usernames are case insensitive,
-    /// returns a normalized version of the username (lowercase).
-    pub fn normalized(&self) -> Self {
-        Self(self.0.to_lowercase())
-    }
-
     /// Returns the URL to the user API.
     pub fn to_api_url(&self) -> UrlSafe<'static> {
         UrlSafe::SLASH
@@ -95,7 +93,7 @@ impl FromStr for User {
             }
         }
 
-        Ok(Self(username.into()))
+        Ok(Self::new(username))
     }
 }
 

worker/src/api.rs

@@ -452,7 +452,7 @@ async fn handle_oauth2_poe(rctx: &RequestContext) -> Result<Response> {
     sentry::update_username(&profile.name);
 
     let user = app::User {
-        name: User::new_unchecked(profile.name),
+        name: User::new(&profile.name),
     };
     let session = rctx
         .inject::<crate::dangerous::Dangerous>()

worker/src/storage/utils.rs

@@ -5,12 +5,12 @@ use crate::Result;
 pub(crate) fn to_path_r2(id: &PasteId) -> Result<String> {
     match id {
         PasteId::Paste(id) => Ok(format!("pastes/{}", crate::utils::to_path(id))),
-        PasteId::UserPaste(up) => Ok(format!("users/{}/pastes/{}", up.user.normalized(), up.id)),
+        PasteId::UserPaste(up) => Ok(format!("users/{}/pastes/{}", up.user, up.id)),
     }
 }
 
 pub(crate) fn to_prefix_r2(user: &User) -> String {
-    format!("users/{}/pastes/", user.normalized())
+    format!("users/{user}/pastes/")
 }
 
 pub(crate) fn strip_prefix(file: &str, prefix: &str) -> Result<String> {