Add user-to-user permissions table

This commit is contained in:
KernelDeimos 2024-04-04 20:46:44 -04:00
parent e2236d43fd
commit 207fa139d4
2 changed files with 97 additions and 6 deletions

View File

@ -16,6 +16,8 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
const { es_import_promise } = require("../../fun/dev-console-ui-utils");
const { surrounding_box } = require("../../fun/dev-console-ui-utils");
const { BaseDatabaseAccessService } = require("./BaseDatabaseAccessService"); const { BaseDatabaseAccessService } = require("./BaseDatabaseAccessService");
class SqliteDatabaseAccessService extends BaseDatabaseAccessService { class SqliteDatabaseAccessService extends BaseDatabaseAccessService {
@ -40,23 +42,68 @@ class SqliteDatabaseAccessService extends BaseDatabaseAccessService {
this.db = new Database(this.config.path); this.db = new Database(this.config.path);
if ( do_setup ) { if ( do_setup ) {
this.log.noticeme(`SETUP: creating database at ${this.config.path}`);
const sql_files = [ const sql_files = [
'0001_create-tables.sql', '0001_create-tables.sql',
'0002_add-default-apps.sql', '0002_add-default-apps.sql',
'0003_user-permissions.sql',
].map(p => path_.join(__dirname, 'sqlite_setup', p)); ].map(p => path_.join(__dirname, 'sqlite_setup', p));
const fs = require('fs'); const fs = require('fs');
for ( const filename of sql_files ) { for ( const filename of sql_files ) {
const basename = path_.basename(filename);
this.log.noticeme(`applying ${basename}`);
const contents = fs.readFileSync(filename, 'utf8'); const contents = fs.readFileSync(filename, 'utf8');
this.db.exec(contents); this.db.exec(contents);
} }
} }
// Create the tables if they don't exist. // Database upgrade logic
const check = const TARGET_VERSION = 1;
`SELECT name FROM sqlite_master WHERE type='table' AND name='fsentries'`;
const rows = await this.db.prepare(check).all(); const [{ user_version }] = await this._read('PRAGMA user_version');
if ( rows.length === 0 ) { this.log.info('database version: ' + user_version);
throw new Error('it works');
const upgrade_files = [];
if ( user_version <= 0 ) {
upgrade_files.push('0003_user-permissions.sql');
}
if ( upgrade_files.length > 0 ) {
this.log.noticeme(`Database out of date: ${this.config.path}`);
this.log.noticeme(`UPGRADING DATABASE: ${user_version} -> ${TARGET_VERSION}`);
this.log.noticeme(`${upgrade_files.length} .sql files to apply`);
const sql_files = upgrade_files.map(
p => path_.join(__dirname, 'sqlite_setup', p)
);
const fs = require('fs');
for ( const filename of sql_files ) {
const basename = path_.basename(filename);
this.log.noticeme(`applying ${basename}`);
const contents = fs.readFileSync(filename, 'utf8');
this.db.exec(contents);
}
// Update version number
await this.db.exec(`PRAGMA user_version = ${TARGET_VERSION};`);
// Add sticky notification
this.database_update_notice = () => {
const lines = [
`Database has been updated!`,
`Current version: ${TARGET_VERSION}`,
`Type sqlite:dismiss to dismiss this message`,
];
surrounding_box('33;1', lines);
return lines;
};
(async () => {
await es_import_promise;
const svc_devConsole = this.services.get('dev-console');
svc_devConsole.add_widget(this.database_update_notice);
})();
} }
} }
@ -148,6 +195,19 @@ class SqliteDatabaseAccessService extends BaseDatabaseAccessService {
} }
} }
}, },
{
id: 'dismiss',
description: 'dismiss the database update notice',
handler: async (_, log) => {
const svc_devConsole = this.services.get('dev-console');
if ( ! svc_devConsole ) return;
if ( ! this.database_update_notice ) return;
svc_devConsole.remove_widget(this.database_update_notice);
const lines = this.database_update_notice();
for ( const line of lines ) log.log(line);
this.database_update_notice = null;
}
}
]) ])
} }
} }

View File

@ -0,0 +1,31 @@
CREATE TABLE `user_to_user_permissions` (
"issuer_user_id" INTEGER NOT NULL,
"holder_user_id" INTEGER NOT NULL,
"permission" TEXT NOT NULL,
"extra" JSON DEFAULT NULL,
FOREIGN KEY("issuer_user_id") REFERENCES "users" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
FOREIGN KEY("holder_user_id") REFERENCES "users" ("id") ON DELETE CASCADE ON UPDATE CASCADE,
PRIMARY KEY ("issuer_user_id", "holder_user_id", "permission")
);
CREATE TABLE "audit_user_to_user_permissions" (
"id" INTEGER PRIMARY KEY AUTOINCREMENT,
"issuer_user_id" INTEGER NOT NULL,
"issuer_user_id_keep" INTEGER DEFAULT NULL,
"holder_user_id" INTEGER NOT NULL,
"holder_user_id_keep" INTEGER DEFAULT NULL,
"permission" TEXT NOT NULL,
"extra" JSON DEFAULT NULL,
"action" TEXT DEFAULT NULL,
"reason" TEXT DEFAULT NULL,
"created_at" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
FOREIGN KEY("issuer_user_id") REFERENCES "users" ("id") ON DELETE SET NULL ON UPDATE CASCADE,
FOREIGN KEY("holder_user_id") REFERENCES "users" ("id") ON DELETE SET NULL ON UPDATE CASCADE
);