Remove version_authors

Author: 0xPoe

migrations/2021-04-24-115720_remove_version_authors/down.sql

@@ -0,0 +1,15 @@
+CREATE TABLE version_authors
+(
+    id         SERIAL  NOT NULL
+        CONSTRAINT version_authors_pkey
+            PRIMARY KEY,
+    version_id INTEGER NOT NULL
+        CONSTRAINT fk_version_authors_version_id
+            REFERENCES versions
+        ON DELETE CASCADED,
+    name       VARCHAR NOT NULL
+);
+
+CREATE
+INDEX index_version_authors_version_id
+                           ON version_authors (version_id);

migrations/2021-04-24-115720_remove_version_authors/up.sql

@@ -0,0 +1 @@
+DROP TABLE version_authors;

mirage/route-handlers/crates.js

@@ -135,7 +135,7 @@ export function register(server) {
     let version = schema.versions.findBy({ crateId, num });
     if (!version) return { errors: [{ detail: `crate \`${crateId}\` does not have a version \`${num}\`` }] };
 
-    return { meta: { names: version._authors }, users: [] };
+    return { meta: { names: [] }, users: [] };
   });
 
   server.get('/api/v1/crates/:crate_id/:version_num/dependencies', (schema, request) => {

src/bin/monitor.rs

@@ -110,7 +110,6 @@ fn check_stalled_update_downloads(conn: &PgConnection) -> Result<()> {
 fn check_spam_attack(conn: &PgConnection) -> Result<()> {
     use cargo_registry::models::krate::canon_crate_name;
     use diesel::dsl::*;
-    use diesel::sql_types::Bool;
 
     const EVENT_KEY: &str = "spam_attack";
 
@@ -121,11 +120,6 @@ fn check_spam_attack(conn: &PgConnection) -> Result<()> {
         .as_ref()
         .map(|s| s.split(',').collect())
         .unwrap_or_default();
-    let bad_author_patterns = dotenv::var("SPAM_AUTHOR_PATTERNS");
-    let bad_author_patterns: Vec<_> = bad_author_patterns
-        .as_ref()
-        .map(|s| s.split(',').collect())
-        .unwrap_or_default();
 
     let mut event_description = None;
 
@@ -139,19 +133,6 @@ fn check_spam_attack(conn: &PgConnection) -> Result<()> {
         event_description = Some(format!("Crate named {} published", bad_crate));
     }
 
-    let mut query = version_authors::table
-        .select(version_authors::name)
-        .filter(false.into_sql::<Bool>()) // Never return anything if we have no patterns
-        .into_boxed();
-    for author_pattern in bad_author_patterns {
-        query = query.or_filter(version_authors::name.like(author_pattern));
-    }
-    let bad_author: Option<String> = query.first(conn).optional()?;
-
-    if let Some(bad_author) = bad_author {
-        event_description = Some(format!("Crate with author {} published", bad_author));
-    }
-
     let event = if let Some(event_description) = event_description {
         on_call::Event::Trigger {
             incident_key: Some(EVENT_KEY.into()),

src/controllers/krate/publish.rs

@@ -160,7 +160,7 @@ pub fn publish(req: &mut dyn RequestExt) -> EndpointResult {
             file_length as i32,
             user.id,
         )?
-        .save(&conn, &new_crate.authors, &verified_email_address)?;
+        .save(&conn, &verified_email_address)?;
 
         insert_version_owner_action(
             &conn,

src/downloads_counter.rs

@@ -452,7 +452,7 @@ mod tests {
                 self.user.id,
             )
             .expect("failed to create version")
-            .save(conn, &[], "[email protected]")
+            .save(conn, "[email protected]")
             .expect("failed to save version");
 
             self.next_version += 1;

src/models/version.rs

@@ -136,13 +136,7 @@ impl NewVersion {
         Ok(new_version)
     }
 
-    pub fn save(
-        &self,
-        conn: &PgConnection,
-        authors: &[String],
-        published_by_email: &str,
-    ) -> AppResult<Version> {
-        use crate::schema::version_authors::{name, version_id};
+    pub fn save(&self, conn: &PgConnection, published_by_email: &str) -> AppResult<Version> {
         use crate::schema::versions::dsl::*;
         use diesel::dsl::exists;
         use diesel::{insert_into, select};
@@ -167,15 +161,6 @@ impl NewVersion {
                     versions_published_by::email.eq(published_by_email),
                 ))
                 .execute(conn)?;
-
-            let new_authors = authors
-                .iter()
-                .map(|s| (version_id.eq(version.id), name.eq(s)))
-                .collect::<Vec<_>>();
-
-            insert_into(version_authors::table)
-                .values(&new_authors)
-                .execute(conn)?;
             Ok(version)
         })
     }

src/schema.patch

@@ -20,10 +20,10 @@ index df884e4..18e08cd 100644
 -        path -> Ltree,
      }
  }
- 
+
 @@ -678,6 +674,24 @@
  }
- 
+
  table! {
 +    /// Representation of the `recent_crate_downloads` view.
 +    ///
@@ -45,7 +45,7 @@ index df884e4..18e08cd 100644
 +table! {
      use diesel::sql_types::*;
      use diesel_full_text_search::{TsVector as Tsvector};
- 
+
 @@ -1003,7 +1017,8 @@
  joinable!(badges -> crates (crate_id));
  joinable!(crate_owner_invitations -> crates (crate_id));

src/schema.rs

@@ -814,35 +814,6 @@ table! {
     }
 }
 
-table! {
-    use diesel::sql_types::*;
-    use diesel_full_text_search::{TsVector as Tsvector};
-
-    /// Representation of the `version_authors` table.
-    ///
-    /// (Automatically generated by Diesel.)
-    version_authors (id) {
-        /// The `id` column of the `version_authors` table.
-        ///
-        /// Its SQL type is `Int4`.
-        ///
-        /// (Automatically generated by Diesel.)
-        id -> Int4,
-        /// The `version_id` column of the `version_authors` table.
-        ///
-        /// Its SQL type is `Int4`.
-        ///
-        /// (Automatically generated by Diesel.)
-        version_id -> Int4,
-        /// The `name` column of the `version_authors` table.
-        ///
-        /// Its SQL type is `Varchar`.
-        ///
-        /// (Automatically generated by Diesel.)
-        name -> Varchar,
-    }
-}
-
 table! {
     use diesel::sql_types::*;
     use diesel_full_text_search::{TsVector as Tsvector};
@@ -1050,7 +1021,6 @@ joinable!(publish_limit_buckets -> users (user_id));
 joinable!(publish_rate_overrides -> users (user_id));
 joinable!(readme_renderings -> versions (version_id));
 joinable!(recent_crate_downloads -> crates (crate_id));
-joinable!(version_authors -> versions (version_id));
 joinable!(version_downloads -> versions (version_id));
 joinable!(version_owner_actions -> api_tokens (api_token_id));
 joinable!(version_owner_actions -> users (user_id));
@@ -1081,7 +1051,6 @@ allow_tables_to_appear_in_same_query!(
     reserved_crate_names,
     teams,
     users,
-    version_authors,
     version_downloads,
     version_owner_actions,
     versions,

src/tasks/dump_db/dump-db.toml

@@ -179,13 +179,6 @@ account_lock_until = "private"
 [users.column_defaults]
 gh_access_token = "''"
 
-[version_authors]
-dependencies = ["versions"]
-[version_authors.columns]
-id = "public"
-version_id = "public"
-name = "public"
-
 [version_downloads]
 dependencies = ["versions"]
 [version_downloads.columns]

src/tasks/update_downloads.rs

@@ -110,7 +110,7 @@ mod test {
             user_id,
         )
         .unwrap();
-        let version = version.save(conn, &[], "[email protected]").unwrap();
+        let version = version.save(conn, "[email protected]").unwrap();
         (krate, version)
     }
 

src/tests/builders/publish.rs

@@ -24,7 +24,6 @@ lazy_static! {
 /// a crate to exist and don't need to test behavior caused by the publish request, inserting
 /// a crate into the database directly by using CrateBuilder will be faster.
 pub struct PublishBuilder {
-    authors: Vec<String>,
     badges: HashMap<String, HashMap<String, String>>,
     categories: Vec<String>,
     deps: Vec<u::EncodableCrateDependency>,
@@ -44,7 +43,6 @@ impl PublishBuilder {
     /// in its tarball.
     pub fn new(krate_name: &str) -> Self {
         PublishBuilder {
-            authors: vec!["foo".to_string()],
             badges: HashMap::new(),
             categories: vec![],
             deps: vec![],
@@ -168,25 +166,12 @@ impl PublishBuilder {
         self
     }
 
-    /// Add an author to this crate
-    pub fn author(mut self, author: &str) -> Self {
-        self.authors.push(author.into());
-        self
-    }
-
-    /// Remove the authors from this crate. Publish will fail unless authors are reset.
-    pub fn unset_authors(mut self) -> Self {
-        self.authors = vec![];
-        self
-    }
-
     pub fn build(self) -> (String, Vec<u8>) {
         let new_crate = u::EncodableCrateUpload {
             name: u::EncodableCrateName(self.krate_name.clone()),
             vers: u::EncodableCrateVersion(self.version),
             features: HashMap::new(),
             deps: self.deps,
-            authors: self.authors,
             description: self.desc,
             homepage: None,
             documentation: self.doc_url,

src/tests/builders/version.rs

@@ -92,7 +92,7 @@ impl<'a> VersionBuilder<'a> {
             self.size,
             published_by,
         )?
-        .save(connection, &[], "[email protected]")?;
+        .save(connection, "[email protected]")?;
 
         if self.yanked {
             vers = update(&vers)

src/tests/krate/publish.rs

@@ -703,23 +703,23 @@ fn bad_keywords() {
     assert_eq!(response.status(), StatusCode::OK);
     assert_eq!(
         response.json(),
-        json!({ "errors": [{ "detail": "invalid upload request: invalid length 29, expected a keyword with less than 20 characters at line 1 column 221" }] })
+        json!({ "errors": [{ "detail": "invalid upload request: invalid length 29, expected a keyword with less than 20 characters at line 1 column 203" }] })
     );
 
     let crate_to_publish = PublishBuilder::new("foo_bad_key").keyword("?@?%");
     let response = token.enqueue_publish(crate_to_publish);
     assert_eq!(response.status(), StatusCode::OK);
     assert_eq!(
         response.json(),
-        json!({ "errors": [{ "detail": "invalid upload request: invalid value: string \"?@?%\", expected a valid keyword specifier at line 1 column 196" }] })
+        json!({ "errors": [{ "detail": "invalid upload request: invalid value: string \"?@?%\", expected a valid keyword specifier at line 1 column 178" }] })
     );
 
     let crate_to_publish = PublishBuilder::new("foo_bad_key").keyword("áccênts");
     let response = token.enqueue_publish(crate_to_publish);
     assert_eq!(response.status(), StatusCode::OK);
     assert_eq!(
         response.json(),
-        json!({ "errors": [{ "detail": "invalid upload request: invalid value: string \"áccênts\", expected a valid keyword specifier at line 1 column 201" }] })
+        json!({ "errors": [{ "detail": "invalid upload request: invalid value: string \"áccênts\", expected a valid keyword specifier at line 1 column 183" }] })
     );
 }
 
@@ -824,8 +824,7 @@ fn license_and_description_required() {
     let crate_to_publish = PublishBuilder::new("foo_metadata")
         .version("1.1.0")
         .unset_license()
-        .unset_description()
-        .unset_authors();
+        .unset_description();
 
     let response = token.enqueue_publish(crate_to_publish);
     assert_eq!(response.status(), StatusCode::OK);
@@ -836,9 +835,7 @@ fn license_and_description_required() {
 
     let crate_to_publish = PublishBuilder::new("foo_metadata")
         .version("1.1.0")
-        .unset_description()
-        .unset_authors()
-        .author("");
+        .unset_description();
 
     let response = token.enqueue_publish(crate_to_publish);
     assert_eq!(response.status(), StatusCode::OK);

src/views/krate_publish.rs

@@ -18,7 +18,6 @@ pub struct EncodableCrateUpload {
     pub vers: EncodableCrateVersion,
     pub deps: Vec<EncodableCrateDependency>,
     pub features: HashMap<EncodableFeatureName, Vec<EncodableFeature>>,
-    pub authors: Vec<String>,
     pub description: Option<String>,
     pub homepage: Option<String>,
     pub documentation: Option<String>,

tests/mirage/crates-test.js

@@ -691,7 +691,7 @@ module('Mirage | Crates', function (hooks) {
       let responsePayload = await response.json();
       assert.deepEqual(responsePayload, {
         meta: {
-          names: authors,
+          names: [],
         },
         users: [],
       });