Skip to content

trustpub: Disallow config creation if email is not verified #11351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/controllers/trustpub/github_configs/create/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::auth::AuthCheck;
use crate::controllers::krate::load_crate;
use crate::controllers::trustpub::github_configs::emails::ConfigCreatedEmail;
use crate::controllers::trustpub::github_configs::json;
use crate::util::errors::{AppResult, bad_request};
use crate::util::errors::{AppResult, bad_request, forbidden};
use axum::Json;
use crates_io_database::models::OwnerKind;
use crates_io_database::models::trustpub::NewGitHubConfig;
Expand Down Expand Up @@ -61,8 +61,14 @@ pub async fn create_trustpub_github_config(
.load::<(i32, String, String, bool)>(&mut conn)
.await?;

if !user_owners.iter().any(|owner| owner.0 == auth_user.id) {
return Err(bad_request("You are not an owner of this crate"));
let (_, _, _, email_verified) = user_owners
.iter()
.find(|(id, _, _, _)| *id == auth_user.id)
.ok_or_else(|| bad_request("You are not an owner of this crate"))?;

if !email_verified {
let message = "You must verify your email address to create a Trusted Publishing config";
return Err(forbidden(message));
}

// Lookup `repository_owner_id` via GitHub API
Expand Down
37 changes: 36 additions & 1 deletion src/controllers/trustpub/github_configs/create/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::tests::builders::CrateBuilder;
use crate::tests::util::{RequestHelper, Response, TestApp};
use anyhow::anyhow;
use bytes::Bytes;
use crates_io_database::schema::trustpub_configs_github;
use crates_io_database::schema::{emails, trustpub_configs_github};
use crates_io_github::{GitHubError, GitHubUser, MockGitHubClient};
use diesel::prelude::*;
use diesel_async::RunQueryDsl;
Expand Down Expand Up @@ -370,3 +370,38 @@ async fn test_github_error() -> anyhow::Result<()> {

Ok(())
}

#[tokio::test(flavor = "multi_thread")]
async fn test_unverified_email() -> anyhow::Result<()> {
let (app, _client, cookie_client) = TestApp::full()
.with_github(simple_github_mock())
.with_user()
.await;

let mut conn = app.db_conn().await;

diesel::update(emails::table.filter(emails::user_id.eq(cookie_client.as_model().id)))
.set(emails::verified.eq(false))
.execute(&mut conn)
.await?;

CrateBuilder::new(CRATE_NAME, cookie_client.as_model().id)
.build(&mut conn)
.await?;

let body = serde_json::to_vec(&json!({
"github_config": {
"crate": CRATE_NAME,
"repository_owner": "rust-lang",
"repository_name": "foo-rs",
"workflow_filename": "publish.yml",
"environment": null,
}
}))?;

let response = cookie_client.put::<()>(URL, body).await;
assert_eq!(response.status(), StatusCode::FORBIDDEN);
assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"You must verify your email address to create a Trusted Publishing config"}]}"#);

Ok(())
}