From 92fd491194a8041ede77d1393e81f291fa8d4918 Mon Sep 17 00:00:00 2001 From: leca Date: Wed, 30 Apr 2025 18:03:56 +0300 Subject: [PATCH] relay requesting (and maybe verifying) to the user --- migrate.sh | 0 migrations/1745668334604_proxies.js | 2 +- migrations/1745958234333_users.js | 46 ++ package-lock.json | 667 +++++++++++++++++++++++++++- package.json | 3 + public/js/index.js | 78 +++- public/js/login.js | 48 ++ sample.env | 4 +- src/config.js | 4 +- src/controllers/captcha.js | 61 +-- src/controllers/proxy.js | 31 -- src/controllers/user.js | 39 ++ src/index.js | 4 + src/middlewares/auth.js | 20 + src/routers/captcha.js | 5 +- src/routers/frontend.js | 4 + src/routers/proxy.js | 11 - src/routers/user.js | 11 + src/services/captcha.js | 74 +-- src/services/proxy.js | 42 -- src/services/user.js | 13 + views/login.pug | 23 + 22 files changed, 968 insertions(+), 222 deletions(-) mode change 100644 => 100755 migrate.sh create mode 100644 migrations/1745958234333_users.js create mode 100644 public/js/login.js delete mode 100644 src/controllers/proxy.js create mode 100644 src/controllers/user.js create mode 100644 src/middlewares/auth.js delete mode 100644 src/routers/proxy.js create mode 100644 src/routers/user.js delete mode 100644 src/services/proxy.js create mode 100644 src/services/user.js create mode 100644 views/login.pug diff --git a/migrate.sh b/migrate.sh old mode 100644 new mode 100755 diff --git a/migrations/1745668334604_proxies.js b/migrations/1745668334604_proxies.js index 1cd01ea..f77f156 100644 --- a/migrations/1745668334604_proxies.js +++ b/migrations/1745668334604_proxies.js @@ -18,7 +18,7 @@ export function up(pgm) { password: {type: 'varchar(32)'} }); - pgm.addColumn('captchas', {proxy_id: {type: 'integer', references: 'proxies(id)'}}) + pgm.addColumn('captchas', {proxy_id: {type: 'integer', references: 'proxies(id)'}}); } /** diff --git a/migrations/1745958234333_users.js b/migrations/1745958234333_users.js new file mode 100644 index 0000000..39f33c9 --- /dev/null +++ b/migrations/1745958234333_users.js @@ -0,0 +1,46 @@ +export const shorthands = undefined; + +/** + * @param pgm {import('node-pg-migrate').MigrationBuilder} + * @param run {() => void | undefined} + * @returns {Promise | void} + */ +export function up(pgm) { + pgm.createTable('users', { + id: 'id', + username: {type:"varchar(32)", notNull: true}, + password: {type:"char(60)", notNull: true} + }) + + pgm.addColumn('captchas', { + submitter: {type: 'integer', references: 'users(id)'} + }); + + pgm.dropType('protocol_type', {cascade: true}); + pgm.dropTable('proxies', {cascade: true}); + pgm.dropColumn('captchas', 'proxy_id', {cascade: true}); +} + +/** + * @param pgm {import('node-pg-migrate').MigrationBuilder} + * @param run {() => void | undefined} + * @returns {Promise | void} + */ +export function down(pgm) { + pgm.dropTable('users'); + pgm.dropColumn('captchas', 'submitter'); + + pgm.createType('protocol_type', ['http', 'https']); + + pgm.createTable('proxies', { + id: 'id', + proto: {type: 'protocol_type', notNull: true}, + claimed: {type: 'boolean', default: false}, + host: {type: 'inet', notNull: true}, + port: {type: 'smallint', notNull: true}, + username: {type: 'varchar(16)'}, + password: {type: 'varchar(32)'} + }); + + pgm.addColumn('captchas', {proxy_id: {type: 'integer', references: 'proxies(id)'}}); +} diff --git a/package-lock.json b/package-lock.json index b9e626b..591150a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,11 @@ "version": "1.0.0", "license": "GPL-3.0-or-later", "dependencies": { + "bcrypt": "^5.1.1", + "cookie-parser": "^1.4.7", "dotenv": "^16.5.0", "express": "^5.1.0", + "jsonwebtoken": "^9.0.2", "pg": "^8.15.5", "pug": "^3.0.3", "undici": "^7.8.0" @@ -84,6 +87,32 @@ "node": ">=12" } }, + "node_modules/@mapbox/node-pre-gyp": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz", + "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==", + "license": "BSD-3-Clause", + "dependencies": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "bin": { + "node-pre-gyp": "bin/node-pre-gyp" + } + }, + "node_modules/abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "license": "ISC" + }, "node_modules/accepts": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/accepts/-/accepts-2.0.0.tgz", @@ -109,6 +138,18 @@ "node": ">=0.4.0" } }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/ansi-regex": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", @@ -149,6 +190,26 @@ "node": ">= 8" } }, + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", + "license": "ISC" + }, + "node_modules/are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/asap": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", @@ -177,9 +238,22 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, "license": "MIT" }, + "node_modules/bcrypt": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.1.tgz", + "integrity": "sha512-AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@mapbox/node-pre-gyp": "^1.0.11", + "node-addon-api": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } + }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -217,7 +291,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -237,6 +310,12 @@ "node": ">=8" } }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", + "license": "BSD-3-Clause" + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -309,6 +388,15 @@ "fsevents": "~2.3.2" } }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/cliui": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", @@ -423,13 +511,27 @@ "dev": true, "license": "MIT" }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "license": "ISC", + "bin": { + "color-support": "bin.js" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, "license": "MIT" }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==", + "license": "ISC" + }, "node_modules/constantinople": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz", @@ -470,6 +572,25 @@ "node": ">= 0.6" } }, + "node_modules/cookie-parser": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.7.tgz", + "integrity": "sha512-nGUvgXnotP3BsjiLX2ypbQnWoGUPIIfHQNZkkC668ntrzGWEZVW70HDEB1qnNGMicPje6EttlIgzo51YSwNQGw==", + "license": "MIT", + "dependencies": { + "cookie": "0.7.2", + "cookie-signature": "1.0.6" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/cookie-parser/node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "license": "MIT" + }, "node_modules/cookie-signature": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz", @@ -511,6 +632,12 @@ } } }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", + "license": "MIT" + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -520,6 +647,15 @@ "node": ">= 0.8" } }, + "node_modules/detect-libc": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", + "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", + "license": "Apache-2.0", + "engines": { + "node": ">=8" + } + }, "node_modules/doctypes": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz", @@ -559,6 +695,15 @@ "dev": true, "license": "MIT" }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "license": "Apache-2.0", + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -743,6 +888,36 @@ "node": ">= 0.8" } }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "license": "ISC", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "license": "ISC" + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -767,6 +942,74 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/gauge/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/gauge/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/gauge/node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "license": "ISC" + }, + "node_modules/gauge/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/gauge/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -926,6 +1169,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==", + "license": "ISC" + }, "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", @@ -954,6 +1203,19 @@ "node": ">= 0.8" } }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/iconv-lite": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", @@ -973,6 +1235,17 @@ "dev": true, "license": "ISC" }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -1040,7 +1313,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -1122,6 +1394,28 @@ "integrity": "sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==", "license": "MIT" }, + "node_modules/jsonwebtoken": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "license": "MIT", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12", + "npm": ">=6" + } + }, "node_modules/jstransformer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz", @@ -1132,6 +1426,69 @@ "promise": "^7.0.1" } }, + "node_modules/jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "license": "MIT", + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "license": "MIT", + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", + "license": "MIT" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", + "license": "MIT" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", + "license": "MIT" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", + "license": "MIT" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", + "license": "MIT" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", + "license": "MIT" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", + "license": "MIT" + }, "node_modules/lru-cache": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz", @@ -1142,6 +1499,30 @@ "node": "20 || >=22" } }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "license": "MIT", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -1197,7 +1578,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" @@ -1216,6 +1596,43 @@ "node": ">=16 || 14 >=14.17" } }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "license": "MIT", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "license": "MIT", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -1231,6 +1648,32 @@ "node": ">= 0.6" } }, + "node_modules/node-addon-api": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz", + "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==", + "license": "MIT" + }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/node-pg-migrate": { "version": "7.9.1", "resolved": "https://registry.npmjs.org/node-pg-migrate/-/node-pg-migrate-7.9.1.tgz", @@ -1288,6 +1731,21 @@ "url": "https://opencollective.com/nodemon" } }, + "node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "license": "ISC", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -1298,6 +1756,19 @@ "node": ">=0.10.0" } }, + "node_modules/npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "deprecated": "This package is no longer supported.", + "license": "ISC", + "dependencies": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -1356,6 +1827,15 @@ "node": ">= 0.8" } }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -1731,6 +2211,20 @@ "node": ">= 0.8" } }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -1774,6 +2268,43 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/router": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", @@ -1826,7 +2357,6 @@ "version": "7.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "dev": true, "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -1872,6 +2402,12 @@ "node": ">= 18" } }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "license": "ISC" + }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -2017,6 +2553,15 @@ "node": ">= 0.8" } }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, "node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", @@ -2146,6 +2691,32 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/tar": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", + "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", + "license": "ISC", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", + "engines": { + "node": ">=8" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -2184,6 +2755,12 @@ "nodetouch": "bin/nodetouch.js" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" + }, "node_modules/type-is": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", @@ -2223,6 +2800,12 @@ "node": ">= 0.8" } }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" + }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -2241,6 +2824,22 @@ "node": ">=0.10.0" } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -2257,6 +2856,56 @@ "node": ">= 8" } }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "license": "ISC", + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, + "node_modules/wide-align/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/wide-align/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/wide-align/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wide-align/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/with": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/with/-/with-7.0.2.tgz", @@ -2395,6 +3044,12 @@ "node": ">=10" } }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "license": "ISC" + }, "node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", diff --git a/package.json b/package.json index b2e5bed..8902407 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,11 @@ "migrate": "bash migrate.sh" }, "dependencies": { + "bcrypt": "^5.1.1", + "cookie-parser": "^1.4.7", "dotenv": "^16.5.0", "express": "^5.1.0", + "jsonwebtoken": "^9.0.2", "pg": "^8.15.5", "pug": "^3.0.3", "undici": "^7.8.0" diff --git a/public/js/index.js b/public/js/index.js index 678262e..a8720b9 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,25 +1,73 @@ -window.onload = async () => { - let id = (await (await fetch("/api/captcha", {method: "POST"})).json()).id - if (id == undefined) { - alert("Service is unavailable now. Please, try again later."); - return; +const check_solution = async (solution) => { + const body = { + "TotalSum": "78278", + "FnNumber": "9960440301173139", + "ReceiptOperationType": "1", + "DocNumber": "35704", + "DocFiscalSign": "4149689833", + "Captcha": solution, + "DocDateTime": "2022-09-21T20:28:00.000Z" } - console.log(id); - fetch(`/api/captcha/${id}`).then(response => response.blob()) - .then(blob => { - const url = URL.createObjectURL(blob); - document.getElementById("captcha_image").src = url; - } - ); + const result = await fetch("https://check.ofd.ru/Document/FetchReceiptFromFns", { + method: "POST", + headers: { + "Content-Type": "application/json;charset=utf-8", + // "Origin": "https://check.ofd.ru" + }, + body: JSON.stringify(body), + }); + return result.status != 400; +} + + +const get_cookie = (name) => { + const cookies = document.cookie.split(';'); + for (let i = 0; i < cookies.length; i++) { + const cookie = cookies[i].trim(); + if (cookie.startsWith(name + '=')) { + const value = cookie.substring(name.length + 1); + console.log(value); + } + } +} + +const blobToBase64 = (blob) => { + return new Promise((resolve, _) => { + const reader = new FileReader(); + reader.onloadend = () => resolve(reader.result); + reader.readAsDataURL(blob); + }); + } + +window.onload = async () => { + console.log("koka: " + get_cookie("JWT")); + console.log("all: " + document.cookie); + if (!document.cookie.includes('JWT')) { + document.location.href = "/login"; + } + + const response = await fetch("https://check.ofd.ru/api/captcha/common/img"); + captcha = await response.blob(); + + const url = URL.createObjectURL(captcha); + document.getElementById("captcha_image").src = url; + console.log(captcha.type) const form = document.getElementById("captchaForm"); const inputField = document.getElementById("captcha"); form.addEventListener('submit', async (e) => { e.preventDefault(); + // if (!await check_solution(inputField.value)) { + // alert("Капча решена неверно") + // returnl + // } - const response = await fetch(`/api/captcha/${id}`, {method: "PATCH",headers: {'Content-Type': 'application/json'}, body: JSON.stringify({"solution": inputField.value})}); + const response = await fetch(`/api/captcha/submit`, {method: "POST", headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ "image": await blobToBase64(captcha), "solution": inputField.value})}); if (response.status == 200) { inputField.value = ""; window.location.reload(); - }; - }) + } else { + response_json = await response.json() + alert(response_json.message) + } + }); }; \ No newline at end of file diff --git a/public/js/login.js b/public/js/login.js new file mode 100644 index 0000000..36d943f --- /dev/null +++ b/public/js/login.js @@ -0,0 +1,48 @@ +const set_cookie = (name, value, days) => { + const expires = new Date(Date.now() + days * 86400 * 1000).toUTCString(); + document.cookie = `${name}=${value}; expires=${expires}; path=/;`; + } + +window.onload = async () => { + alert("This service requests a captcha from https://ofd.ru and sends an example receipt to it to check the correctness of the captcha. If you are not okay with making such requests, please leave the site immediately"); + + if (document.cookie.includes('JWT')) { + document.location = '/'; + } + + const form = document.getElementById("loginForm"); + const username = document.getElementById("username"); + const password = document.getElementById("password"); + form.addEventListener('submit', async (e) => { + e.preventDefault(); + const response = await fetch( + `/api/user/login`, { + method: "POST", + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + "username": username.value, + "password": password.value + }) + }); + switch (response.status) { + case 403: + alert("Incorrect password"); + password.value = ""; + break; + case 200: + response_json = await response.json() + set_cookie("JWT", response_json["token"], 365); + window.location.href = '/'; + break; + case 404: + alert("No such user exists"); + username.value = ""; + break; + default: + alert("Unknown server error. Please, conact the developer"); + console.log(response); + } + }); +}; diff --git a/sample.env b/sample.env index 0d68ad8..750c1f2 100644 --- a/sample.env +++ b/sample.env @@ -8,4 +8,6 @@ DBPASS=GENERATE_A_STRONG_PASSWORD_HERE #General APP_PORT=3000 CAPTCHA_SOURCE_URL=https://example.com -DATA_DIR=/opt/captcha_aggregator \ No newline at end of file +DATA_DIR=/opt/captcha_aggregator +ADMIN_TOKEN=GENERATE_A_STRONG_TOKEN_HERE +SECRET=GENERATE_A_STRONG_SECRET_HERE \ No newline at end of file diff --git a/src/config.js b/src/config.js index d801f11..a33004b 100644 --- a/src/config.js +++ b/src/config.js @@ -14,7 +14,9 @@ const config = { app_port: Number.parseInt(process.env.APP_PORT), captcha_source_url: process.env.CAPTCHA_SOURCE_URL, - data_dir: process.env.DATA_DIR + data_dir: process.env.DATA_DIR, + admin_token: process.env.ADMIN_TOKEN, + secret: process.env.SECRET } export default config; \ No newline at end of file diff --git a/src/controllers/captcha.js b/src/controllers/captcha.js index f4edb60..b1741b7 100644 --- a/src/controllers/captcha.js +++ b/src/controllers/captcha.js @@ -1,61 +1,18 @@ import CaptchaService from "../services/captcha.js"; -import ProxyService from "../services/proxy.js"; -import config from '../config.js'; -import fs from 'fs/promises'; +import jwt from 'jsonwebtoken'; class CaptchaController { - async new(req, res) { + async submit(req, res) { + const {image, solution} = req.body; + if (!image) return res.status(400).send({"message":"You must send image blob"}); + if (!solution || solution.length != 6) return res.status(400).send({"message":"You must send a valid solution"}); try { - const proxy = await ProxyService.take(); - console.log("Using proxy: " + JSON.stringify(proxy)); - if (proxy == undefined) { - return res.status(503).send({"message":"No active proxy. please, try again later"}); - } - const id = await CaptchaService.new(proxy); - - return res.status(200).send({"id": id}); - } catch (e) { - console.log(e); - return res.status(500).send({"message": "Unknown server error"}); - } - } - - async get(req, res) { - try { - const id = req.params.id; - if (id == undefined || parseInt(id) == NaN) { - return res.status(404).send({"message": "captcha not found"}); - } - - const hash = await CaptchaService.get(id); - - const image = await fs.readFile(`${config.data_dir}/${hash}.jpeg`); - - return res.status(200).send(image) + await CaptchaService.new(image, solution, jwt.decode(req.token).id); } catch (e) { - console.log(e) - return res.status(500).send({"message": "Unknown server error"}); - } - } - - async solve (req, res) { - try { - const id = req.params.id; - const solution = req.body["solution"]; - if (solution == undefined || solution.length != 6) { - return res.status(400).send({"message": 'please, send a valid solution. Example: {"solution":"123456"}'}); - } - let proxy = await CaptchaService.get_assigned_proxy(id); - if (!await CaptchaService.check_and_save_solution(id, solution, proxy)) - return res.status(409).send({"message": "Solution is not correct"}); - - - await ProxyService.give_back(proxy.id); - return res.status(200).send({"message": "Successful"}); - } catch (e) { - console.log(e) - return res.status(500).send({"message": "Unknown server error"}); + console.log(`Error upon submitting: ${e}`); + return res.status(500).send({"message": "Unknown server error. Please, contact the developer."}); } + return res.status(200).send({"message": "Success"}); } } diff --git a/src/controllers/proxy.js b/src/controllers/proxy.js deleted file mode 100644 index 98535fd..0000000 --- a/src/controllers/proxy.js +++ /dev/null @@ -1,31 +0,0 @@ -import ProxyService from '../services/proxy.js'; - -class CaptchaController { - async add(req, res) { - try { - const { proto, host, port, username, password } = req.body; - if (!proto || !host || !port) return res.status(400).send({"message":"You must specify proto, host and port!"}); - - const id = await ProxyService.add(proto, host, port, username, password); - - return res.status(200).send({"id": id}); - } catch (e) { - console.log(e) - return res.status(500).send({"message": "Unknown server error"}); - } - } - - async delete (req, res) { - try { - const id = req.params.id; - await ProxyService.delete(id) - return res.status(200).send({"message": "Successful"}); - } catch (e) { - console.log(e) - return res.status(500).send({"message": "Unknown server error"}); - } - - } -} - -export default new CaptchaController(); \ No newline at end of file diff --git a/src/controllers/user.js b/src/controllers/user.js new file mode 100644 index 0000000..0c7a434 --- /dev/null +++ b/src/controllers/user.js @@ -0,0 +1,39 @@ +import UserService from '../services/user.js'; +import jwt from 'jsonwebtoken'; +import bcrypt from 'bcrypt'; +import config from '../config.js'; + +class UserController { + async register(req, res) { + try { + const { username, password } = req.body; + if (!username) return res.status(400).send({"message":"You must specify username"}); + if (!password) return res.status(400).send({"message":"You must specify password"}); + if (await UserService.get_by_username(username)) return res.status(409).send({"message":"Such user already exists!"}) + const id = await UserService.add(username, bcrypt.hashSync(password, 10)); + const token = jwt.sign({"username": username, "id": id}, config.secret); + return res.status(200).send({"messae": "Success", "token": token}); + } catch (e) { + console.log(e) + return res.status(500).send({"message": "Unknown server error. Please, contact the developer"}); + } + } + + async login (req, res) { + try { + const { username, password } = req.body; + const user = await UserService.get_by_username(username); + if (!user) return res.status(404).send({"message":"No such user exists"}); + const hashed_password = user.password; + if (!bcrypt.compareSync(password, hashed_password)) return res.status(403).send({"message":"Passwords dont match"}); + const token = jwt.sign({"username": username, "id": user.id}, config.secret); + return res.status(200).send({"message": "Success", "token": token}); + } catch (e) { + console.log(e) + return res.status(500).send({"message": "Unknown server error"}); + } + + } +} + +export default new UserController(); \ No newline at end of file diff --git a/src/index.js b/src/index.js index 3959764..d648984 100644 --- a/src/index.js +++ b/src/index.js @@ -1,20 +1,24 @@ import express from 'express'; import path from 'path'; +import cookieParser from 'cookie-parser'; import CaptchaRouter from './routers/captcha.js'; import FrontendRouter from './routers/frontend.js'; import config from './config.js'; +import UserRouter from './routers/user.js'; const app = express(); app.use(express.static(path.join('./public'))); app.use(express.urlencoded({ extended: false })); app.use(express.json()); +app.use(cookieParser()); app.set('view engine', 'pug'); app.use('/api', CaptchaRouter); +app.use('/api', UserRouter); app.use('/', FrontendRouter); const server = app.listen(config.app_port, () => { diff --git a/src/middlewares/auth.js b/src/middlewares/auth.js new file mode 100644 index 0000000..4e7d32c --- /dev/null +++ b/src/middlewares/auth.js @@ -0,0 +1,20 @@ +import jwt from 'jsonwebtoken'; +import config from '../config.js'; + +const verify_admin_token = async (req, res, next) => { + const header = req.headers['authorization']; + if (!header) return res.status(400).send({"message": "No admin token supplied"}); + if (config.admin_token != header.split(' ')[1]) return res.status(403).send({"message":"Admin token is incorrect"}); + next(); +} + +const verify_user_jwt = async (req, res, next) => { + const header = req.headers['authorization']; + let token = req.cookies.JWT? req.cookies.JWT : (header? header.split(' ')[1] : undefined) + if (!token) return res.status(400).send({"message": "No authorization token supplied"}); + req.token = token; + if (!jwt.verify(req.token, config.secret)) return res.status(403).send({"message":"Could not verify authorization token"}); + next(); +} + +export default {verify_admin_token, verify_user_jwt}; \ No newline at end of file diff --git a/src/routers/captcha.js b/src/routers/captcha.js index 4c5a6f5..5579e34 100644 --- a/src/routers/captcha.js +++ b/src/routers/captcha.js @@ -1,11 +1,10 @@ import { Router } from 'express'; import CaptchaController from '../controllers/captcha.js'; +import auth from '../middlewares/auth.js'; const CaptchaRouter = new Router(); -CaptchaRouter.post('/captcha', CaptchaController.new); -CaptchaRouter.get('/captcha/:id', CaptchaController.get); -CaptchaRouter.patch('/captcha/:id', CaptchaController.solve); +CaptchaRouter.post('/captcha/submit', auth.verify_user_jwt, CaptchaController.submit); export default CaptchaRouter; \ No newline at end of file diff --git a/src/routers/frontend.js b/src/routers/frontend.js index 881c3d7..c5761ae 100644 --- a/src/routers/frontend.js +++ b/src/routers/frontend.js @@ -6,4 +6,8 @@ FrontendRouter.get('/', async (req, res) => { return res.render("index.pug"); }); +FrontendRouter.get('/login', async (req, res) => { + return res.render("login.pug"); +}); + export default FrontendRouter; diff --git a/src/routers/proxy.js b/src/routers/proxy.js deleted file mode 100644 index 5b9057e..0000000 --- a/src/routers/proxy.js +++ /dev/null @@ -1,11 +0,0 @@ -import { Router } from 'express'; - -import ProxyController from '../controllers/proxy.js'; - -const ProxyRouter = new Router(); - -ProxyRouter.post('/proxy', ProxyController.add); -ProxyRouter.get('/proxy/:id', ProxyController.get); -ProxyRouter.patch('/captcha/:id', ProxyController.solve); - -export default ProxyRouter; \ No newline at end of file diff --git a/src/routers/user.js b/src/routers/user.js new file mode 100644 index 0000000..6e614f8 --- /dev/null +++ b/src/routers/user.js @@ -0,0 +1,11 @@ +import { Router } from 'express'; + +import UserController from '../controllers/user.js'; +import auth from '../middlewares/auth.js'; + +const UserRouter = new Router(); + +UserRouter.post('/user/register', auth.verify_admin_token, UserController.register); +UserRouter.post('/user/login', UserController.login); + +export default UserRouter; \ No newline at end of file diff --git a/src/services/captcha.js b/src/services/captcha.js index d28318e..17baa74 100644 --- a/src/services/captcha.js +++ b/src/services/captcha.js @@ -1,69 +1,25 @@ import db from '../db.js'; import fs from 'fs/promises'; -import { ProxyAgent } from 'undici'; import config from '../config.js'; import { createHash } from 'crypto'; +function base64ToArrayBuffer(base64) { + var binaryString = atob(base64); + var bytes = new Uint8Array(binaryString.length); + for (var i = 0; i < binaryString.length; i++) { + bytes[i] = binaryString.charCodeAt(i); + } + return bytes.buffer; +} class CaptchaService { - async new(proxy) { - try { - let dispatcher = new ProxyAgent(`${proxy.proto}://${proxy.username? proxy.username + "@" + proxy.password + ":" : ""}${proxy.host}:${proxy.port}`); - - const captcha = await (await fetch(config.captcha_source_url, {dispatcher})).blob(); - const buffer = Buffer.from(await captcha.arrayBuffer()); - const hash = createHash('md5').update(buffer).digest('hex'); - await fs.writeFile(`${config.data_dir}/${hash}.jpeg`, buffer); - - const id = (await db.query("INSERT INTO captchas (hash, proxy_id) VALUES ($1, $2) RETURNING id", [hash, proxy.id])).rows[0].id; - - return id - } catch(e) { - console.log(e); - } - } - - async check_solution(solution, proxy) { - let dispatcher = new ProxyAgent(`${proxy.proto}://${proxy.username? proxy.username + "@" + proxy.password + ":" : ""}${proxy.host}:${proxy.port}`); - const body = { - "TotalSum": "78278", - "FnNumber": "9960440301173139", - "ReceiptOperationType": "1", - "DocNumber": "35704", - "DocFiscalSign": "4149689833", - "Captcha": solution, - "DocDateTime": "2022-09-21T20:28:00.000Z" - } - const result = await fetch("https://check.ofd.ru/Document/FetchReceiptFromFns", { - "headers": { - "Content-Type": "application/json;charset=utf-8" - }, - dispatcher, - "body": JSON.stringify(body), - "method": "POST", - }); - return result.status != 400; - } - - async get (id) { - let result = await db.query("SELECT hash FROM captchas WHERE id = $1", [id]) - if (result.rows[0] == undefined) { - return undefined; - } - return result.rows[0].hash; - } - - async check_and_save_solution (id, solution, proxy) { - if (!await this.check_solution(solution, proxy)) { - return false; - } - - await db.query("UPDATE captchas SET solution = $1 WHERE id = $2", [solution, id]); - return true; - } - - async get_assigned_proxy(id) { - return (await db.query("select proxies.id, proto, host, port, username, password from proxies JOIN captchas on proxy_id = proxies.id WHERE captchas.id = $1", [id])).rows[0]; + async new(image, solution, submitter) { + const b64 = image.replace(/^data:image\/jpeg;base64,/, ""); + const arrayBuffer = base64ToArrayBuffer(b64); + const buffer = Buffer.from(arrayBuffer); + const hash = createHash('md5').update(buffer).digest('hex'); + await fs.writeFile(`${config.data_dir}/${hash}.jpeg`, b64, 'base64'); + await db.query("INSERT INTO captchas (hash, solution, submitter) VALUES ($1, $2, $3)", [hash, solution, submitter]); } } diff --git a/src/services/proxy.js b/src/services/proxy.js deleted file mode 100644 index 0e4a63a..0000000 --- a/src/services/proxy.js +++ /dev/null @@ -1,42 +0,0 @@ -import db from '../db.js'; -import { ProxyAgent } from 'undici'; - -class ProxyService { - async add(proto, host, port, username, password) { - await db.query("INSERT INTO proxies (proto, host, port, username, password) VALUES ($1, $2, $3, $4, $5)", [proto, host, port, username, password]); - } - - async take() { - // while (true) { - let proxy = (await db.query("UPDATE proxies SET claimed = TRUE WHERE id = ( SELECT id FROM proxies WHERE claimed = FALSE ORDER BY id LIMIT 1 ) RETURNING id, proto, host, port, username, password")).rows[0] - return proxy == undefined? undefined : proxy; - - // console.log("testing proxy") - // if (await this.check_connection(proxy)) return proxy; - // else await this.delete(proxy.id) - // console.log("Proxy failed and deleted") - // } - } - - // async check_connection(proxy) { - // const dispatcher = new ProxyAgent(`${proxy.proto}://${proxy.username? proxy.username + "@" + proxy.password + ":" : ""}${proxy.host}:${proxy.port}`); - // let response; - // try { - // response = await fetch("https://google.com", {dispatcher}) - // } catch (e) { - // console.log(`Error on testing the proxy`) - // return false - // } - // return response.status == 200; - // } - - async give_back(id) { - await db.query("UPDATE proxies SET claimed = false WHERE id = $1", [id]); - } - - async delete(id) { - await db.query("DELETE FROM proxies WHERE id = $1", [id]); - } -} - -export default new ProxyService(); \ No newline at end of file diff --git a/src/services/user.js b/src/services/user.js new file mode 100644 index 0000000..cb85654 --- /dev/null +++ b/src/services/user.js @@ -0,0 +1,13 @@ +import db from '../db.js'; + +class UserService { + async add(username, password) { + return (await db.query("INSERT INTO users (username, password) VALUES ($1, $2) RETURNING id", [username, password])).rows[0].id; + } + + async get_by_username(username) { + return (await db.query("SELECT * FROM users WHERE username = $1", [username])).rows[0]; + } +} + +export default new UserService(); \ No newline at end of file diff --git a/views/login.pug b/views/login.pug new file mode 100644 index 0000000..58c34d9 --- /dev/null +++ b/views/login.pug @@ -0,0 +1,23 @@ +html + head + title Captcha Aggregator Login + meta(charset="utf-8") + meta(name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no") + meta(name="description" content="") + link(href="css/index.css" rel="stylesheet") + body + div(id="tsparticles") + main(class="box") + h2 Captcha Aggregator + + form(id="loginForm") + div(class="inputBox") + label(for="username") Username + input(id="username" placeholder="username" required=true) + div(class="inputBox") + label(for="password") Password + input(type="password" name="password" id="password" placeholder="password" required=true) + div + button(type="submit" name="" style="float: center;") Log in + script(type="text/javascript" src="js/login.js") + \ No newline at end of file