add profile scope

Reviewed-on: #1

config/config.example.json

@@ -4,6 +4,12 @@
         "password": "correcthorse"
     },
     "web": {
-        "port": 8080
+        "port": 8080,
+        "oidc": {
+            "server": "https://gitea.artixlinux.org/",
+            "clientId": "fakefake-fake-fake-fake-fakefakefake",
+            "clientSecret": "thisisnotarealsecret",
+            "appBaseUrl": "http://localhost:8080"
+        }
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "archery",
-  "version": "0.1.7",
+  "version": "0.2.2",
   "description": "Build Arch packages through a web interface",
   "keywords": [
     "docker",
@@ -20,21 +20,27 @@
   "type": "module",
   "main": "index.ts",
   "dependencies": {
-    "body-parser": "^1.20.3",
+    "body-parser": "^2.2.0",
     "ejs": "3.1.10",
-    "express": "^4.21.2",
+    "express": "^5.1.0",
+    "express-session": "1.18.2",
     "express-ws": "^5.0.2",
-    "pg": "^8.15.6",
+    "ky": "1.10.0",
+    "passport": "0.7.0",
+    "passport-openidconnect": "0.1.2",
+    "pg": "^8.16.3",
     "pg-hstore": "^2.3.4",
-    "sequelize": "^6.37.7"
+    "sequelize": "^6.37.7",
+    "sqids": "0.3.0"
   },
   "devDependencies": {
-    "@types/csso": "5.0.4",
+    "@types/express": "^5.0.3",
-    "@types/express": "^5.0.0",
+    "@types/express-session": "^1.18.2",
     "@types/express-ws": "3.0.5",
-    "@types/node": "^22.10.5",
+    "@types/node": "^24.5.2",
-    "@types/uglify-js": "3.17.5",
+    "@types/passport": "1.0.17",
-    "forking-build-shit": "0.0.2"
+    "@types/passport-openidconnect": "0.1.3",
+    "forking-build-shit": "1.0.4"
   },
   "peerDependencies": {
     "typescript": "5.7.3"

scripts/build.js

@@ -2,14 +2,7 @@ document.addEventListener('DOMContentLoaded', function () {
     const logContainer = this.getElementById('logs');
     const followLogsBtn = this.getElementById('followCheckmark');
     const buildStatusTxt = this.getElementById('buildStatus');
-
+    let started = logContainer.childElementCount > 0;
-    /**
-     * Get the correct path to establish a ws connection
-     * @param {Location} loc 
-     */
-    function wsPath(loc) {
-        return loc.pathname.replace(/\/$/, '') + '/ws';
-    }
 
     /**
      * Add log line to the DOM
@@ -32,6 +25,10 @@ document.addEventListener('DOMContentLoaded', function () {
         }
     }
 
+    function handleScrollToggleClick() {
+        window.scrollTo(0, followLogsBtn.checked ? document.body.scrollHeight : 0);
+    }
+
     /**
      * Split string by newline char
      * @param {string} str 
@@ -47,15 +44,22 @@ document.addEventListener('DOMContentLoaded', function () {
         const loc = window.location;
         let new_uri = loc.protocol === 'https:' ? 'wss:' : 'ws:';
         new_uri += "//" + loc.host;
-        new_uri += wsPath(loc);
+        new_uri += loc.pathname + 'ws';
         var ws = new WebSocket(new_uri);
 
         ws.onmessage = function (message) {
             const buildEvent = JSON.parse(message.data);
 
+            if (!started) {
+                started = true;
+                buildStatusTxt.replaceChild(document.createTextNode('running'), buildStatusTxt.firstChild);
+            }
             if (buildEvent.type === 'finish') {
                 ws.close();
                 buildStatusTxt.replaceChild(document.createTextNode(buildEvent.message), buildStatusTxt.firstChild);
+                appendLines([`finished: ${buildEvent.message}`]);
+                const cancelBtn = document.getElementById('cancelRow');
+                cancelBtn.parentElement.removeChild(cancelBtn);
             }
             else {
                 appendLines(splitLines(buildEvent.message), buildEvent.type === 'err');
@@ -66,5 +70,5 @@ document.addEventListener('DOMContentLoaded', function () {
 
     connect();
     followLogsBtn.checked = false;
-    followLogsBtn.addEventListener('change', scrollToBottom);
+    followLogsBtn.addEventListener('change', handleScrollToggleClick);
 });

scripts/copy.js

@@ -0,0 +1,7 @@
+document.addEventListener('DOMContentLoaded', function () {
+    for (let btn of document.getElementsByClassName('copybtn')) {
+        btn.addEventListener('click', e => {
+            navigator.clipboard.writeText(e.target.previousElementSibling.innerText);
+        });
+    }
+});

src/DB.ts

@@ -1,9 +1,13 @@
 import { Sequelize, DataTypes, Op, } from 'sequelize';
+import { Store } from 'express-session'
+import { notStupidParseInt } from './Web.ts';
 import type { ModelStatic, Filterable } from 'sequelize';
 import type { LogType } from './BuildController.ts';
+import type { SessionData } from 'express-session'
 
 type Status = 'queued' | 'running' | 'cancelled' | 'success' | 'error';
 type Dependencies = 'stable' | 'testing' | 'staging';
+type Callback = (err?: unknown, data?: any) => any
 
 interface DBConfig {
     db?: string;
@@ -24,6 +28,14 @@ interface Build {
     endTime?: Date;
     status: Status;
     pid?: number;
+    sqid?: string;
+    uuid: string;
+}
+
+interface User {
+    id: string;
+    username: string;
+    displayName?: string;
 }
 
 interface LogChunk {
@@ -33,7 +45,7 @@ interface LogChunk {
     chunk: string
 }
 
-const MONTH = 1000 * 60 * 60 * 24 * 24;
+const MONTH = 1000 * 60 * 60 * 24 * 30;
 const FRESH = {
     [Op.or]: [
         { startTime: { [Op.gt]: new Date(Date.now() - MONTH) } },
@@ -42,16 +54,32 @@ const FRESH = {
 }
 const SELECT = ['id', 'repo', 'commit', 'distro', 'dependencies', 'startTime', 'endTime', 'status'];
 
-class DB {
+function handleCallback<T>(err: unknown, data: T, cb?: Callback): T {
+    if (cb) {
+        cb(err, data);
+    }
+    if (err) {
+        throw err;
+    }
+    return data;
+}
+
+class DB extends Store {
     private build: ModelStatic<any>;
     private logChunk: ModelStatic<any>;
+    private user: ModelStatic<any>;
+    private session: ModelStatic<any>;
     private sequelize: Sequelize;
+    private ttl: number;
 
     constructor(config: DBConfig = {}) {
+        super();
+        this.ttl = notStupidParseInt(process.env['COOKIETTL']) || 1000 * 60 * 60 * 24 * 30;
         this.sequelize = new Sequelize(config.db || 'archery', config.user || 'archery', process.env.PASSWORD || config.password || '', {
             host: config.host || 'localhost',
             port: config.port || 5432,
-            dialect: 'postgres'
+            dialect: 'postgres',
+            logging: false
         });
         this.build = this.sequelize.define('builds', {
             id: {
@@ -96,6 +124,10 @@ class DB {
             pid: {
                 type: DataTypes.INTEGER,
                 allowNull: true
+            },
+            uuid: {
+                type: DataTypes.STRING,
+                unique: true
             }
         });
 
@@ -126,21 +158,82 @@ class DB {
             }
         });
 
+        this.user = this.sequelize.define('users', {
+            id: {
+                type: DataTypes.STRING,
+                primaryKey: true,
+            },
+            username: {
+                type: DataTypes.STRING,
+            },
+            displayName: {
+                type: DataTypes.STRING,
+                allowNull: true
+            }
+        });
+
+        this.session = this.sequelize.define('session', {
+            sid: {
+                type: DataTypes.STRING,
+                primaryKey: true,
+            },
+            sessionData: {
+                type: DataTypes.JSONB,
+            }
+        });
+
+        this.build.belongsTo(this.user);
+        this.user.hasMany(this.build);
+
         this.sync();
     }
 
     private async sync(): Promise<void> {
+        await this.user.sync();
         await this.build.sync();
         await this.logChunk.sync();
+        await this.session.sync();
+
+        if (!(await this.getUser('-1'))) {
+            await this.createUser({
+                id: '-1',
+                username: '???',
+                displayName: 'Anonymous User'
+            });
+        }
     }
 
-    public async createBuild(repo: string, commit: string, patch: string, distro: string, dependencies: string): Promise<number> {
+    public async getUser(id: string): Promise<User> {
+        return await this.user.findByPk(id);
+    }
+
+    public async createUser(user: User): Promise<string> {
+        await this.user.create({
+            id: user.id,
+            username: user.username,
+            displayName: user.displayName || null
+        });
+        return user.id;
+    }
+
+    public async upsertUser(user: User): Promise<string> {
+        await this.user.upsert({
+            id: user.id,
+            username: user.username,
+            displayName: user.displayName || null
+        });
+        return user.id;
+    }
+
+    public async createBuild(repo: string, commit: string, patch: string, distro: string, dependencies: string, author: string, uuid: string): Promise<number> {
         const buildRec = await this.build.create({
             repo,
             commit: commit || null,
             patch: patch || null,
             distro,
-            dependencies
+            dependencies,
+            uuid,
+            userId: author || '-1'
         });
         return buildRec.id;
     }
@@ -187,14 +280,26 @@ class DB {
     }
 
     public async getBuild(id: number): Promise<Build> {
-        return await this.build.findByPk(id);
+        return await this.build.findByPk(id, {
+            include: this.user
+        });
+    }
+
+    public async getBuildByUuid(uuid: string): Promise<Build> {
+        return await this.build.findOne({
+            where: {
+                uuid
+            },
+            include: this.user
+        });
     }
 
     public async getBuilds(): Promise<Build[]> {
         return await this.build.findAll({
             attributes: SELECT,
             order: [['id', 'DESC']],
-            where: FRESH
+            where: FRESH,
+            include: this.user
         });
     }
 
@@ -205,7 +310,8 @@ class DB {
             where: {
                 ...FRESH,
                 status
-            }
+            },
+            include: this.user
         });
     }
 
@@ -216,7 +322,8 @@ class DB {
             where: {
                 ...FRESH,
                 distro
-            }
+            },
+            include: this.user
         });
     }
 
@@ -227,7 +334,8 @@ class DB {
             where: {
                 ...FRESH,
                 ...filterable
-            }
+            },
+            include: this.user
         });
     }
 
@@ -250,7 +358,8 @@ class DB {
                     { repo: { [Op.iLike]: `%${query}%` } }
                 ]
             },
-            limit: 100
+            limit: 100,
+            include: this.user
         });
     }
 
@@ -258,8 +367,117 @@ class DB {
         await this.build.destroy({
             where: {
                 startTime: { [Op.lt]: new Date(Date.now() - MONTH * 6) }
-            }
+            },
+            force: true
         });
+        await this.session.destroy({
+            where: {
+                updatedAt: { [Op.lt]: new Date(Date.now() - this.ttl) }
+            },
+            force: true
+        });
+    }
+
+    public getTTL(sessionData: SessionData) {
+        if (sessionData?.cookie?.expires) {
+            const ms = Number(new Date(sessionData.cookie.expires)) - Date.now();
+            return ms;
+        }
+        else {
+            return this.ttl;
+        }
+    }
+
+    public async set(sid: string, sessionData: SessionData, cb?: Callback): Promise<void> {
+        const ttl = this.getTTL(sessionData);
+        try {
+            if (ttl > 0) {
+                await this.session.upsert({
+                    sid,
+                    sessionData
+                });
+                handleCallback(null, null, cb);
+                return;
+            }
+            await this.destroy(sid, cb);
+        }
+        catch (err) {
+            return handleCallback(err, null, cb);
+        }
+    }
+
+    public async get(sid: string, cb?: Callback): Promise<SessionData> {
+        try {
+            return handleCallback(null, ((await this.session.findByPk(sid))?.sessionData) as SessionData || null, cb);
+        }
+        catch (err) {
+            return handleCallback(err, null, cb);
+        }
+    }
+
+    public async destroy(sid: string, cb?: Callback): Promise<void> {
+        try {
+            await this.session.destroy({
+                where: {
+                    sid
+                },
+                force: true
+            });
+            handleCallback(null, null, cb);
+        }
+        catch (err) {
+            handleCallback(err, null, cb);
+        }
+    }
+
+    public async clear(cb?: Callback): Promise<void> {
+        try {
+            await this.session.destroy({
+                truncate: true,
+                force: true
+            });
+            handleCallback(null, null, cb);
+        }
+        catch (err) {
+            handleCallback(err, null, cb);
+        }
+    }
+
+    public async length(cb?: Callback): Promise<number> {
+        try {
+            return handleCallback(null, await this.session.count(), cb);
+        }
+        catch (err) {
+            handleCallback(err, null, cb);
+        }
+    }
+
+    public async touch(sid: string, sessionData: SessionData, cb?: Callback): Promise<void> {
+        try {
+            await this.session.update({},
+                {
+                    where: {
+                        sid
+                    }
+                }
+            );
+            handleCallback(null, null, cb);
+        }
+        catch (err) {
+            handleCallback(err, null, cb);
+        }
+    }
+
+    public async all(cb?: Callback): Promise<SessionData[]> {
+        try {
+            const all = await this.session.findAll({
+                attributes: ['sessionData']
+            });
+            return handleCallback(null, all.map(row => row.sessionData as SessionData), cb);
+        }
+        catch (err) {
+            handleCallback(err, null, cb);
+        }
     }
 
     public async close(): Promise<void> {
@@ -269,4 +487,4 @@ class DB {
 
 export default DB;
 export { DB };
-export type { DBConfig, Status, Build, LogChunk };
+export type { DBConfig, Status, Build, LogChunk, User };

src/Web.ts

@@ -1,14 +1,34 @@
 import * as http from "http";
 import crypto from 'crypto';
-import type { Express } from "express";
+import type { Express } from 'express';
 import express from 'express';
-import expressWs from "express-ws";
+import expressWs from 'express-ws';
-import bodyParser from "body-parser";
+import session from 'express-session';
-import type { DB, LogChunk } from "./DB.ts";
+import ky from 'ky';
+import passport from 'passport';
+import OpenIDConnectStrategy from 'passport-openidconnect';
+import bodyParser from 'body-parser';
+import Sqids from 'sqids';
+import type { DB, LogChunk, Build, User } from "./DB.ts";
 import type { BuildController, BuildEvent } from "./BuildController.ts";
 
 interface WebConfig {
+    sessionSecret?: string;
     port?: number;
+    secure?: boolean;
+    oidc?: {
+        server: string;
+        clientId: string;
+        clientSecret: string;
+        appBaseUrl: string;
+    };
+}
+
+interface OpenIdConfiguration {
+    issuer: string;
+    authorization_endpoint: string;
+    token_endpoint: string;
+    userinfo_endpoint: string;
 }
 
 /**
@@ -39,10 +59,22 @@ class Web {
     private buildController: BuildController;
     private app: expressWs.Application;
     private port: number;
+    private options:WebConfig;
 
     constructor(options: WebConfig = {}) {
+        this.options = options;
+    }
+
+    initialize = async () => {
+        const options = this.options;
+        const sessionSecret = process.env['SESSIONSECRET'] || options.sessionSecret;
+        const sqids = new Sqids({
+            minLength: 6,
+            alphabet: 'abcdefghijkmnprstuvwxyz'
+        });
         const app: Express = express();
         const wsApp = this.app = expressWs(app).app;
+        const oidc = await this.initializeOIDC(options);
         this.port = notStupidParseInt(process.env.PORT) || options['port'] as number || 8080;
 
         app.set('trust proxy', 1);
@@ -63,15 +95,154 @@ class Web {
             });
         });
 
+        const createBuildPages = (slug: string, getBuildFn: (str: string) => Promise<Build>) => {
+            app.get(`/${slug}/:id/`, async (req, res) => {
+                const build = await getBuildFn(req.params.id);
+                if (!build) {
+                    res.sendStatus(404);
+                    return;
+                }
+                build.sqid = sqids.encode([build.id]);
+                const log = splitLines(await this.db.getLog(build.id));
+
+                if (req?.user) {
+                    res.locals.shareable = `${req.protocol}://${req.host}/b/${build.uuid}/`;
+                }
+
+                res.render('build', {
+                    page: {
+                        title: 'Archery',
+                        titlesuffix: `Build #${build.id}`,
+                        description: `Building ${build.repo} on ${build.distro}`,
+                    },
+                    user: req?.user,
+                    build,
+                    log,
+                    ended: build.status !== 'queued' && build.status !== 'running',
+                    public: !!oidc && !req?.user
+                });
+            });
+
+            app.get(`/${slug}/:id/logs{/}`, async (req, res) => {
+                const build = await getBuildFn(req.params.id);
+                if (!build) {
+                    res.sendStatus(404);
+                    return;
+                }
+                const log = (await this.db.getLog(build.id)).map(logChunk => logChunk.chunk).join('\n');
+                res.set('Content-Type', 'text/plain').send(log);
+            });
+
+            app.get(`/${slug}/:id/patch{/}`, async (req, res) => {
+                const build = await getBuildFn(req.params.id);
+                if (!build || !build.patch) {
+                    res.sendStatus(404);
+                    return;
+                }
+                res.set('Content-Type', 'text/plain').send(build.patch);
+            });
+
+            wsApp.ws(`/${slug}/:id/ws`, async (ws, req) => {
+                const build = await getBuildFn(req.params.id);
+                if (!build || (build.status !== 'queued' && build.status !== 'running')) {
+                    return ws.close();
+                }
+                console.log('WS Opened');
+                const eventListener = (be: BuildEvent) => {
+                    if (be.id === build.id) {
+                        ws.send(JSON.stringify(be));
+                    }
+                };
+                this.buildController.on('log', eventListener);
+
+                ws.on('close', () => {
+                    console.log('WS Closed');
+                    this.buildController.removeListener('log', eventListener);
+                });
+            });
+        }
+
+        app.get('/healthcheck', (_, res) => {
+            res.send('Healthy');
+        });
+
+        if (oidc) {
+            if (!sessionSecret) {
+                throw new Error('sessionSecret must be set.');
+            }
+            app.use(session({
+                name: 'sessionId',
+                secret: sessionSecret,
+                resave: true,
+                saveUninitialized: false,
+                store: this.db,
+                cookie: {
+                    maxAge: notStupidParseInt(process.env['COOKIETTL']) || 1000 * 60 * 60 * 24 * 30, // 30 days
+                    httpOnly: true,
+                    secure: !!options.secure
+                }
+            }));
+            passport.use(oidc);
+            app.use(passport.initialize());
+            app.use(passport.session());
+            passport.serializeUser(function (user: User, done) {
+                done(null, user.id);
+            });
+
+            passport.deserializeUser(async (id: string, done) => {
+                const user = await this.db.getUser(id);
+                done(null, {
+                    id: user.id,
+                    username: user.username,
+                    displayName: user.displayName
+                });
+            });
+            app.get('/login', (req, res) => {
+                if (req?.user) {
+                    return res.redirect('/');
+                }
+                res.append('X-Robots-Tag', 'none');
+                res.render('login-required', {
+                    page: {
+                        title: 'Archery',
+                        titlesuffix: 'Log In',
+                        description: 'Authentication required',
+                    }
+                });
+            });
+            app.post('/login', passport.authenticate('openidconnect'));
+            app.get('/cb', passport.authenticate('openidconnect', { successRedirect: '/', failureRedirect: '/login', failureMessage: true }));
+            app.get('/logout', (req, res) => {
+                req.logOut((err) => {
+                    if (err) {
+                        console.error(`Failed to log out user: ${err}`);
+                    }
+                    res.redirect('/login');
+                });
+            });
+            createBuildPages('b', (id) => this.db.getBuildByUuid(id));
+            app.use((req, res, next) => {
+                if (!req?.user) {
+                    res.redirect('/login');
+                    return;
+                }
+                next();
+            });
+        }
+
         app.get('/', async (req, res) => {
             try {
                 const builds = 'q' in req.query ? await this.db.searchBuilds(req.query.q as string) : await this.db.getBuildsBy(req.query);
+                builds.forEach(b => {
+                    b.sqid = sqids.encode([b.id]);
+                });
                 res.render('index', {
                     page: {
                         title: 'Archery',
                         titlesuffix: 'Dashboard',
                         description: 'PKGBUILD central'
                     },
+                    user: req?.user,
                     builds,
                     timeElapsed
                 });
@@ -82,50 +253,37 @@ class Web {
             }
         });
 
-        app.get('/build/?', (_, res) => {
+        app.get('/build{/}', async (req, res) => {
+            const query = ('id' in req.query && typeof req.query.id === 'string' && await this.db.getBuild(sqids.decode(req.query.id)?.[0])) || req.query;
             res.render('build-new', {
                 page: {
                     title: 'Archery',
                     titlesuffix: 'New Build',
-                    description: 'Kick off a build'
+                    description: 'Kick off a build',
-                }
+                },
+                user: req?.user,
+                query
             });
         });
 
-        app.post('/build/?', async (req, res) => {
+        app.post('/build{/}', async (req, res) => {
             const buildId = await this.db.createBuild(
                 req.body.repo,
                 req.body.commit || null,
                 req.body.patch || null,
                 req.body.distro || 'arch',
-                req.body.dependencies || 'stable'
+                req.body.dependencies || 'stable',
+                req?.user?.['id'],
+                crypto.randomUUID()
             );
-            res.redirect(`/build/${buildId}`);
+            res.redirect(`/build/${sqids.encode([buildId])}/`);
             this.buildController.triggerBuild();
         });
 
-        app.get('/build/:num/?', async (req, res) => {
+        createBuildPages('build', (id) => this.db.getBuild(sqids.decode(id)?.[0]));
-            const build = await this.db.getBuild(parseInt(req.params.num));
-            if (!build) {
-                res.sendStatus(404);
-                return;
-            }
-            const log = splitLines(await this.db.getLog(build.id));
 
-            res.render('build', {
+        app.get('/build/:id/cancel', async (req, res) => {
-                page: {
+            const build = await this.db.getBuild(sqids.decode(req.params.id)?.[0]);
-                    title: 'Archery',
-                    titlesuffix: `Build #${req.params.num}`,
-                    description: `Building ${build.repo} on ${build.distro}`
-                },
-                build,
-                log,
-                ended: build.status !== 'queued' && build.status !== 'running'
-            });
-        });
-
-        app.get('/build/:num/cancel', async (req, res) => {
-            const build = await this.db.getBuild(parseInt(req.params.num));
             if (!build) {
                 res.sendStatus(404);
                 return;
@@ -136,47 +294,10 @@ class Web {
             catch (ex) {
                 console.error(ex);
             }
-            res.redirect(`/build/${build.id}`);
+            res.redirect(`/build/${req.params.id}/`);
-        });
-
-        app.get('/build/:num/logs/?', async (req, res) => {
-            const build = await this.db.getBuild(parseInt(req.params.num));
-            if (!build) {
-                res.sendStatus(404);
-                return;
-            }
-            const log = (await this.db.getLog(build.id)).map(logChunk => logChunk.chunk).join('\n');
-            res.set('Content-Type', 'text/plain').send(log);
-        });
-
-        app.get('/build/:num/patch/?', async (req, res) => {
-            const build = await this.db.getBuild(parseInt(req.params.num));
-            if (!build || !build.patch) {
-                res.sendStatus(404);
-                return;
-            }
-            res.set('Content-Type', 'text/plain').send(build.patch);
-        });
-
-        app.get('/healthcheck', (_, res) => {
-            res.send('Healthy');
-        });
-
-        wsApp.ws('/build/:num/ws', (ws, req) => {
-            console.log('WS Opened');
-            const eventListener = (be: BuildEvent) => {
-                if (be.id === notStupidParseInt(req.params.num)) {
-                    ws.send(JSON.stringify(be));
-                }
-            };
-            this.buildController.on('log', eventListener);
-
-            ws.on('close', () => {
-                console.log('WS Closed');
-                this.buildController.removeListener('log', eventListener);
-            });
         });
 
+        this._webserver = this.app.listen(this.port, () => console.log(`archery is running on port ${this.port}`));
     }
 
     close = () => {
@@ -187,9 +308,33 @@ class Web {
 
     setDB = (db: DB) => {
         this.db = db;
-        if (!this._webserver) {
+    }
-            this._webserver = this.app.listen(this.port, () => console.log(`archery is running on port ${this.port}`));
+
+    initializeOIDC = async (options: WebConfig): Promise<OpenIDConnectStrategy | false> => {
+        if (!options.oidc || !options.oidc.server || !options.oidc.clientId || !options.oidc.clientSecret) {
+            return false;
         }
+        const server = options.oidc.server.endsWith('/') ? options.oidc.server : `${options.oidc.server}/`;
+        const baseUrl = options.oidc.appBaseUrl.endsWith('/') ? options.oidc.appBaseUrl : `${options.oidc.appBaseUrl}/`;
+        const openidconf = await ky.get(`${server}.well-known/openid-configuration`).json<OpenIdConfiguration>();
+        return new OpenIDConnectStrategy({
+            issuer: openidconf.issuer,
+            authorizationURL: openidconf.authorization_endpoint,
+            tokenURL: openidconf.token_endpoint,
+            userInfoURL: openidconf.userinfo_endpoint,
+            clientID: options.oidc.clientId,
+            clientSecret: options.oidc.clientSecret,
+            callbackURL: `${baseUrl}cb`,
+            scope: 'profile'
+        }, async (_: string, profile: passport.Profile, cb: OpenIDConnectStrategy.VerifyCallback) => {
+            const userObj: User = {
+                id: profile.id,
+                username: profile.username,
+                displayName: profile.displayName
+            };
+            await this.db.upsertUser(userObj);
+            return cb(null, userObj);
+        });
     }
 
     setBuildController = (buildController: BuildController) => {
@@ -198,5 +343,5 @@ class Web {
 }
 
 export default Web;
-export { Web };
+export { Web, notStupidParseInt };
 export type { WebConfig };

src/index.ts

@@ -11,7 +11,7 @@ interface compositeConfig {
     db?: DBConfig
 }
 
-const config: compositeConfig = JSON.parse(await fs.promises.readFile(process.env.config || process.env.CONFIG || path.join('config', 'config.json'), 'utf-8'));
+const config: compositeConfig = JSON.parse(await fs.promises.readFile(process.env.config || process.env.CONFIG || path.join(process.cwd(), 'config', 'config.json'), 'utf-8'));
 
 const web = new Web(config.web);
 const buildController = new BuildController();
@@ -19,6 +19,7 @@ await new Promise((resolve) => setTimeout(resolve, 1500));
 const db = new DB(config.db);
 web.setDB(db);
 web.setBuildController(buildController);
+web.initialize();
 buildController.setDB(db);
 
 process.on('SIGTERM', () => {

styles/01-styles.scss

@@ -118,6 +118,15 @@ input[type="submit"] {
     }
 }
 
+span,
+a {
+
+    &:has(+ button.copybtn) {
+        float: left;
+        margin-right: .75em;
+    }
+}
+
 
 .sidebar {
     background: var(--primary);
@@ -190,6 +199,10 @@ input[type="submit"] {
     &.no-padding {
         padding: 0;
     }
+
+    &:has(+ .content.footer) {
+        padding-bottom: 3em;
+    }
 }
 
 .overflow-x {
@@ -231,9 +244,13 @@ input[type="submit"] {
 .content.footer {
     background: var(--primary-dark);
     color: var(--color-text);
-    margin-top: .5em;
     padding: .25em 1em;
 
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+
     a {
         color: var(--color-text);
         text-decoration: underline;

views/build-new.ejs

@@ -10,19 +10,19 @@
     <div class="content">
         <h1>Start a build</h1>
         <form action="/build" method="post" class="grid-2col">
-            <label for="repoTxt">Repo</label> <input type="text" name="repo" id="repoTxt" required />
+            <label for="repoTxt">Repo</label> <input type="text" name="repo" id="repoTxt" required <% if (typeof query.repo === 'string') { %>value="<%= query.repo %>"<% } %> />
-            <label for="commitTxt">Commit</label> <input type="text" name="commit" id="commitTxt" />
+            <label for="commitTxt">Commit</label> <input type="text" name="commit" id="commitTxt" <% if (typeof query.commit === 'string') { %>value="<%= query.commit %>"<% } %> />
-            <label for="patchTxt">Patch</label> <textarea name="patch" id="patchTxt"></textarea>
+            <label for="patchTxt">Patch</label> <textarea name="patch" id="patchTxt"><% if (typeof query.patch === 'string') { %><%= query.patch %><% } %></textarea>
             <label for="distroTxt">Distro</label>
             <select name="distro" id="distroTxt" required>
-                <option value="arch">Arch</option>
+                <option value="arch" <% if (query.distro === 'arch') { %>selected<% } %>>Arch</option>
-                <option value="artix">Artix</option>
+                <option value="artix" <% if (query.distro === 'artix') { %>selected<% } %>>Artix</option>
             </select>
             <label for="dependsTxt">Dependencies</label>
             <select name="dependencies" id="dependsTxt" required>
-                <option value="stable">Stable</option>
+                <option value="stable" <% if (query.dependencies === 'stable') { %>selected<% } %>>Stable</option>
-                <option value="testing">Testing</option>
+                <option value="testing" <% if (query.dependencies === 'testing') { %>selected<% } %>>Testing</option>
-                <option value="staging">Staging</option>
+                <option value="staging" <% if (query.dependencies === 'staging') { %>selected<% } %>>Staging</option>
             </select>
             <div class="span-2"><button type="submit">Build</button></div>
         </form>

views/build.ejs

@@ -12,20 +12,31 @@
         <h2 id="buildStatus"><%= build.status %></h2>
         <div class="overflow-x">
             <div class="grid-2col">
-                <label>Repo</label> <span><%= build.repo %></span>
+                <label>Repo</label> <span><span><%= build.repo %></span> <button class="copybtn">Copy</button></span>
                 <label>Commit</label> <span><% if (build.commit) { %><%= build.commit %><% } else { %>latest<% } %></span>
-                <label>Patch</label> <span><% if (build.patch) { %><a href="/build/<%= build.id %>/patch">patch file</a><% } else { %>none<% } %></span>
+                <label>Patch</label> <span><% if (build.patch) { %><a href="/build/<%= build.sqid %>/patch">patch file</a><% } else { %>none<% } %></span>
                 <label>Distro</label> <span><%= build.distro %></span>
                 <label>Dependencies</label> <span><%= build.dependencies %></span>
                 <label>Start time</label> <span class="to-local-time"><%= build.startTime %></span>
+                <% if (build.userId && build.userId !== '-1') { %>
+                <label>Triggered by</label> <span><%= build.user.displayName %> (<%= build.user.username %>)</span>
+                <% } %>
+                <% if (locals.shareable) { %>
+                <label>Shareable link</label> <span><a href="<%= shareable %>"><%= shareable %></a> <button class="copybtn">Copy</button></span>
+                <% } %>
             </div>
         </div>
-        <% if (!ended) { %>
+        <% if (build.sqid && !public) { %>
         <div>
-            <a href="/build/<%= build.id %>/cancel" class="button">Cancel build</a>
+            <a href="/build?id=<%= build.sqid %>" class="button">Clone</a>
         </div>
         <% } %>
-        <p><a href="/build/<%= build.id %>/logs">Full logs</a></p>
+        <% if (!ended && !public) { %>
+        <div id="cancelRow">
+            <a href="cancel" class="button">Cancel build</a>
+        </div>
+        <% } %>
+        <p><a href="logs">Full logs</a></p>
         <pre class="overflow-x"><div class="logs" id="logs"><% (log || []).forEach(line => { %><p><%= line %></p><% }) %></div></pre>
 
         <% if (!ended) { %>
@@ -36,8 +47,9 @@
     </div>
     <%- include("footer", locals) %>
     <script src="/assets/js/timezone.js?v1" nonce="<%= cspNonce %>"></script>
+    <script src="/assets/js/copy.js?v1" nonce="<%= cspNonce %>"></script>
     <% if (!ended) { %>
-    <script src="/assets/js/build.js?v2" nonce="<%= cspNonce %>"></script>
+    <script src="/assets/js/build.js?v3" nonce="<%= cspNonce %>"></script>
     <% } %>
 </body>
 </html>

views/head.ejs

@@ -14,7 +14,7 @@
 <link rel="canonical" href="<%= page.canonical%>"/>
 <% } %>
 <link rel="shortcut icon" href="/assets/svg/favicon.svg">
-<link rel="stylesheet" href="/assets/css/styles.css?v3">
+<link rel="stylesheet" href="/assets/css/styles.css?v4">
 <script nonce="<%= cspNonce %>">
     document.addEventListener("DOMContentLoaded", function() {
         document.body.classList.remove('preload');

views/index.ejs

@@ -20,7 +20,7 @@
                 </tr>
                 <% builds.forEach(build => { %>
                     <tr>
-                        <td><a href="/build/<%= build.id %>"><%= build.repo %></a></td>
+                        <td><a href="/build/<%= build.sqid %>/"><%= build.repo %></a></td>
                         <td><%= build.distro %></td>
                         <td class="to-local-time"><%= build.startTime %></td>
                         <td><%= timeElapsed(build.startTime, build.endTime) %></td>

views/login-required.ejs

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+
+<head>
+    <%- include("head", locals) %>
+</head>
+
+<body class="preload">
+    <%- include("navigation", locals) %>
+    <div class="content">
+        <h1>Authentication Required</h1>
+        You must log in to access that page.
+        <form action="/login" method="post">
+            <button type="submit">Log In</button>
+        </form>
+    </div>
+    <%- include("footer", locals) %>
+</body>
+</html>

views/navigation.ejs

@@ -14,6 +14,9 @@
             <li><a href="/?distro=arch">Arch Builds</a></li>
             <li><a href="/?distro=artix">Artix Builds</a></li>
             <li><a href="/build">New Build</a></li>
+            <% if (locals.user) { %>
+            <li><a href="/logout">Log Out</a></li>
+            <% } %>
         </ul>
     </nav>
 </div>