Changeset 327 in code for trunk

Timestamp:

Jun 8, 2020, 8:30:09 PM (5 years ago)

Author:

delthas

Message:

Add an admin flag to users

This is preparatory work for letting some users access admin-exclusive
service commands, such as creating new users.

This adds a boolean admin flag to the User schema. Old users will stay
non-admin after the DB migration.

File:

• trunk/db.go (modified) (7 diffs)

trunk/db.go

@@ -14 +14 @@
         Username string
         Password string // hashed
+        Admin    bool
 }
 
@@ -62 +63 @@
 CREATE TABLE User (
         username VARCHAR(255) PRIMARY KEY,
-        password VARCHAR(255) NOT NULL
+        password VARCHAR(255) NOT NULL,
+        admin INTEGER NOT NULL DEFAULT 0
 );
 
@@ -101 +103 @@
         "ALTER TABLE Network ADD COLUMN sasl_external_cert BLOB DEFAULT NULL",
         "ALTER TABLE Network ADD COLUMN sasl_external_key BLOB DEFAULT NULL",
+        "ALTER TABLE User ADD COLUMN admin INTEGER NOT NULL DEFAULT 0",
 }
 
@@ -188 +191 @@
         defer db.lock.RUnlock()
 
-        rows, err := db.db.Query("SELECT username, password FROM User")
+        rows, err := db.db.Query("SELECT username, password, admin FROM User")
         if err != nil {
                 return nil, err
@@ -198 +201 @@
                 var user User
                 var password *string
-                if err := rows.Scan(&user.Username, &password); err != nil {
+                if err := rows.Scan(&user.Username, &password, &user.Admin); err != nil {
                         return nil, err
                 }
@@ -219 +222 @@
 
         var password *string
-        row := db.db.QueryRow("SELECT password FROM User WHERE username = ?", username)
-        if err := row.Scan(&password); err != nil {
+        row := db.db.QueryRow("SELECT password, admin FROM User WHERE username = ?", username)
+        if err := row.Scan(&password, &user.Admin); err != nil {
                 return nil, err
         }
@@ -235 +238 @@
         var err error
         if user.Created {
-                _, err = db.db.Exec("UPDATE User SET password = ? WHERE username = ?",
-                        password, user.Username)
+                _, err = db.db.Exec("UPDATE User SET password = ?, admin = ? WHERE username = ?",
+                        password, user.Admin, user.Username)
         } else {
-                _, err = db.db.Exec("INSERT INTO User(username, password) VALUES (?, ?)",
-                        user.Username, password)
+                _, err = db.db.Exec("INSERT INTO User(username, password, admin) VALUES (?, ?, ?)",
+                        user.Username, password, user.Admin)
                 if err == nil {
                         user.Created = true