Save passwords as bcrypt instead of plain SHA-1 hashes (includes migration of old...

[pr0n] / sql / pr0n.sql

diff --git a/sql/pr0n.sql b/sql/pr0n.sql
index 5f89f6c91e03c8bf62e76684a3718612d8c53218..4089a6a577790984a74672c9580fa6d8d80ef957 100644 (file)
--- a/sql/pr0n.sql
+++ b/sql/pr0n.sql
@@ -18,8 +18,10 @@ CREATE TABLE last_picture_cache (
    FOREIGN KEY (vhost,event) REFERENCES events(vhost,event)
 );
 
+CREATE SEQUENCE imageid_seq;
+
 CREATE TABLE images (
-    id serial NOT NULL PRIMARY KEY,
+    id integer DEFAULT nextval('imageid_seq') NOT NULL PRIMARY KEY,
     vhost character varying NOT NULL,
     event character varying NOT NULL,
     filename character varying NOT NULL,
@@ -71,8 +73,10 @@ CREATE TABLE shadow_files (
 
 CREATE TABLE users (
     username character varying NOT NULL,
-    sha1password character(28) NOT NULL,
-    vhost character varying NOT NULL
+    sha1password character(27),
+    vhost character varying NOT NULL,
+    digest_ha1_hex character(32),
+    cryptpassword character varying
 );
 
 -- Mainly used for manual queries -- usually too slow to be very useful
@@ -99,10 +103,10 @@ CREATE INDEX tags_tag ON tags ( tag );
 GRANT INSERT ON TABLE deleted_images TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE events TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE fake_files TO pr0n;
-GRANT SELECT,UPDATE ON TABLE images_id_seq TO pr0n;
+GRANT SELECT,UPDATE ON TABLE imageid_seq TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE images TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE shadow_files TO pr0n;
-GRANT SELECT ON TABLE users TO pr0n;
+GRANT SELECT,UPDATE ON TABLE users TO pr0n;
 GRANT SELECT,INSERT,DELETE ON TABLE exif_info TO pr0n;
 GRANT SELECT,INSERT,DELETE ON TABLE tags TO pr0n;
 GRANT INSERT,SELECT,UPDATE,DELETE ON TABLE last_picture_cache TO pr0n;