Compare commits
6 Commits
v0.1.8
...
45ebb7d9cf
| Author | SHA1 | Date | |
|---|---|---|---|
| 45ebb7d9cf | |||
| fe49302eca | |||
| 77441fe7ed | |||
| b20bbf40fc | |||
| 24d7b37583 | |||
| 5e95f22245 |
@@ -4,6 +4,12 @@
|
|||||||
"password": "correcthorse"
|
"password": "correcthorse"
|
||||||
},
|
},
|
||||||
"web": {
|
"web": {
|
||||||
"port": 8080
|
"port": 8080,
|
||||||
|
"oidc": {
|
||||||
|
"server": "https://gitea.artixlinux.org/",
|
||||||
|
"clientId": "fakefake-fake-fake-fake-fakefakefake",
|
||||||
|
"clientSecret": "thisisnotarealsecret",
|
||||||
|
"appBaseUrl": "http://localhost:8080"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
219
package-lock.json
generated
219
package-lock.json
generated
@@ -1,18 +1,22 @@
|
|||||||
{
|
{
|
||||||
"name": "archery",
|
"name": "archery",
|
||||||
"version": "0.1.8",
|
"version": "0.2.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "archery",
|
"name": "archery",
|
||||||
"version": "0.1.8",
|
"version": "0.2.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"body-parser": "^2.2.0",
|
"body-parser": "^2.2.0",
|
||||||
"ejs": "3.1.10",
|
"ejs": "3.1.10",
|
||||||
"express": "^5.1.0",
|
"express": "^5.1.0",
|
||||||
|
"express-session": "1.18.2",
|
||||||
"express-ws": "^5.0.2",
|
"express-ws": "^5.0.2",
|
||||||
|
"ky": "1.10.0",
|
||||||
|
"passport": "0.7.0",
|
||||||
|
"passport-openidconnect": "0.1.2",
|
||||||
"pg": "^8.16.3",
|
"pg": "^8.16.3",
|
||||||
"pg-hstore": "^2.3.4",
|
"pg-hstore": "^2.3.4",
|
||||||
"sequelize": "^6.37.7",
|
"sequelize": "^6.37.7",
|
||||||
@@ -20,8 +24,11 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/express": "^5.0.3",
|
"@types/express": "^5.0.3",
|
||||||
|
"@types/express-session": "^1.18.2",
|
||||||
"@types/express-ws": "3.0.5",
|
"@types/express-ws": "3.0.5",
|
||||||
"@types/node": "^24.5.2",
|
"@types/node": "^24.5.2",
|
||||||
|
"@types/passport": "1.0.17",
|
||||||
|
"@types/passport-openidconnect": "0.1.3",
|
||||||
"forking-build-shit": "1.0.4"
|
"forking-build-shit": "1.0.4"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
@@ -393,6 +400,16 @@
|
|||||||
"@types/send": "*"
|
"@types/send": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@types/express-session": {
|
||||||
|
"version": "1.18.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/express-session/-/express-session-1.18.2.tgz",
|
||||||
|
"integrity": "sha512-k+I0BxwVXsnEU2hV77cCobC08kIsn4y44C3gC0b46uxZVMaXA04lSPgRLR/bSL2w0t0ShJiG8o4jPzRG/nscFg==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/express": "*"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@types/express-ws": {
|
"node_modules/@types/express-ws": {
|
||||||
"version": "3.0.5",
|
"version": "3.0.5",
|
||||||
"resolved": "https://registry.npmjs.org/@types/express-ws/-/express-ws-3.0.5.tgz",
|
"resolved": "https://registry.npmjs.org/@types/express-ws/-/express-ws-3.0.5.tgz",
|
||||||
@@ -434,6 +451,50 @@
|
|||||||
"undici-types": "~7.12.0"
|
"undici-types": "~7.12.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@types/oauth": {
|
||||||
|
"version": "0.9.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/oauth/-/oauth-0.9.6.tgz",
|
||||||
|
"integrity": "sha512-H9TRCVKBNOhZZmyHLqFt9drPM9l+ShWiqqJijU1B8P3DX3ub84NjxDuy+Hjrz+fEca5Kwip3qPMKNyiLgNJtIA==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/node": "*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@types/passport": {
|
||||||
|
"version": "1.0.17",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/passport/-/passport-1.0.17.tgz",
|
||||||
|
"integrity": "sha512-aciLyx+wDwT2t2/kJGJR2AEeBz0nJU4WuRX04Wu9Dqc5lSUtwu0WERPHYsLhF9PtseiAMPBGNUOtFjxZ56prsg==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/express": "*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@types/passport-openidconnect": {
|
||||||
|
"version": "0.1.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/passport-openidconnect/-/passport-openidconnect-0.1.3.tgz",
|
||||||
|
"integrity": "sha512-k1Ni7bG/9OZNo2Qpjg2W6GajL+pww6ZPaNWMXfpteCX4dXf4QgaZLt2hjR5IiPrqwBT9+W8KjCTJ/uhGIoBx/g==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/express": "*",
|
||||||
|
"@types/oauth": "*",
|
||||||
|
"@types/passport": "*",
|
||||||
|
"@types/passport-strategy": "*"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@types/passport-strategy": {
|
||||||
|
"version": "0.2.38",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/passport-strategy/-/passport-strategy-0.2.38.tgz",
|
||||||
|
"integrity": "sha512-GC6eMqqojOooq993Tmnmp7AUTbbQSgilyvpCYQjT+H6JfG/g6RGc7nXEniZlp0zyKJ0WUdOiZWLBZft9Yug1uA==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/express": "*",
|
||||||
|
"@types/passport": "*"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@types/qs": {
|
"node_modules/@types/qs": {
|
||||||
"version": "6.9.17",
|
"version": "6.9.17",
|
||||||
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
|
"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
|
||||||
@@ -910,6 +971,55 @@
|
|||||||
"url": "https://opencollective.com/express"
|
"url": "https://opencollective.com/express"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/express-session": {
|
||||||
|
"version": "1.18.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.2.tgz",
|
||||||
|
"integrity": "sha512-SZjssGQC7TzTs9rpPDuUrR23GNZ9+2+IkA/+IJWmvQilTr5OSliEHGF+D9scbIpdC6yGtTI0/VhaHoVes2AN/A==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"cookie": "0.7.2",
|
||||||
|
"cookie-signature": "1.0.7",
|
||||||
|
"debug": "2.6.9",
|
||||||
|
"depd": "~2.0.0",
|
||||||
|
"on-headers": "~1.1.0",
|
||||||
|
"parseurl": "~1.3.3",
|
||||||
|
"safe-buffer": "5.2.1",
|
||||||
|
"uid-safe": "~2.1.5"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.8.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/express-session/node_modules/cookie": {
|
||||||
|
"version": "0.7.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
|
||||||
|
"integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.6"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/express-session/node_modules/cookie-signature": {
|
||||||
|
"version": "1.0.7",
|
||||||
|
"resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz",
|
||||||
|
"integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/express-session/node_modules/debug": {
|
||||||
|
"version": "2.6.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
|
||||||
|
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"ms": "2.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/express-session/node_modules/ms": {
|
||||||
|
"version": "2.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
|
||||||
|
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/express-ws": {
|
"node_modules/express-ws": {
|
||||||
"version": "5.0.2",
|
"version": "5.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/express-ws/-/express-ws-5.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/express-ws/-/express-ws-5.0.2.tgz",
|
||||||
@@ -1230,6 +1340,18 @@
|
|||||||
"node": ">=10"
|
"node": ">=10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/ky": {
|
||||||
|
"version": "1.10.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/ky/-/ky-1.10.0.tgz",
|
||||||
|
"integrity": "sha512-YRPCzHEWZffbfvmRrfwa+5nwBHwZuYiTrfDX0wuhGBPV0pA/zCqcOq93MDssON/baIkpYbvehIX5aLpMxrRhaA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sindresorhus/ky?sponsor=1"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/lodash": {
|
"node_modules/lodash": {
|
||||||
"version": "4.17.21",
|
"version": "4.17.21",
|
||||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||||
@@ -1365,6 +1487,12 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"optional": true
|
"optional": true
|
||||||
},
|
},
|
||||||
|
"node_modules/oauth": {
|
||||||
|
"version": "0.10.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/oauth/-/oauth-0.10.2.tgz",
|
||||||
|
"integrity": "sha512-JtFnB+8nxDEXgNyniwz573xxbKSOu3R8D40xQKqcjwJ2CDkYqUDI53o6IuzDJBx60Z8VKCm271+t8iFjakrl8Q==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/object-inspect": {
|
"node_modules/object-inspect": {
|
||||||
"version": "1.13.4",
|
"version": "1.13.4",
|
||||||
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
|
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
|
||||||
@@ -1389,6 +1517,15 @@
|
|||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/on-headers": {
|
||||||
|
"version": "1.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
|
||||||
|
"integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.8"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/once": {
|
"node_modules/once": {
|
||||||
"version": "1.4.0",
|
"version": "1.4.0",
|
||||||
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
|
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
|
||||||
@@ -1407,6 +1544,49 @@
|
|||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/passport": {
|
||||||
|
"version": "0.7.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz",
|
||||||
|
"integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"passport-strategy": "1.x.x",
|
||||||
|
"pause": "0.0.1",
|
||||||
|
"utils-merge": "^1.0.1"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/jaredhanson"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/passport-openidconnect": {
|
||||||
|
"version": "0.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/passport-openidconnect/-/passport-openidconnect-0.1.2.tgz",
|
||||||
|
"integrity": "sha512-JX3rTyW+KFZ/E9OF/IpXJPbyLO9vGzcmXB5FgSP2jfL3LGKJPdV7zUE8rWeKeeI/iueQggOeFa3onrCmhxXZTg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"oauth": "0.10.x",
|
||||||
|
"passport-strategy": "1.x.x"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.6.0"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/jaredhanson"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/passport-strategy": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
|
||||||
|
"integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/path-to-regexp": {
|
"node_modules/path-to-regexp": {
|
||||||
"version": "8.3.0",
|
"version": "8.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
|
||||||
@@ -1417,6 +1597,11 @@
|
|||||||
"url": "https://opencollective.com/express"
|
"url": "https://opencollective.com/express"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/pause": {
|
||||||
|
"version": "0.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
|
||||||
|
"integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
|
||||||
|
},
|
||||||
"node_modules/pg": {
|
"node_modules/pg": {
|
||||||
"version": "8.16.3",
|
"version": "8.16.3",
|
||||||
"resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
|
"resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
|
||||||
@@ -1599,6 +1784,15 @@
|
|||||||
"url": "https://github.com/sponsors/ljharb"
|
"url": "https://github.com/sponsors/ljharb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/random-bytes": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz",
|
||||||
|
"integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.8"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/range-parser": {
|
"node_modules/range-parser": {
|
||||||
"version": "1.2.1",
|
"version": "1.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
|
||||||
@@ -2036,6 +2230,18 @@
|
|||||||
"node": ">=0.8.0"
|
"node": ">=0.8.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/uid-safe": {
|
||||||
|
"version": "2.1.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
|
||||||
|
"integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"random-bytes": "~1.0.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.8"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/underscore": {
|
"node_modules/underscore": {
|
||||||
"version": "1.13.7",
|
"version": "1.13.7",
|
||||||
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
|
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
|
||||||
@@ -2057,6 +2263,15 @@
|
|||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/utils-merge": {
|
||||||
|
"version": "1.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
|
||||||
|
"integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 0.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/uuid": {
|
"node_modules/uuid": {
|
||||||
"version": "8.3.2",
|
"version": "8.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "archery",
|
"name": "archery",
|
||||||
"version": "0.1.8",
|
"version": "0.2.0",
|
||||||
"description": "Build Arch packages through a web interface",
|
"description": "Build Arch packages through a web interface",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"docker",
|
"docker",
|
||||||
@@ -23,7 +23,11 @@
|
|||||||
"body-parser": "^2.2.0",
|
"body-parser": "^2.2.0",
|
||||||
"ejs": "3.1.10",
|
"ejs": "3.1.10",
|
||||||
"express": "^5.1.0",
|
"express": "^5.1.0",
|
||||||
|
"express-session": "1.18.2",
|
||||||
"express-ws": "^5.0.2",
|
"express-ws": "^5.0.2",
|
||||||
|
"ky": "1.10.0",
|
||||||
|
"passport": "0.7.0",
|
||||||
|
"passport-openidconnect": "0.1.2",
|
||||||
"pg": "^8.16.3",
|
"pg": "^8.16.3",
|
||||||
"pg-hstore": "^2.3.4",
|
"pg-hstore": "^2.3.4",
|
||||||
"sequelize": "^6.37.7",
|
"sequelize": "^6.37.7",
|
||||||
@@ -31,8 +35,11 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/express": "^5.0.3",
|
"@types/express": "^5.0.3",
|
||||||
|
"@types/express-session": "^1.18.2",
|
||||||
"@types/express-ws": "3.0.5",
|
"@types/express-ws": "3.0.5",
|
||||||
"@types/node": "^24.5.2",
|
"@types/node": "^24.5.2",
|
||||||
|
"@types/passport": "1.0.17",
|
||||||
|
"@types/passport-openidconnect": "0.1.3",
|
||||||
"forking-build-shit": "1.0.4"
|
"forking-build-shit": "1.0.4"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
|
|||||||
@@ -4,14 +4,6 @@ document.addEventListener('DOMContentLoaded', function () {
|
|||||||
const buildStatusTxt = this.getElementById('buildStatus');
|
const buildStatusTxt = this.getElementById('buildStatus');
|
||||||
let started = logContainer.childElementCount > 0;
|
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
|
* Add log line to the DOM
|
||||||
* @param {string[]} str
|
* @param {string[]} str
|
||||||
@@ -52,7 +44,7 @@ document.addEventListener('DOMContentLoaded', function () {
|
|||||||
const loc = window.location;
|
const loc = window.location;
|
||||||
let new_uri = loc.protocol === 'https:' ? 'wss:' : 'ws:';
|
let new_uri = loc.protocol === 'https:' ? 'wss:' : 'ws:';
|
||||||
new_uri += "//" + loc.host;
|
new_uri += "//" + loc.host;
|
||||||
new_uri += wsPath(loc);
|
new_uri += loc.pathname + 'ws';
|
||||||
var ws = new WebSocket(new_uri);
|
var ws = new WebSocket(new_uri);
|
||||||
|
|
||||||
ws.onmessage = function (message) {
|
ws.onmessage = function (message) {
|
||||||
|
|||||||
7
scripts/copy.js
Normal file
7
scripts/copy.js
Normal file
@@ -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);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
231
src/DB.ts
231
src/DB.ts
@@ -1,9 +1,13 @@
|
|||||||
import { Sequelize, DataTypes, Op, } from 'sequelize';
|
import { Sequelize, DataTypes, Op, } from 'sequelize';
|
||||||
|
import { Store } from 'express-session'
|
||||||
|
import { notStupidParseInt } from './Web.ts';
|
||||||
import type { ModelStatic, Filterable } from 'sequelize';
|
import type { ModelStatic, Filterable } from 'sequelize';
|
||||||
import type { LogType } from './BuildController.ts';
|
import type { LogType } from './BuildController.ts';
|
||||||
|
import type { SessionData } from 'express-session'
|
||||||
|
|
||||||
type Status = 'queued' | 'running' | 'cancelled' | 'success' | 'error';
|
type Status = 'queued' | 'running' | 'cancelled' | 'success' | 'error';
|
||||||
type Dependencies = 'stable' | 'testing' | 'staging';
|
type Dependencies = 'stable' | 'testing' | 'staging';
|
||||||
|
type Callback = (err?: unknown, data?: any) => any
|
||||||
|
|
||||||
interface DBConfig {
|
interface DBConfig {
|
||||||
db?: string;
|
db?: string;
|
||||||
@@ -25,6 +29,13 @@ interface Build {
|
|||||||
status: Status;
|
status: Status;
|
||||||
pid?: number;
|
pid?: number;
|
||||||
sqid?: string;
|
sqid?: string;
|
||||||
|
uuid: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface User {
|
||||||
|
id: string;
|
||||||
|
username: string;
|
||||||
|
displayName?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface LogChunk {
|
interface LogChunk {
|
||||||
@@ -34,7 +45,7 @@ interface LogChunk {
|
|||||||
chunk: string
|
chunk: string
|
||||||
}
|
}
|
||||||
|
|
||||||
const MONTH = 1000 * 60 * 60 * 24 * 24;
|
const MONTH = 1000 * 60 * 60 * 24 * 30;
|
||||||
const FRESH = {
|
const FRESH = {
|
||||||
[Op.or]: [
|
[Op.or]: [
|
||||||
{ startTime: { [Op.gt]: new Date(Date.now() - MONTH) } },
|
{ startTime: { [Op.gt]: new Date(Date.now() - MONTH) } },
|
||||||
@@ -43,12 +54,27 @@ const FRESH = {
|
|||||||
}
|
}
|
||||||
const SELECT = ['id', 'repo', 'commit', 'distro', 'dependencies', 'startTime', 'endTime', 'status'];
|
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 build: ModelStatic<any>;
|
||||||
private logChunk: ModelStatic<any>;
|
private logChunk: ModelStatic<any>;
|
||||||
|
private user: ModelStatic<any>;
|
||||||
|
private session: ModelStatic<any>;
|
||||||
private sequelize: Sequelize;
|
private sequelize: Sequelize;
|
||||||
|
private ttl: number;
|
||||||
|
|
||||||
constructor(config: DBConfig = {}) {
|
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 || '', {
|
this.sequelize = new Sequelize(config.db || 'archery', config.user || 'archery', process.env.PASSWORD || config.password || '', {
|
||||||
host: config.host || 'localhost',
|
host: config.host || 'localhost',
|
||||||
port: config.port || 5432,
|
port: config.port || 5432,
|
||||||
@@ -98,6 +124,10 @@ class DB {
|
|||||||
pid: {
|
pid: {
|
||||||
type: DataTypes.INTEGER,
|
type: DataTypes.INTEGER,
|
||||||
allowNull: true
|
allowNull: true
|
||||||
|
},
|
||||||
|
uuid: {
|
||||||
|
type: DataTypes.STRING,
|
||||||
|
unique: true
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -128,21 +158,73 @@ 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();
|
this.sync();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async sync(): Promise<void> {
|
private async sync(): Promise<void> {
|
||||||
|
await this.user.sync();
|
||||||
await this.build.sync();
|
await this.build.sync();
|
||||||
await this.logChunk.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 createBuild(repo: string, commit: string, patch: string, distro: string, dependencies: string, author: string, uuid: string): Promise<number> {
|
||||||
const buildRec = await this.build.create({
|
const buildRec = await this.build.create({
|
||||||
repo,
|
repo,
|
||||||
commit: commit || null,
|
commit: commit || null,
|
||||||
patch: patch || null,
|
patch: patch || null,
|
||||||
distro,
|
distro,
|
||||||
dependencies
|
dependencies,
|
||||||
|
uuid,
|
||||||
|
userId: author || '-1'
|
||||||
});
|
});
|
||||||
return buildRec.id;
|
return buildRec.id;
|
||||||
}
|
}
|
||||||
@@ -189,14 +271,26 @@ class DB {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async getBuild(id: number): Promise<Build> {
|
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[]> {
|
public async getBuilds(): Promise<Build[]> {
|
||||||
return await this.build.findAll({
|
return await this.build.findAll({
|
||||||
attributes: SELECT,
|
attributes: SELECT,
|
||||||
order: [['id', 'DESC']],
|
order: [['id', 'DESC']],
|
||||||
where: FRESH
|
where: FRESH,
|
||||||
|
include: this.user
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -207,7 +301,8 @@ class DB {
|
|||||||
where: {
|
where: {
|
||||||
...FRESH,
|
...FRESH,
|
||||||
status
|
status
|
||||||
}
|
},
|
||||||
|
include: this.user
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -218,7 +313,8 @@ class DB {
|
|||||||
where: {
|
where: {
|
||||||
...FRESH,
|
...FRESH,
|
||||||
distro
|
distro
|
||||||
}
|
},
|
||||||
|
include: this.user
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -229,7 +325,8 @@ class DB {
|
|||||||
where: {
|
where: {
|
||||||
...FRESH,
|
...FRESH,
|
||||||
...filterable
|
...filterable
|
||||||
}
|
},
|
||||||
|
include: this.user
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -252,7 +349,8 @@ class DB {
|
|||||||
{ repo: { [Op.iLike]: `%${query}%` } }
|
{ repo: { [Op.iLike]: `%${query}%` } }
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
limit: 100
|
limit: 100,
|
||||||
|
include: this.user
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -260,8 +358,117 @@ class DB {
|
|||||||
await this.build.destroy({
|
await this.build.destroy({
|
||||||
where: {
|
where: {
|
||||||
startTime: { [Op.lt]: new Date(Date.now() - MONTH * 6) }
|
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> {
|
public async close(): Promise<void> {
|
||||||
@@ -271,4 +478,4 @@ class DB {
|
|||||||
|
|
||||||
export default DB;
|
export default DB;
|
||||||
export { DB };
|
export { DB };
|
||||||
export type { DBConfig, Status, Build, LogChunk };
|
export type { DBConfig, Status, Build, LogChunk, User };
|
||||||
|
|||||||
274
src/Web.ts
274
src/Web.ts
@@ -1,15 +1,34 @@
|
|||||||
import * as http from "http";
|
import * as http from "http";
|
||||||
import crypto from 'crypto';
|
import crypto from 'crypto';
|
||||||
import type { Express } from "express";
|
import type { Express } from 'express';
|
||||||
import 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 ky from 'ky';
|
||||||
|
import passport from 'passport';
|
||||||
|
import OpenIDConnectStrategy from 'passport-openidconnect';
|
||||||
|
import bodyParser from 'body-parser';
|
||||||
import Sqids from 'sqids';
|
import Sqids from 'sqids';
|
||||||
import type { DB, LogChunk } from "./DB.ts";
|
import type { DB, LogChunk, Build, User } from "./DB.ts";
|
||||||
import type { BuildController, BuildEvent } from "./BuildController.ts";
|
import type { BuildController, BuildEvent } from "./BuildController.ts";
|
||||||
|
|
||||||
interface WebConfig {
|
interface WebConfig {
|
||||||
|
sessionSecret?: string;
|
||||||
port?: number;
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -40,14 +59,22 @@ class Web {
|
|||||||
private buildController: BuildController;
|
private buildController: BuildController;
|
||||||
private app: expressWs.Application;
|
private app: expressWs.Application;
|
||||||
private port: number;
|
private port: number;
|
||||||
|
private options:WebConfig;
|
||||||
|
|
||||||
constructor(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({
|
const sqids = new Sqids({
|
||||||
minLength: 6,
|
minLength: 6,
|
||||||
alphabet: 'abcdefghijkmnprstuvwxyz'
|
alphabet: 'abcdefghijkmnprstuvwxyz'
|
||||||
});
|
});
|
||||||
const app: Express = express();
|
const app: Express = express();
|
||||||
const wsApp = this.app = expressWs(app).app;
|
const wsApp = this.app = expressWs(app).app;
|
||||||
|
const oidc = await this.initializeOIDC(options);
|
||||||
this.port = notStupidParseInt(process.env.PORT) || options['port'] as number || 8080;
|
this.port = notStupidParseInt(process.env.PORT) || options['port'] as number || 8080;
|
||||||
|
|
||||||
app.set('trust proxy', 1);
|
app.set('trust proxy', 1);
|
||||||
@@ -68,6 +95,141 @@ 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) => {
|
app.get('/', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const builds = 'q' in req.query ? await this.db.searchBuilds(req.query.q as string) : await this.db.getBuildsBy(req.query);
|
const builds = 'q' in req.query ? await this.db.searchBuilds(req.query.q as string) : await this.db.getBuildsBy(req.query);
|
||||||
@@ -80,6 +242,7 @@ class Web {
|
|||||||
titlesuffix: 'Dashboard',
|
titlesuffix: 'Dashboard',
|
||||||
description: 'PKGBUILD central'
|
description: 'PKGBUILD central'
|
||||||
},
|
},
|
||||||
|
user: req?.user,
|
||||||
builds,
|
builds,
|
||||||
timeElapsed
|
timeElapsed
|
||||||
});
|
});
|
||||||
@@ -90,7 +253,7 @@ class Web {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get('/build{/}', async(req, 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;
|
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', {
|
res.render('build-new', {
|
||||||
page: {
|
page: {
|
||||||
@@ -98,6 +261,7 @@ class Web {
|
|||||||
titlesuffix: 'New Build',
|
titlesuffix: 'New Build',
|
||||||
description: 'Kick off a build',
|
description: 'Kick off a build',
|
||||||
},
|
},
|
||||||
|
user: req?.user,
|
||||||
query
|
query
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -108,32 +272,15 @@ class Web {
|
|||||||
req.body.commit || null,
|
req.body.commit || null,
|
||||||
req.body.patch || null,
|
req.body.patch || null,
|
||||||
req.body.distro || 'arch',
|
req.body.distro || 'arch',
|
||||||
req.body.dependencies || 'stable'
|
req.body.dependencies || 'stable',
|
||||||
|
req?.user?.['id'],
|
||||||
|
crypto.randomUUID()
|
||||||
);
|
);
|
||||||
res.redirect(`/build/${sqids.encode([buildId])}`);
|
res.redirect(`/build/${sqids.encode([buildId])}/`);
|
||||||
this.buildController.triggerBuild();
|
this.buildController.triggerBuild();
|
||||||
});
|
});
|
||||||
|
|
||||||
app.get('/build/:id{/}', async (req, res) => {
|
createBuildPages('build', (id) => this.db.getBuild(sqids.decode(id)?.[0]));
|
||||||
const build = await this.db.getBuild(sqids.decode(req.params.id)?.[0]);
|
|
||||||
if (!build) {
|
|
||||||
res.sendStatus(404);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
build.sqid = sqids.encode([build.id]);
|
|
||||||
const log = splitLines(await this.db.getLog(build.id));
|
|
||||||
|
|
||||||
res.render('build', {
|
|
||||||
page: {
|
|
||||||
title: 'Archery',
|
|
||||||
titlesuffix: `Build #${build.id}`,
|
|
||||||
description: `Building ${build.repo} on ${build.distro}`
|
|
||||||
},
|
|
||||||
build,
|
|
||||||
log,
|
|
||||||
ended: build.status !== 'queued' && build.status !== 'running'
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
app.get('/build/:id/cancel', async (req, res) => {
|
app.get('/build/:id/cancel', async (req, res) => {
|
||||||
const build = await this.db.getBuild(sqids.decode(req.params.id)?.[0]);
|
const build = await this.db.getBuild(sqids.decode(req.params.id)?.[0]);
|
||||||
@@ -147,47 +294,10 @@ class Web {
|
|||||||
catch (ex) {
|
catch (ex) {
|
||||||
console.error(ex);
|
console.error(ex);
|
||||||
}
|
}
|
||||||
res.redirect(`/build/${req.params.id}`);
|
res.redirect(`/build/${req.params.id}/`);
|
||||||
});
|
|
||||||
|
|
||||||
app.get('/build/:id/logs{/}', async (req, res) => {
|
|
||||||
const build = await this.db.getBuild(sqids.decode(req.params.id)?.[0]);
|
|
||||||
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/:id/patch{/}', async (req, res) => {
|
|
||||||
const build = await this.db.getBuild(sqids.decode(req.params.id)?.[0]);
|
|
||||||
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/:id/ws', (ws, req) => {
|
|
||||||
console.log('WS Opened');
|
|
||||||
const eventListener = (be: BuildEvent) => {
|
|
||||||
if (be.id === sqids.decode(req.params.id)?.[0]) {
|
|
||||||
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 = () => {
|
close = () => {
|
||||||
@@ -198,9 +308,35 @@ class Web {
|
|||||||
|
|
||||||
setDB = (db: DB) => {
|
setDB = (db: DB) => {
|
||||||
this.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`
|
||||||
|
}, async (_: string, profile: passport.Profile, cb: OpenIDConnectStrategy.VerifyCallback) => {
|
||||||
|
const userObj: User = {
|
||||||
|
id: profile.id,
|
||||||
|
username: profile.username,
|
||||||
|
displayName: profile.displayName
|
||||||
|
};
|
||||||
|
const user = await this.db.getUser(profile.id);
|
||||||
|
if (!user) {
|
||||||
|
await this.db.createUser(userObj);
|
||||||
|
}
|
||||||
|
return cb(null, userObj);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
setBuildController = (buildController: BuildController) => {
|
setBuildController = (buildController: BuildController) => {
|
||||||
@@ -209,5 +345,5 @@ class Web {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default Web;
|
export default Web;
|
||||||
export { Web };
|
export { Web, notStupidParseInt };
|
||||||
export type { WebConfig };
|
export type { WebConfig };
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ interface compositeConfig {
|
|||||||
db?: DBConfig
|
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 web = new Web(config.web);
|
||||||
const buildController = new BuildController();
|
const buildController = new BuildController();
|
||||||
@@ -19,6 +19,7 @@ await new Promise((resolve) => setTimeout(resolve, 1500));
|
|||||||
const db = new DB(config.db);
|
const db = new DB(config.db);
|
||||||
web.setDB(db);
|
web.setDB(db);
|
||||||
web.setBuildController(buildController);
|
web.setBuildController(buildController);
|
||||||
|
web.initialize();
|
||||||
buildController.setDB(db);
|
buildController.setDB(db);
|
||||||
|
|
||||||
process.on('SIGTERM', () => {
|
process.on('SIGTERM', () => {
|
||||||
|
|||||||
@@ -118,6 +118,15 @@ input[type="submit"] {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
span,
|
||||||
|
a {
|
||||||
|
|
||||||
|
&:has(+ button.copybtn) {
|
||||||
|
float: left;
|
||||||
|
margin-right: .75em;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.sidebar {
|
.sidebar {
|
||||||
background: var(--primary);
|
background: var(--primary);
|
||||||
@@ -190,6 +199,10 @@ input[type="submit"] {
|
|||||||
&.no-padding {
|
&.no-padding {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&:has(+ .content.footer) {
|
||||||
|
padding-bottom: 3em;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.overflow-x {
|
.overflow-x {
|
||||||
@@ -231,9 +244,13 @@ input[type="submit"] {
|
|||||||
.content.footer {
|
.content.footer {
|
||||||
background: var(--primary-dark);
|
background: var(--primary-dark);
|
||||||
color: var(--color-text);
|
color: var(--color-text);
|
||||||
margin-top: .5em;
|
|
||||||
padding: .25em 1em;
|
padding: .25em 1em;
|
||||||
|
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
|
||||||
a {
|
a {
|
||||||
color: var(--color-text);
|
color: var(--color-text);
|
||||||
text-decoration: underline;
|
text-decoration: underline;
|
||||||
|
|||||||
@@ -12,23 +12,31 @@
|
|||||||
<h2 id="buildStatus"><%= build.status %></h2>
|
<h2 id="buildStatus"><%= build.status %></h2>
|
||||||
<div class="overflow-x">
|
<div class="overflow-x">
|
||||||
<div class="grid-2col">
|
<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>Commit</label> <span><% if (build.commit) { %><%= build.commit %><% } else { %>latest<% } %></span>
|
||||||
<label>Patch</label> <span><% if (build.patch) { %><a href="/build/<%= build.sqid %>/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>Distro</label> <span><%= build.distro %></span>
|
||||||
<label>Dependencies</label> <span><%= build.dependencies %></span>
|
<label>Dependencies</label> <span><%= build.dependencies %></span>
|
||||||
<label>Start time</label> <span class="to-local-time"><%= build.startTime %></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>
|
||||||
</div>
|
</div>
|
||||||
|
<% if (build.sqid && !public) { %>
|
||||||
<div>
|
<div>
|
||||||
<a href="/build?id=<%= build.sqid %>" class="button">Clone</a>
|
<a href="/build?id=<%= build.sqid %>" class="button">Clone</a>
|
||||||
</div>
|
</div>
|
||||||
|
<% } %>
|
||||||
<% if (!ended) { %>
|
<% if (!ended) { %>
|
||||||
<div id="cancelRow">
|
<div id="cancelRow">
|
||||||
<a href="/build/<%= build.sqid %>/cancel" class="button">Cancel build</a>
|
<a href="cancel" class="button">Cancel build</a>
|
||||||
</div>
|
</div>
|
||||||
<% } %>
|
<% } %>
|
||||||
<p><a href="/build/<%= build.sqid %>/logs">Full logs</a></p>
|
<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>
|
<pre class="overflow-x"><div class="logs" id="logs"><% (log || []).forEach(line => { %><p><%= line %></p><% }) %></div></pre>
|
||||||
|
|
||||||
<% if (!ended) { %>
|
<% if (!ended) { %>
|
||||||
@@ -39,6 +47,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<%- include("footer", locals) %>
|
<%- include("footer", locals) %>
|
||||||
<script src="/assets/js/timezone.js?v1" nonce="<%= cspNonce %>"></script>
|
<script src="/assets/js/timezone.js?v1" nonce="<%= cspNonce %>"></script>
|
||||||
|
<script src="/assets/js/copy.js?v1" nonce="<%= cspNonce %>"></script>
|
||||||
<% if (!ended) { %>
|
<% if (!ended) { %>
|
||||||
<script src="/assets/js/build.js?v3" nonce="<%= cspNonce %>"></script>
|
<script src="/assets/js/build.js?v3" nonce="<%= cspNonce %>"></script>
|
||||||
<% } %>
|
<% } %>
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<link rel="canonical" href="<%= page.canonical%>"/>
|
<link rel="canonical" href="<%= page.canonical%>"/>
|
||||||
<% } %>
|
<% } %>
|
||||||
<link rel="shortcut icon" href="/assets/svg/favicon.svg">
|
<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 %>">
|
<script nonce="<%= cspNonce %>">
|
||||||
document.addEventListener("DOMContentLoaded", function() {
|
document.addEventListener("DOMContentLoaded", function() {
|
||||||
document.body.classList.remove('preload');
|
document.body.classList.remove('preload');
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<% builds.forEach(build => { %>
|
<% builds.forEach(build => { %>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a href="/build/<%= build.sqid %>"><%= build.repo %></a></td>
|
<td><a href="/build/<%= build.sqid %>/"><%= build.repo %></a></td>
|
||||||
<td><%= build.distro %></td>
|
<td><%= build.distro %></td>
|
||||||
<td class="to-local-time"><%= build.startTime %></td>
|
<td class="to-local-time"><%= build.startTime %></td>
|
||||||
<td><%= timeElapsed(build.startTime, build.endTime) %></td>
|
<td><%= timeElapsed(build.startTime, build.endTime) %></td>
|
||||||
|
|||||||
19
views/login-required.ejs
Normal file
19
views/login-required.ejs
Normal file
@@ -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>
|
||||||
@@ -14,6 +14,9 @@
|
|||||||
<li><a href="/?distro=arch">Arch Builds</a></li>
|
<li><a href="/?distro=arch">Arch Builds</a></li>
|
||||||
<li><a href="/?distro=artix">Artix Builds</a></li>
|
<li><a href="/?distro=artix">Artix Builds</a></li>
|
||||||
<li><a href="/build">New Build</a></li>
|
<li><a href="/build">New Build</a></li>
|
||||||
|
<% if (locals.user) { %>
|
||||||
|
<li><a href="/logout">Log Out</a></li>
|
||||||
|
<% } %>
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
Reference in New Issue
Block a user