Merge pull request #591 from sgrif/sg-check-canon-crate-name-on-upload

canonicalize crate name before checking if it's reserved

Author: carols10cents

src/bin/migrate.rs

@@ -831,6 +831,43 @@ fn migrations() -> Vec<Migration> {
             tx.execute("DROP INDEX badges_crate_type", &[])?;
             Ok(())
         }),
+        Migration::new(20170305095748, |tx| {
+            tx.batch_execute("
+                CREATE TABLE reserved_crate_names (
+                    name TEXT PRIMARY KEY
+                );
+                CREATE UNIQUE INDEX ON reserved_crate_names (canon_crate_name(name));
+                INSERT INTO reserved_crate_names (name) VALUES
+                    ('alloc'), ('arena'), ('ast'), ('builtins'), ('collections'),
+                    ('compiler-builtins'), ('compiler-rt'), ('compiletest'), ('core'), ('coretest'),
+                    ('debug'), ('driver'), ('flate'), ('fmt_macros'), ('grammar'), ('graphviz'),
+                    ('macro'), ('macros'), ('proc_macro'), ('rbml'), ('rust-installer'), ('rustbook'),
+                    ('rustc'), ('rustc_back'), ('rustc_borrowck'), ('rustc_driver'), ('rustc_llvm'),
+                    ('rustc_resolve'), ('rustc_trans'), ('rustc_typeck'), ('rustdoc'), ('rustllvm'),
+                    ('rustuv'), ('serialize'), ('std'), ('syntax'), ('test'), ('unicode');
+
+                CREATE FUNCTION ensure_crate_name_not_reserved() RETURNS trigger AS $$
+                BEGIN
+                    IF canon_crate_name(NEW.name) IN (
+                        SELECT canon_crate_name(name) FROM reserved_crate_names
+                    ) THEN
+                        RAISE EXCEPTION 'cannot upload crate with reserved name';
+                    END IF;
+                    RETURN NEW;
+                END;
+                $$ LANGUAGE plpgsql;
+
+                CREATE TRIGGER trigger_ensure_crate_name_not_reserved
+                BEFORE INSERT OR UPDATE ON crates
+                FOR EACH ROW EXECUTE PROCEDURE ensure_crate_name_not_reserved();
+            ")?;
+            Ok(())
+        }, |tx| {
+            tx.execute("DROP TRIGGER trigger_ensure_crate_name_not_reserved ON crates", &[])?;
+            tx.execute("DROP FUNCTION ensure_crate_name_not_reserved()", &[])?;
+            tx.execute("DROP TABLE reserved_crate_names", &[])?;
+            Ok(())
+        }),
     ];
     // NOTE: Generate a new id via `date +"%Y%m%d%H%M%S"`
 

src/krate.rs

@@ -152,10 +152,11 @@ impl Crate {
             None => {}
         }
 
-        // Blacklist the current set of crates in the rust distribution
-        const RESERVED: &'static str = include_str!("reserved_crates.txt");
-
-        if RESERVED.lines().any(|krate| name == krate) {
+        let stmt = conn.prepare("SELECT 1 FROM reserved_crate_names
+                                 WHERE canon_crate_name(name) =
+                                       canon_crate_name($1)")?;
+        let rows = stmt.query(&[&name])?;
+        if !rows.is_empty() {
             return Err(human("cannot upload a crate with a reserved name"))
         }
 

src/reserved_crates.txt

@@ -346,6 +346,23 @@ fn new_krate() {
     assert_eq!(json.krate.max_version, "1.0.0");
 }
 
+#[test]
+fn new_krate_with_reserved_name() {
+    fn test_bad_name(name: &str) {
+        let (_b, app, middle) = ::app();
+        let mut req = ::new_req(app, name, "1.0.0");
+        ::mock_user(&mut req, ::user("foo"));
+        let json = bad_resp!(middle.call(&mut req));
+        assert!(json.errors[0].detail.contains("cannot upload a crate with a reserved name"));
+    }
+
+    test_bad_name("std");
+    test_bad_name("STD");
+    test_bad_name("compiler-rt");
+    test_bad_name("compiler_rt");
+    test_bad_name("coMpiLer_Rt");
+}
+
 #[test]
 fn new_krate_weird_version() {
     let (_b, app, middle) = ::app();