rate_limiter: Migrate to diesel-async queries

src/controllers/krate/publish.rs

@@ -124,6 +124,25 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
         (existing_crate, auth)
     };
 
+    let verified_email_address = auth.user().async_verified_email(&mut conn).await?;
+    let verified_email_address = verified_email_address.ok_or_else(|| {
+        bad_request(format!(
+            "A verified email address is required to publish crates to crates.io. \
+             Visit https://{}/settings/profile to set and verify your email address.",
+            app.config.domain_name,
+        ))
+    })?;
+
+    // Use a different rate limit whether this is a new or an existing crate.
+    let rate_limit_action = match existing_crate {
+        Some(_) => LimitedAction::PublishUpdate,
+        None => LimitedAction::PublishNew,
+    };
+
+    app.rate_limiter
+        .check_rate_limit(auth.user().id, rate_limit_action, &mut conn)
+        .await?;
+
     spawn_blocking(move || {
         use diesel::RunQueryDsl;
 
@@ -132,23 +151,6 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
         let api_token_id = auth.api_token_id();
         let user = auth.user();
 
-        let verified_email_address = user.verified_email(conn)?;
-        let verified_email_address = verified_email_address.ok_or_else(|| {
-            bad_request(format!(
-                "A verified email address is required to publish crates to crates.io. \
-             Visit https://{}/settings/profile to set and verify your email address.",
-                app.config.domain_name,
-            ))
-        })?;
-
-        // Use a different rate limit whether this is a new or an existing crate.
-        let rate_limit_action = match existing_crate {
-            Some(_) => LimitedAction::PublishUpdate,
-            None => LimitedAction::PublishNew,
-        };
-        app.rate_limiter
-            .check_rate_limit(user.id, rate_limit_action, conn)?;
-
         let content_length = tarball_bytes.len() as u64;
 
         let maximums = Maximums::new(
@@ -226,7 +228,7 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
         validate_url(homepage.as_deref(), "homepage")?;
         validate_url(documentation.as_deref(), "documentation")?;
         validate_url(repository.as_deref(), "repository")?;
-        if let Some(ref rust_version) =  rust_version {
+        if let Some(ref rust_version) = rust_version {
             validate_rust_version(rust_version)?;
         }
 
@@ -495,7 +497,7 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
                         repository,
                         pkg_path_in_vcs,
                     )
-                    .enqueue(conn)?;
+                        .enqueue(conn)?;
                 }
             }
 
@@ -556,7 +558,7 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
             }))
         })
     })
-    .await
+        .await
 }
 
 /// Counts the number of versions for `crate_id` that were published within

src/controllers/version/metadata.rs

@@ -132,6 +132,12 @@ pub async fn update(
     let (mut version, krate) = version_and_crate(&mut conn, &crate_name, &version).await?;
     validate_yank_update(&update_request.version, &version)?;
     let auth = authenticate(&req, &mut conn, &krate.name).await?;
+
+    state
+        .rate_limiter
+        .check_rate_limit(auth.user_id(), LimitedAction::YankUnyank, &mut conn)
+        .await?;
+
     spawn_blocking(move || {
         let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
 
@@ -192,10 +198,6 @@ pub fn perform_version_yank_update(
 ) -> AppResult<()> {
     use diesel::RunQueryDsl;
 
-    state
-        .rate_limiter
-        .check_rate_limit(auth.user_id(), LimitedAction::YankUnyank, conn)?;
-
     let api_token_id = auth.api_token_id();
     let user = auth.user();
     let owners = krate.owners(conn)?;

src/controllers/version/yank.rs

@@ -4,6 +4,7 @@ use super::metadata::{authenticate, perform_version_yank_update};
 use super::version_and_crate;
 use crate::app::AppState;
 use crate::controllers::helpers::ok_true;
+use crate::rate_limiter::LimitedAction;
 use crate::tasks::spawn_blocking;
 use crate::util::errors::{version_not_found, AppResult};
 use axum::extract::Path;
@@ -55,6 +56,12 @@ async fn modify_yank(
     let mut conn = state.db_write().await?;
     let (mut version, krate) = version_and_crate(&mut conn, &crate_name, &version).await?;
     let auth = authenticate(&req, &mut conn, &crate_name).await?;
+
+    state
+        .rate_limiter
+        .check_rate_limit(auth.user_id(), LimitedAction::YankUnyank, &mut conn)
+        .await?;
+
     spawn_blocking(move || {
         let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
         perform_version_yank_update(