From dcbf6dc49a40766d28a989fe557cbf64431e8a7d Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:11:28 +0800 Subject: [PATCH 01/36] build(deps): update Go security dependencies --- README.md | 2 ++ go.mod | 14 +++++++------- go.sum | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index e25ad59..59787fe 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ Candy Server with WebUI ## Build +Requires Go 1.25 or newer and Node.js/npm for the frontend build. + ```bash # build a binary that runs natively make diff --git a/go.mod b/go.mod index 9dfe96f..7017a61 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/lanthora/cacao -go 1.22.5 +go 1.25.0 require ( github.com/deckarep/golang-set/v2 v2.6.0 @@ -9,9 +9,11 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 github.com/ipinfo/go/v2 v2.10.0 + github.com/ipipdotnet/ipdb-go v1.3.3 github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 github.com/oschwald/geoip2-golang v1.11.0 github.com/sirupsen/logrus v1.9.3 + golang.org/x/crypto v0.51.0 gorm.io/gorm v1.25.11 ) @@ -28,7 +30,6 @@ require ( github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.20.0 // indirect github.com/goccy/go-json v0.10.2 // indirect - github.com/ipipdotnet/ipdb-go v1.3.3 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -44,11 +45,10 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.25.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/net v0.55.0 // indirect + golang.org/x/sync v0.21.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/text v0.39.0 // indirect google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect modernc.org/libc v1.22.5 // indirect diff --git a/go.sum b/go.sum index c0701ba..fa30564 100644 --- a/go.sum +++ b/go.sum @@ -101,20 +101,20 @@ github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZ golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM= +golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus= +golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= From 3942b19527020d67b631b69c1e393d8ed9b6eaf6 Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:12:00 +0800 Subject: [PATCH 02/36] build(deps): update frontend security dependencies --- frontend/package-lock.json | 1466 ++++++++++++++++++++++++------------ frontend/package.json | 8 +- 2 files changed, 981 insertions(+), 493 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index c3ee9ad..8635440 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -10,9 +10,9 @@ "dependencies": { "@ant-design/icons": "^5.4.0", "ant-design-vue": "^4.2.3", - "axios": "^1.7.2", - "vue": "^3.4.29", - "vue-i18n": "^10.0.5", + "axios": "^1.20.0", + "vue": "^3.5.43", + "vue-i18n": "^10.0.8", "vue-router": "^4.4.0" }, "devDependencies": { @@ -24,22 +24,34 @@ "prettier": "^3.2.5", "rollup-plugin-visualizer": "^5.12.0", "unplugin-vue-components": "^0.27.3", - "vite": "^5.3.1" + "vite": "^5.4.21" } }, "node_modules/@ant-design/colors": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-6.0.0.tgz", - "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==", + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-7.2.1.tgz", + "integrity": "sha512-lCHDcEzieu4GA3n8ELeZ5VQ8pKQAWcGGLRTQ50aQM2iqPpq2evTxER84jfdPvsPAtEcZ7m44NI45edFMo8oOYQ==", "license": "MIT", "dependencies": { - "@ctrl/tinycolor": "^3.4.0" + "@ant-design/fast-color": "^2.0.6" + } + }, + "node_modules/@ant-design/fast-color": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@ant-design/fast-color/-/fast-color-2.0.6.tgz", + "integrity": "sha512-y2217gk4NqL35giHl72o6Zzqji9O7vHh9YmhUVkPtAOpoTCH4uWxo/pr4VE8t0+ChEPs0qo4eJRC5Q1eXWo3vA==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.24.7" + }, + "engines": { + "node": ">=8.x" } }, "node_modules/@ant-design/icons": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-5.4.0.tgz", - "integrity": "sha512-QZbWC5xQYexCI5q4/fehSEkchJr5UGtvAJweT743qKUQQGs9IH2DehNLP49DJ3Ii9m9CijD2HN6fNy3WKhIFdA==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-5.6.1.tgz", + "integrity": "sha512-0/xS39c91WjPAZOWsvi1//zjx6kAp4kxWwctR6kuU6p133w8RU0D2dSCvZC19uQyharg/sAvYxGYWl01BbZZfg==", "license": "MIT", "dependencies": { "@ant-design/colors": "^7.0.0", @@ -57,9 +69,9 @@ } }, "node_modules/@ant-design/icons-svg": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz", - "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.6.0.tgz", + "integrity": "sha512-PRomU725ABMf/lnQp5HiB7my1kjEbFY0D10N4lXYxK6TIB1gKjIVD5MRThpDaezLgw1D774J8eOeeDB0M6wHrQ==", "license": "MIT" }, "node_modules/@ant-design/icons-vue": { @@ -75,13 +87,13 @@ "vue": ">=3.0.3" } }, - "node_modules/@ant-design/icons/node_modules/@ant-design/colors": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-7.1.0.tgz", - "integrity": "sha512-MMoDGWn1y9LdQJQSHiCC20x3uZ3CwQnv9QMz6pCmJOrqdgM9YxsoVVY0wtrdXbmfSgnV0KNk6zi09NAhMR2jvg==", + "node_modules/@ant-design/icons-vue/node_modules/@ant-design/colors": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-6.0.0.tgz", + "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==", "license": "MIT", "dependencies": { - "@ctrl/tinycolor": "^3.6.1" + "@ctrl/tinycolor": "^3.4.0" } }, "node_modules/@antfu/utils": { @@ -94,11 +106,32 @@ "url": "https://github.com/sponsors/antfu" } }, + "node_modules/@babel/helper-string-parser": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", + "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/parser": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz", - "integrity": "sha512-WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==", + "version": "7.29.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.9.tgz", + "integrity": "sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==", "license": "MIT", + "dependencies": { + "@babel/types": "^7.29.8" + }, "bin": { "parser": "bin/babel-parser.js" }, @@ -107,12 +140,22 @@ } }, "node_modules/@babel/runtime": { - "version": "7.24.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.8.tgz", - "integrity": "sha512-5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz", + "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==", + "license": "MIT", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.29.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.8.tgz", + "integrity": "sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==", "license": "MIT", "dependencies": { - "regenerator-runtime": "^0.14.0" + "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -531,25 +574,28 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz", + "integrity": "sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg==", "dev": true, "license": "MIT", "dependencies": { - "eslint-visitor-keys": "^3.3.0" + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, + "funding": { + "url": "https://opencollective.com/eslint" + }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, "node_modules/@eslint-community/regexpp": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", - "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", + "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", "dev": true, "license": "MIT", "engines": { @@ -581,9 +627,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", + "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", "dev": true, "license": "MIT", "engines": { @@ -591,14 +637,14 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", + "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", "deprecated": "Use @eslint/config-array instead", "dev": true, "license": "Apache-2.0", "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", + "@humanwhocodes/object-schema": "^2.0.3", "debug": "^4.3.1", "minimatch": "^3.0.5" }, @@ -629,12 +675,13 @@ "license": "BSD-3-Clause" }, "node_modules/@intlify/core-base": { - "version": "10.0.5", - "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-10.0.5.tgz", - "integrity": "sha512-F3snDTQs0MdvnnyzTDTVkOYVAZOE/MHwRvF7mn7Jw1yuih4NrFYLNYIymGlLmq4HU2iIdzYsZ7f47bOcwY73XQ==", + "version": "10.0.8", + "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-10.0.8.tgz", + "integrity": "sha512-FoHslNWSoHjdUBLy35bpm9PV/0LVI/DSv9L6Km6J2ad8r/mm0VaGg06C40FqlE8u2ADcGUM60lyoU7Myo4WNZQ==", + "license": "MIT", "dependencies": { - "@intlify/message-compiler": "10.0.5", - "@intlify/shared": "10.0.5" + "@intlify/message-compiler": "10.0.8", + "@intlify/shared": "10.0.8" }, "engines": { "node": ">= 16" @@ -644,11 +691,12 @@ } }, "node_modules/@intlify/message-compiler": { - "version": "10.0.5", - "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-10.0.5.tgz", - "integrity": "sha512-6GT1BJ852gZ0gItNZN2krX5QAmea+cmdjMvsWohArAZ3GmHdnNANEcF9JjPXAMRtQ6Ux5E269ymamg/+WU6tQA==", + "version": "10.0.8", + "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-10.0.8.tgz", + "integrity": "sha512-DV+sYXIkHVd5yVb2mL7br/NEUwzUoLBsMkV3H0InefWgmYa34NLZUvMCGi5oWX+Hqr2Y2qUxnVrnOWF4aBlgWg==", + "license": "MIT", "dependencies": { - "@intlify/shared": "10.0.5", + "@intlify/shared": "10.0.8", "source-map-js": "^1.0.2" }, "engines": { @@ -659,9 +707,10 @@ } }, "node_modules/@intlify/shared": { - "version": "10.0.5", - "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-10.0.5.tgz", - "integrity": "sha512-bmsP4L2HqBF6i6uaMqJMcFBONVjKt+siGluRq4Ca4C0q7W2eMaVZr8iCgF9dKbcVXutftkC7D6z2SaSMmLiDyA==", + "version": "10.0.8", + "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-10.0.8.tgz", + "integrity": "sha512-BcmHpb5bQyeVNrptC3UhzpBZB/YHHDoEREOUERrmF2BRxsyOEuRrq+Z96C/D4+2KJb8kuHiouzAei7BXlG0YYw==", + "license": "MIT", "engines": { "node": ">= 16" }, @@ -670,11 +719,31 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", - "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz", + "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==", "license": "MIT" }, + "node_modules/@napi-rs/lzma-linux-x64-gnu": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz", + "integrity": "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ==", + "cpu": [ + "x64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^22.20 || ^24.12 || >=25" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -714,28 +783,28 @@ } }, "node_modules/@pkgr/core": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz", - "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.3.6.tgz", + "integrity": "sha512-SEeaJLb3qBNF/OaXnaR1NmmBbFYk1zC0ZH/52fATcRPLFg/p791YrcyFFy44Bo9sLaGuSuLp5Q6axbb/O+v/RA==", "dev": true, "license": "MIT", "engines": { - "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + "node": "^14.18.0 || >=16.0.0" }, "funding": { - "url": "https://opencollective.com/unts" + "url": "https://opencollective.com/pkgr" } }, "node_modules/@rollup/pluginutils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz", - "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.4.0.tgz", + "integrity": "sha512-MfPp06CjRLfXQ3wY0R8vJDYBy/MvVcc9OulEfR0B8Iv9ko+GCNaRZ+EpJYFl27LhKsZK0o420sYCRHCjfCgeUg==", "dev": true, "license": "MIT", "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^2.0.2", - "picomatch": "^2.3.1" + "picomatch": "^4.0.2" }, "engines": { "node": ">=14.0.0" @@ -750,9 +819,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.19.0.tgz", - "integrity": "sha512-JlPfZ/C7yn5S5p0yKk7uhHTTnFlvTgLetl2VxqE518QgyM7C9bSfFTYvB/Q/ftkq0RIPY4ySxTz+/wKJ/dXC0w==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.64.0.tgz", + "integrity": "sha512-FLLpX941CD/7aBvX3GqLGBM9OvY5PGXTryPJkG5r5/OuBpZpV5k45Uo3RxAvqd35tsyc3hH1bhtz921IKzoIzg==", "cpu": [ "arm" ], @@ -764,9 +833,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.19.0.tgz", - "integrity": "sha512-RDxUSY8D1tWYfn00DDi5myxKgOk6RvWPxhmWexcICt/MEC6yEMr4HNCu1sXXYLw8iAsg0D44NuU+qNq7zVWCrw==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.64.0.tgz", + "integrity": "sha512-iI32XM/jnDYJsvx5ai/za/7gWO9XoSeFFtU06/ZCaRgyilfJOjaopD3nOpk2WrTCGOyeDt4hleUiGOAnd5tHNg==", "cpu": [ "arm64" ], @@ -778,9 +847,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.0.tgz", - "integrity": "sha512-emvKHL4B15x6nlNTBMtIaC9tLPRpeA5jMvRLXVbl/W9Ie7HhkrE7KQjvgS9uxgatL1HmHWDXk5TTS4IaNJxbAA==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.64.0.tgz", + "integrity": "sha512-dRBZlbt2sEtF8Mn4MODThze9fIPdDoOhVSlXMAKy5dQbOYK9pOOoPY4Fat3OTtr0+8zbJo5TTZwlsfxY/kDNJg==", "cpu": [ "arm64" ], @@ -792,9 +861,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.19.0.tgz", - "integrity": "sha512-fO28cWA1dC57qCd+D0rfLC4VPbh6EOJXrreBmFLWPGI9dpMlER2YwSPZzSGfq11XgcEpPukPTfEVFtw2q2nYJg==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.64.0.tgz", + "integrity": "sha512-Y3whrJOMucfkhgNkvcM93M6j8C53iEAMmPMYD99C6G1kUy4ELigLWk9ar2/4aCBSRgsql0zdlOemLgW2m5GZgQ==", "cpu": [ "x64" ], @@ -805,14 +874,45 @@ "darwin" ] }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.64.0.tgz", + "integrity": "sha512-S6S1GEzPjFF6IONYJX3AKt/799+8RgBgCcwRnUo+Ep1IvBxUbw5M51iU0TDdK2NWWVnSvCQ8yi6Em0fGASMOng==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.64.0.tgz", + "integrity": "sha512-Ed1DPoFENkXj4IGzSB12SesV40iP6LxCCrbTIkSGIQBpOOxpBM+0kj62lmaeIHfMWTDoddqTOtqc7s8LYfn+Pw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.19.0.tgz", - "integrity": "sha512-2Rn36Ubxdv32NUcfm0wB1tgKqkQuft00PtM23VqLuCUR4N5jcNWDoV5iBC9jeGdgS38WK66ElncprqgMUOyomw==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.64.0.tgz", + "integrity": "sha512-J/6xhutJPtFyIkmHdf4olOdHHKH5kOJNumojdWn+Elv5ICEYTVOa362Vw27TxsK0BLzb1le3EDlO3UbvFK1lnQ==", "cpu": [ "arm" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -820,13 +920,16 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.19.0.tgz", - "integrity": "sha512-gJuzIVdq/X1ZA2bHeCGCISe0VWqCoNT8BvkQ+BfsixXwTOndhtLUpOg0A1Fcx/+eA6ei6rMBzlOz4JzmiDw7JQ==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.64.0.tgz", + "integrity": "sha512-G4L/Nnx59d2LvDoV/P4S5lZ7oVLT6hodOHMacqjiq2LL2gts86KbkEBTYL53+fBt0odhf7XPIbIATGoYiJctxg==", "cpu": [ "arm" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -834,13 +937,16 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.19.0.tgz", - "integrity": "sha512-0EkX2HYPkSADo9cfeGFoQ7R0/wTKb7q6DdwI4Yn/ULFE1wuRRCHybxpl2goQrx4c/yzK3I8OlgtBu4xvted0ug==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.64.0.tgz", + "integrity": "sha512-zF16pvJDEUksGYRbfnXne7pdklAyj2XDmJeYKgP93oq0cUyX9Y8O7lUo1R+IY1GagP/YBvCEDCe7eEcAKpw//g==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -848,27 +954,84 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.19.0.tgz", - "integrity": "sha512-GlIQRj9px52ISomIOEUq/IojLZqzkvRpdP3cLgIE1wUWaiU5Takwlzpz002q0Nxxr1y2ZgxC2obWxjr13lvxNQ==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.64.0.tgz", + "integrity": "sha512-nIggWn8n+w12+R5lsV+PYYoUY8vuObxPAQqJI7WES+9v0qspYuAHoZMfYM0yLxlipasT5BY9ht5W8t5c/rSCkg==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-gnu": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.64.0.tgz", + "integrity": "sha512-WLOTiHPzszP0dxIMsHpFeDSOSB5I49Mj8K4+yKE3H1X/D0JRG5XZ5jrctJLMjnUc/LUzaKiwq6EHWNJ8pup8PA==", + "cpu": [ + "loong64" + ], + "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ "linux" ] }, - "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.19.0.tgz", - "integrity": "sha512-N6cFJzssruDLUOKfEKeovCKiHcdwVYOT1Hs6dovDQ61+Y9n3Ek4zXvtghPPelt6U0AH4aDGnDLb83uiJMkWYzQ==", + "node_modules/@rollup/rollup-linux-loong64-musl": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.64.0.tgz", + "integrity": "sha512-35RK9aRhh7g7Pmeu5gQ01aCvrhXzj9LoBE6xtUcEH1ns+nyTaSzxSpADmBQINu4QiTDGvmQYwo1j5hlg1rRXFw==", + "cpu": [ + "loong64" + ], + "dev": true, + "libc": [ + "musl" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-gnu": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.64.0.tgz", + "integrity": "sha512-RqTfnpoTjuWfPAmqK5p2edt2AMCDJWm6oTn7sKfmyx+6tRga0ip05SJ977o6udTcIiDeF/CJMUfkaN4gtWt6Aw==", + "cpu": [ + "ppc64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-musl": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.64.0.tgz", + "integrity": "sha512-RQjZPigjxFvFZDijG6rjlSXxhRaTf9zLYVpGK+lVcga64oMqP1GbgVqCb46eHTTceSIgp89Ja0y5aPe3GFBYHg==", "cpu": [ "ppc64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -876,13 +1039,33 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.19.0.tgz", - "integrity": "sha512-2DnD3mkS2uuam/alF+I7M84koGwvn3ZVD7uG+LEWpyzo/bq8+kKnus2EVCkcvh6PlNB8QPNFOz6fWd5N8o1CYg==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.64.0.tgz", + "integrity": "sha512-tjL58mgQcTRnDRpeky+Sth1MKQeYi2Ct6r3Luq9E5aTSjnM/i/JbozqZkKqp9thM5+oDSZxo+05f9kdQedfTGA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "libc": [ + "glibc" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-musl": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.64.0.tgz", + "integrity": "sha512-ictoRyVaoZ8C67myHef+8hhCa6IplXJJ/xUCkVCxziV4zxMZh+jvhkhGsPBLqj1S72fnqD0QH5zL4lcaa4X7DQ==", "cpu": [ "riscv64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -890,13 +1073,16 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.19.0.tgz", - "integrity": "sha512-D6pkaF7OpE7lzlTOFCB2m3Ngzu2ykw40Nka9WmKGUOTS3xcIieHe82slQlNq69sVB04ch73thKYIWz/Ian8DUA==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.64.0.tgz", + "integrity": "sha512-8aVvZ2hfr9RLFzBQkQNmYeHLDja8fLeQAmLt757zdKN/B+8L809KlLJKctQjS22wZotptV8G6o7fVPuAs8S1tQ==", "cpu": [ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -904,13 +1090,16 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.19.0.tgz", - "integrity": "sha512-HBndjQLP8OsdJNSxpNIN0einbDmRFg9+UQeZV1eiYupIRuZsDEoeGU43NQsS34Pp166DtwQOnpcbV/zQxM+rWA==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.64.0.tgz", + "integrity": "sha512-2dEF8GAcDKwshUfydD+GhosppNyBzhVUHkdFF3CXd3FpOkzj/RZzF5aoEtzklujklT5qFVRU2GK/cFeLaTNKVg==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -918,23 +1107,54 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.19.0.tgz", - "integrity": "sha512-HxfbvfCKJe/RMYJJn0a12eiOI9OOtAUF4G6ozrFUK95BNyoJaSiBjIOHjZskTUffUrB84IPKkFG9H9nEvJGW6A==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.64.0.tgz", + "integrity": "sha512-3XHTvoo2hKkh0MiOfS7SkhHjMaaWF7P4F3drocZZaho/Z8w7h/jpnuBHm91BOQLfvrKHs1yR+zir4E8RI3XzTQ==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ "linux" ] }, + "node_modules/@rollup/rollup-openbsd-x64": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.64.0.tgz", + "integrity": "sha512-HKtkzodL4a3KFWDXDoO61cRynAWTR3LnAE0oGtfG9lcNFpNuVYUFOByxDgNqEvic9rvaQbAj+SFwTEWDptRaIw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ] + }, + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.64.0.tgz", + "integrity": "sha512-JBsxqiY16uyyCujtoC3s7zL+SrYyNElptD7K4V+KUoJ2V8/XG3hPWpheK+SuPwNh1cikJvIZmIdsrYXvD6PLJw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ] + }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.19.0.tgz", - "integrity": "sha512-HxDMKIhmcguGTiP5TsLNolwBUK3nGGUEoV/BO9ldUBoMLBssvh4J0X8pf11i1fTV7WShWItB1bKAKjX4RQeYmg==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.64.0.tgz", + "integrity": "sha512-S5Qrijh37qhnUYQ0ay8WN3LuWeKjow7wTUyCOPMZtnXiBXYXdsZETI6ZLfYnQAKovltckPLBFdNeD61P2rJc7g==", "cpu": [ "arm64" ], @@ -946,9 +1166,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.19.0.tgz", - "integrity": "sha512-xItlIAZZaiG/u0wooGzRsx11rokP4qyc/79LkAOdznGRAbOFc+SfEdfUOszG1odsHNgwippUJavag/+W/Etc6Q==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.64.0.tgz", + "integrity": "sha512-zbZ6iMmLFEsCtTdc2/y1F/cDFVNNCPF7Ae8PCT/wdPE//hGwYp6r+MyCLMFX+kOeIe09Pz6ASfnnfpSTN1FJQQ==", "cpu": [ "ia32" ], @@ -959,10 +1179,24 @@ "win32" ] }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.64.0.tgz", + "integrity": "sha512-L6Hw69oNpuYaOr1zCG30v0/DqKYCSRwodPGwIcVZ/6f8SOzq9rxtL/xNVI5MO4wjli+Ko0ErK9uHJL3mNPt8wQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.19.0.tgz", - "integrity": "sha512-xNo5fV5ycvCCKqiZcpB65VMR11NJB+StnxHz20jdqRAktfdfzhgjTiJ2doTDQE/7dqGaV5I7ZGqKpgph6lCIag==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.64.0.tgz", + "integrity": "sha512-nl+CTWIgOGszQmUz/kanfgrfFZ4qiwxKIfT/ryl3N3Ewk5tqizmYtNXiqb7Bu/fDtNgu1kyxdFiAUJNur3iysg==", "cpu": [ "x64" ], @@ -974,9 +1208,9 @@ ] }, "node_modules/@rushstack/eslint-patch": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.10.3.tgz", - "integrity": "sha512-qC/xYId4NMebE6w/V33Fh9gWxLgURiNYgVNObbJl2LZv0GUUItCcCqC5axQSwRaAgaxl2mELq1rMzlswaQ0Zxg==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.16.1.tgz", + "integrity": "sha512-TvZbIpeKqGQQ7X0zSCvPH9riMSFQFSggnfBjFZ1mEoILW+UuXCKwOoPcgjMwiUtRqFZ8jWhPJc4um14vC6I4ag==", "dev": true, "license": "MIT" }, @@ -991,87 +1225,87 @@ } }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", "dev": true, "license": "MIT" }, "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.4.0.tgz", + "integrity": "sha512-1mEZtMKPM09vDmQt5y7YvmN2+DFTP7Tg0EWXdic8/C6VRnpb33e4ghisCIE3WZjsE2N8mf+QV1Zqh7ZFYLWInQ==", "dev": true, "license": "ISC" }, "node_modules/@vitejs/plugin-vue": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.0.5.tgz", - "integrity": "sha512-LOjm7XeIimLBZyzinBQ6OSm3UBCNVCpLkxGC0oWmm2YPzVZoxMsdvNVimLTBzpAnR9hl/yn1SHGuRfe6/Td9rQ==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz", + "integrity": "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==", "dev": true, "license": "MIT", "engines": { "node": "^18.0.0 || >=20.0.0" }, "peerDependencies": { - "vite": "^5.0.0", + "vite": "^5.0.0 || ^6.0.0", "vue": "^3.2.25" } }, "node_modules/@vue/compiler-core": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.33.tgz", - "integrity": "sha512-MoIREbkdPQlnGfSKDMgzTqzqx5nmEjIc0ydLVYlTACGBsfvOJ4tHSbZXKVF536n6fB+0eZaGEOqsGThPpdvF5A==", + "version": "3.5.43", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.43.tgz", + "integrity": "sha512-zdiLhnbe1QQqgDT8xZMpNmyqZ3qlI+/Q/FHQco57Kwl/b05HhCzN6eVGN9QU9rbga4CrS0H5SYY8VGHZCt/1Hg==", "license": "MIT", "dependencies": { - "@babel/parser": "^7.24.7", - "@vue/shared": "3.4.33", - "entities": "^4.5.0", + "@babel/parser": "^7.29.8", + "@vue/shared": "3.5.43", + "entities": "^7.0.1", "estree-walker": "^2.0.2", - "source-map-js": "^1.2.0" + "source-map-js": "^1.2.1" } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.33.tgz", - "integrity": "sha512-GzB8fxEHKw0gGet5BKlpfXEqoBnzSVWwMnT+dc25wE7pFEfrU/QsvjZMP9rD4iVXHBBoemTct8mN0GJEI6ZX5A==", + "version": "3.5.43", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.43.tgz", + "integrity": "sha512-PEZoAk3NQmsn/ejMzSOCyTYqwGqczrWm70PuhBKjjv1+TCoQAaO/zOqNwjV+honlNstT5ILxtc+8r8UUfj+iEQ==", "license": "MIT", "dependencies": { - "@vue/compiler-core": "3.4.33", - "@vue/shared": "3.4.33" + "@vue/compiler-core": "3.5.43", + "@vue/shared": "3.5.43" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.33.tgz", - "integrity": "sha512-7rk7Vbkn21xMwIUpHQR4hCVejwE6nvhBOiDgoBcR03qvGqRKA7dCBSsHZhwhYUsmjlbJ7OtD5UFIyhP6BY+c8A==", + "version": "3.5.43", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.43.tgz", + "integrity": "sha512-FCbrG3XNCRl+js3huuKx4IVHBLTvMkJhVepjbxSPu1gn4yWLaYtGNQdjJGZaMytXB6qb76qQDDmDSLy/vkmleQ==", "license": "MIT", "dependencies": { - "@babel/parser": "^7.24.7", - "@vue/compiler-core": "3.4.33", - "@vue/compiler-dom": "3.4.33", - "@vue/compiler-ssr": "3.4.33", - "@vue/shared": "3.4.33", + "@babel/parser": "^7.29.8", + "@vue/compiler-core": "3.5.43", + "@vue/compiler-dom": "3.5.43", + "@vue/compiler-ssr": "3.5.43", + "@vue/shared": "3.5.43", "estree-walker": "^2.0.2", - "magic-string": "^0.30.10", - "postcss": "^8.4.39", - "source-map-js": "^1.2.0" + "magic-string": "^0.30.21", + "postcss": "^8.5.28", + "source-map-js": "^1.2.1" } }, "node_modules/@vue/compiler-ssr": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.33.tgz", - "integrity": "sha512-0WveC9Ai+eT/1b6LCV5IfsufBZ0HP7pSSTdDjcuW302tTEgoBw8rHVHKPbGUtzGReUFCRXbv6zQDDgucnV2WzQ==", + "version": "3.5.43", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.43.tgz", + "integrity": "sha512-GF62orf7KiJX9RqrHNGrYBudsQGD0OhJ5nDs90O8UiDuS40+YMYomiXu6w6EuvtXuRDc3MSNis3EaaSKAVSWpg==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.4.33", - "@vue/shared": "3.4.33" + "@vue/compiler-dom": "3.5.43", + "@vue/shared": "3.5.43" } }, "node_modules/@vue/devtools-api": { - "version": "6.6.3", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.3.tgz", - "integrity": "sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==", + "version": "6.6.4", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz", + "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==", "license": "MIT" }, "node_modules/@vue/eslint-config-prettier": { @@ -1090,59 +1324,57 @@ } }, "node_modules/@vue/reactivity": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.33.tgz", - "integrity": "sha512-B24QIelahDbyHipBgbUItQblbd4w5HpG3KccL+YkGyo3maXyS253FzcTR3pSz739OTphmzlxP7JxEMWBpewilA==", + "version": "3.5.43", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.43.tgz", + "integrity": "sha512-G/c9GyOZNI2jVaaS6OX1EF1SSFSv7H0ERqNTl4+DTFMlZmB5eVAB53aLQNam/7NL2NPtaDD7RdVrzf8uJzMuOA==", "license": "MIT", "dependencies": { - "@vue/shared": "3.4.33" + "@vue/shared": "3.5.43" } }, "node_modules/@vue/runtime-core": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.33.tgz", - "integrity": "sha512-6wavthExzT4iAxpe8q37/rDmf44nyOJGISJPxCi9YsQO+8w9v0gLCFLfH5TzD1V1AYrTAdiF4Y1cgUmP68jP6w==", + "version": "3.5.43", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.43.tgz", + "integrity": "sha512-hU6U6VnVhBGQDpvlnnDlIB8ZGJBiOcgk2lh/0InltHiz3D8oSkluvuvY+do1G2H3+udeKFsmaBlgVYP7gXQzEw==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.4.33", - "@vue/shared": "3.4.33" + "@vue/reactivity": "3.5.43", + "@vue/shared": "3.5.43" } }, "node_modules/@vue/runtime-dom": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.33.tgz", - "integrity": "sha512-iHsMCUSFJ+4z432Bn9kZzHX+zOXa6+iw36DaVRmKYZpPt9jW9riF32SxNwB124i61kp9+AZtheQ/mKoJLerAaQ==", + "version": "3.5.43", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.43.tgz", + "integrity": "sha512-Bb2Jc0YjjJdMt1SJmb9b2L/IWd3I8lIT9x9eS/xvvP9CiVgna0ffua74xKRmt4/uSJ+0r4iN8ex1jrqkhQGWQw==", "license": "MIT", "dependencies": { - "@vue/reactivity": "3.4.33", - "@vue/runtime-core": "3.4.33", - "@vue/shared": "3.4.33", - "csstype": "^3.1.3" + "@vue/reactivity": "3.5.43", + "@vue/runtime-core": "3.5.43", + "@vue/shared": "3.5.43", + "csstype": "^3.2.3" } }, "node_modules/@vue/server-renderer": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.33.tgz", - "integrity": "sha512-jTH0d6gQcaYideFP/k0WdEu8PpRS9MF8d0b6SfZzNi+ap972pZ0TNIeTaESwdOtdY0XPVj54XEJ6K0wXxir4fw==", + "version": "3.5.43", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.43.tgz", + "integrity": "sha512-l2Ygjv9NehV94PSBxNWsAHC0j/eIIKbn92mBuWXAPGLnn6HfJ6MH5ubsd+Nk0YoZ5FRuxWI1P2VSoh+dbPQhCQ==", "license": "MIT", "dependencies": { - "@vue/compiler-ssr": "3.4.33", - "@vue/shared": "3.4.33" - }, - "peerDependencies": { - "vue": "3.4.33" + "@vue/compiler-ssr": "3.5.43", + "@vue/runtime-dom": "3.5.43", + "@vue/shared": "3.5.43" } }, "node_modules/@vue/shared": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.33.tgz", - "integrity": "sha512-aoRY0jQk3A/cuvdkodTrM4NMfxco8n55eG4H7ML/CRy7OryHfiqvug4xrCBBMbbN+dvXAetDDwZW9DXWWjBntA==", + "version": "3.5.43", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.43.tgz", + "integrity": "sha512-uksS7YGMR5NZyr4JNq0Rp+QyLns0ueaz20KwzIPW9R0LH1Vnt4E+XUM29PNseEbf1www2gOuhuDi5AKOIXag9Q==", "license": "MIT" }, "node_modules/acorn": { - "version": "8.12.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", - "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "version": "8.19.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.19.0.tgz", + "integrity": "sha512-oJlA3XiRm7Cyk6qFD2Jn8ak9B7jSy0qy00ADO3+8dpT0LSjFihQYv4C02LFCSYJV3Q37xYwwRy5m+IpIiUzqWw==", "dev": true, "license": "MIT", "bin": { @@ -1162,10 +1394,22 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.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/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", + "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", "dev": true, "license": "MIT", "dependencies": { @@ -1206,9 +1450,9 @@ } }, "node_modules/ant-design-vue": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-4.2.3.tgz", - "integrity": "sha512-kqGyWvZtFlSInFP93Ow6wS8LzEsxxUgpI+ZY5jQQkuX8WAcqdwXCA7IcHMpECW6JB89DZMo2Bw85jUg2SjlgQA==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-4.2.6.tgz", + "integrity": "sha512-t7eX13Yj3i9+i5g9lqFyYneoIb3OzTvQjq9Tts1i+eiOd3Eva/6GagxBSXM1fOCjqemIu0FYVE1ByZ/38epR3Q==", "license": "MIT", "dependencies": { "@ant-design/colors": "^6.0.0", @@ -1245,6 +1489,15 @@ "vue": ">=3.2.0" } }, + "node_modules/ant-design-vue/node_modules/@ant-design/colors": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-6.0.0.tgz", + "integrity": "sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==", + "license": "MIT", + "dependencies": { + "@ctrl/tinycolor": "^3.4.0" + } + }, "node_modules/anymatch": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", @@ -1259,6 +1512,19 @@ "node": ">= 8" } }, + "node_modules/anymatch/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -1285,14 +1551,15 @@ "license": "MIT" }, "node_modules/axios": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", - "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.20.0.tgz", + "integrity": "sha512-r8aOh8j9cGKpgQAqpzrUHnSIc6a59Y3Xf/cv8sy1DrHCkZHzQGEuoq1tARk6qSyDdtQGSDgpb9kFlruzPvrgwg==", "license": "MIT", "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" + "follow-redirects": "^1.16.0", + "form-data": "^4.0.6", + "https-proxy-agent": "^5.0.1", + "proxy-from-env": "^2.1.0" } }, "node_modules/balanced-match": { @@ -1323,9 +1590,9 @@ "license": "ISC" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.21", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.21.tgz", + "integrity": "sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==", "dev": true, "license": "MIT", "dependencies": { @@ -1346,6 +1613,19 @@ "node": ">=8" } }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -1478,27 +1758,30 @@ "license": "MIT" }, "node_modules/confbox": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz", - "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz", + "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==", "dev": true, "license": "MIT" }, "node_modules/core-js": { - "version": "3.37.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz", - "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==", + "version": "3.50.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.50.0.tgz", + "integrity": "sha512-BRWgOLKkFeCgRudR6zrs8p9XJZcE14grzKMMssoYrk6krtuEZ7MTKPIY5RzOnqsEKIR9kst7wNzphttraT+Yqw==", "hasInstallScript": true, "license": "MIT", + "engines": { + "node": "*" + }, "funding": { "type": "opencollective", "url": "https://opencollective.com/core-js" } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -1524,25 +1807,24 @@ } }, "node_modules/csstype": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", + "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", "license": "MIT" }, "node_modules/dayjs": { - "version": "1.11.12", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.12.tgz", - "integrity": "sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==", + "version": "1.11.23", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.23.tgz", + "integrity": "sha512-QDTCU0M0MxR3hQfnlDJfwekQiaanm1ubOD231u73WBckQ/fsamwRLiE2GBz6D3a/xF1NgfiDLJjXBa1hYOYTtQ==", "license": "MIT" }, "node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", - "dev": true, + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -1604,6 +1886,20 @@ "integrity": "sha512-bvVTQe1lfaUr1oFzZX80ce9KLDlZ3iU+XGNE/bz9HnGdklTieqsbmsLHe+rT2XWqopvL0PckkYqN7ksmm5pe3w==", "license": "MIT" }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -1612,9 +1908,9 @@ "license": "MIT" }, "node_modules/entities": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz", + "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==", "license": "BSD-2-Clause", "engines": { "node": ">=0.12" @@ -1623,6 +1919,51 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz", + "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/esbuild": { "version": "0.21.5", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", @@ -1663,9 +2004,9 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, "license": "MIT", "engines": { @@ -1686,17 +2027,18 @@ } }, "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "version": "8.57.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", + "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", + "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", + "@eslint/js": "8.57.1", + "@humanwhocodes/config-array": "^0.13.0", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", @@ -1742,9 +2084,9 @@ } }, "node_modules/eslint-config-prettier": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", - "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.2.tgz", + "integrity": "sha512-iI1f+D2ViGn+uvv5HuHVUamg8ll4tN+JRHGc6IJi4TP9Kl976C57fzPXgseXNs8v0iA8aSJpHsTWjDb9QJamGQ==", "dev": true, "license": "MIT", "bin": { @@ -1755,14 +2097,14 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz", - "integrity": "sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==", + "version": "5.5.6", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.6.tgz", + "integrity": "sha512-ifetmTcxWfz+4qRW3pH/ujdTq2jQIj59AxJMIN26K5avYgU8dxycUETQonWiW+wPrYXA0j3Try0l1CnwVQtDqQ==", "dev": true, "license": "MIT", "dependencies": { - "prettier-linter-helpers": "^1.0.0", - "synckit": "^0.9.1" + "prettier-linter-helpers": "^1.0.1", + "synckit": "^0.11.13" }, "engines": { "node": "^14.18.0 || >=16.0.0" @@ -1773,7 +2115,7 @@ "peerDependencies": { "@types/eslint": ">=8.0.0", "eslint": ">=8.0.0", - "eslint-config-prettier": "*", + "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0", "prettier": ">=3.0.0" }, "peerDependenciesMeta": { @@ -1786,9 +2128,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "9.27.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.27.0.tgz", - "integrity": "sha512-5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA==", + "version": "9.33.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.33.0.tgz", + "integrity": "sha512-174lJKuNsuDIlLpjeXc5E2Tss8P44uIimAfGD0b90k0NoirJqpG7stLuU9Vp/9ioTOrQdWVREc4mRd1BD+CvGw==", "dev": true, "license": "MIT", "dependencies": { @@ -1797,7 +2139,7 @@ "natural-compare": "^1.4.0", "nth-check": "^2.1.1", "postcss-selector-parser": "^6.0.15", - "semver": "^7.6.0", + "semver": "^7.6.3", "vue-eslint-parser": "^9.4.3", "xml-name-validator": "^4.0.0" }, @@ -1857,9 +2199,9 @@ } }, "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", + "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -1923,9 +2265,9 @@ "license": "Apache-2.0" }, "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", "dev": true, "license": "MIT", "dependencies": { @@ -1933,7 +2275,7 @@ "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.4" + "micromatch": "^4.0.8" }, "engines": { "node": ">=8.6.0" @@ -1967,9 +2309,9 @@ "license": "MIT" }, "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.3.tgz", + "integrity": "sha512-XKv5nnLs6nLF71NgiKJLIZFLkPyIEuOselLG7ujZnGrRfQK8HpvY+WqKhAJUAdLomwVHErVS4LfxFlPq0/FTAw==", "dev": true, "license": "ISC", "dependencies": { @@ -2035,16 +2377,16 @@ } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.4.tgz", + "integrity": "sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==", "dev": true, "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.1.tgz", + "integrity": "sha512-FNvFGzoMLWmE6Yj9spb/zjd7yiNCHiAW9/Tg9CXrQ8wuu32HtlJOwWO11OJafl5FfY3DxTdQ0vj42zU1kvv5jg==", "funding": [ { "type": "individual", @@ -2062,14 +2404,16 @@ } }, "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz", + "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==", "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.4", + "mime-types": "^2.1.35" }, "engines": { "node": ">= 6" @@ -2097,6 +2441,15 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -2107,11 +2460,48 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "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", + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", "dev": true, "license": "ISC", "dependencies": { @@ -2158,6 +2548,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", @@ -2175,10 +2577,62 @@ "node": ">=8" } }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", + "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "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/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, "license": "MIT", "engines": { @@ -2186,9 +2640,9 @@ } }, "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2349,10 +2803,20 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.2.tgz", + "integrity": "sha512-SFNOvSJ+Dgf/9An904Yx+CgSlIPCkIpao4qo51lpee25TIRejdH3rhR4EZMGoNx3/TP3O+wzWuiTFl4sqbltzA==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -2407,14 +2871,14 @@ } }, "node_modules/local-pkg": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", - "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.1.tgz", + "integrity": "sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==", "dev": true, "license": "MIT", "dependencies": { - "mlly": "^1.4.2", - "pkg-types": "^1.0.3" + "mlly": "^1.7.3", + "pkg-types": "^1.2.1" }, "engines": { "node": ">=14" @@ -2440,15 +2904,15 @@ } }, "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", "license": "MIT" }, "node_modules/lodash-es": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", - "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz", + "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==", "license": "MIT" }, "node_modules/lodash.merge": { @@ -2471,12 +2935,21 @@ } }, "node_modules/magic-string": { - "version": "0.30.10", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz", - "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==", + "version": "0.30.21", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", + "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" + "@jridgewell/sourcemap-codec": "^1.5.5" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" } }, "node_modules/merge2": { @@ -2490,9 +2963,9 @@ } }, "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "license": "MIT", "dependencies": { @@ -2503,6 +2976,19 @@ "node": ">=8.6" } }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", @@ -2525,9 +3011,9 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "license": "ISC", "dependencies": { @@ -2538,29 +3024,28 @@ } }, "node_modules/mlly": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz", - "integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.2.tgz", + "integrity": "sha512-d+ObxMQFmbt10sretNDytwt85VrbkhhUA/JBGm1MPaWJ65Cl4wOgLaB1NYvJSZ0Ef03MMEU/0xpPMXUIQ29UfA==", "dev": true, "license": "MIT", "dependencies": { - "acorn": "^8.11.3", - "pathe": "^1.1.2", - "pkg-types": "^1.1.1", - "ufo": "^1.5.3" + "acorn": "^8.16.0", + "pathe": "^2.0.3", + "pkg-types": "^1.3.1", + "ufo": "^1.6.3" } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true, + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.20", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.20.tgz", + "integrity": "sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==", "funding": [ { "type": "github", @@ -2733,47 +3218,47 @@ } }, "node_modules/pathe": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", - "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", + "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", "dev": true, "license": "MIT" }, "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", + "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", "dev": true, "license": "MIT", "engines": { - "node": ">=8.6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" } }, "node_modules/pkg-types": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.3.tgz", - "integrity": "sha512-+JrgthZG6m3ckicaOB74TwQ+tBWsFl3qVQg7mN8ulwSOElJ7gBhKzj2VkCPnZ4NlF6kEquYU+RIYNVAvzd54UA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz", + "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==", "dev": true, "license": "MIT", "dependencies": { - "confbox": "^0.1.7", - "mlly": "^1.7.1", - "pathe": "^1.1.2" + "confbox": "^0.1.8", + "mlly": "^1.7.4", + "pathe": "^2.0.1" } }, "node_modules/postcss": { - "version": "8.4.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", - "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", + "version": "8.5.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.29.tgz", + "integrity": "sha512-49cGhUbXj8Qenv0iTMxA1cFBzxXoctpC9Ujd77t1WcbJIr6nF/eI7g/8MgxrYldFRuAXvja7xQRwavoW7kgrxQ==", "funding": [ { "type": "opencollective", @@ -2790,18 +3275,18 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.0.1", - "source-map-js": "^1.2.0" + "nanoid": "^3.3.19", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.2" }, "engines": { "node": "^10 || ^12 || >=14" } }, "node_modules/postcss-selector-parser": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz", - "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.4.tgz", + "integrity": "sha512-bIoJLOmjCO1S9XdY/DcnR5hJxvrDir1PbGChrzXG3vw0/FOliy/fA3dmdhQ441kah4gKv+TwckGzex6wNS5cnQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2823,9 +3308,9 @@ } }, "node_modules/prettier": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", - "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "version": "3.9.9", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.9.tgz", + "integrity": "sha512-Z/CJHIkdujO/OtN7nXUii0Rf3VT5SRuhjBA82Xvu2XhBUgX3nhP67T0LHceBdQLex7OOFGTox+Q5Yg8Jk2Qivg==", "dev": true, "license": "MIT", "bin": { @@ -2839,9 +3324,9 @@ } }, "node_modules/prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.1.tgz", + "integrity": "sha512-SxToR7P8Y2lWmv/kTzVLC1t/GDI2WGjMwNhLLE9qtH8Q13C+aEmuRlzDst4Up4s0Wc8sF2M+J57iB3cMLqftfg==", "dev": true, "license": "MIT", "dependencies": { @@ -2852,10 +3337,13 @@ } }, "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "license": "MIT" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz", + "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==", + "license": "MIT", + "engines": { + "node": ">=10" + } }, "node_modules/punycode": { "version": "2.3.1", @@ -2889,9 +3377,9 @@ "license": "MIT" }, "node_modules/rc-util": { - "version": "5.43.0", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.43.0.tgz", - "integrity": "sha512-AzC7KKOXFqAdIBqdGWepL9Xn7cm3vnAmjlHqUnoQaTMZYhM4VlXGLkkHHxj/BZ7Td0+SOPKB4RGPboBVKT9htw==", + "version": "5.44.4", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.44.4.tgz", + "integrity": "sha512-resueRJzmHG9Q6rI/DfK6Kdv9/Lfls05vzMs1Sk3M2P+3cJa+MakaZyWY8IPfehVuhPJFKrIY1IK4GqbiaiY5w==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.18.3", @@ -2903,30 +3391,26 @@ } }, "node_modules/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", - "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/react/-/react-19.3.0.tgz", + "integrity": "sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==", "license": "MIT", "peer": true, - "dependencies": { - "loose-envify": "^1.1.0" - }, "engines": { "node": ">=0.10.0" } }, "node_modules/react-dom": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", - "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.0.tgz", + "integrity": "sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==", "license": "MIT", "peer": true, "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.2" + "scheduler": "^0.28.0" }, "peerDependencies": { - "react": "^18.3.1" + "react": "^19.3.0" } }, "node_modules/react-is": { @@ -2948,11 +3432,18 @@ "node": ">=8.10.0" } }, - "node_modules/regenerator-runtime": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", - "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", - "license": "MIT" + "node_modules/readdirp/node_modules/picomatch": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } }, "node_modules/require-directory": { "version": "2.1.1", @@ -2981,9 +3472,9 @@ } }, "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", "dev": true, "license": "MIT", "engines": { @@ -3009,13 +3500,13 @@ } }, "node_modules/rollup": { - "version": "4.19.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.19.0.tgz", - "integrity": "sha512-5r7EYSQIowHsK4eTZ0Y81qpZuJz+MUuYeqmmYmRMl1nwhdmbiYqt5jwzf6u7wyOzJgYqtCRMtVRKOtHANBz7rA==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.64.0.tgz", + "integrity": "sha512-gjA/kFeDfffII8COoPsvLPvE16hWDTEc1+0QKQNKUkuV8iJjqsC4xXs8/FzuL0v9EV39kuxTbAgcFoTRyy2TGQ==", "dev": true, "license": "MIT", "dependencies": { - "@types/estree": "1.0.5" + "@types/estree": "1.0.9" }, "bin": { "rollup": "dist/bin/rollup" @@ -3025,34 +3516,44 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.19.0", - "@rollup/rollup-android-arm64": "4.19.0", - "@rollup/rollup-darwin-arm64": "4.19.0", - "@rollup/rollup-darwin-x64": "4.19.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.19.0", - "@rollup/rollup-linux-arm-musleabihf": "4.19.0", - "@rollup/rollup-linux-arm64-gnu": "4.19.0", - "@rollup/rollup-linux-arm64-musl": "4.19.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.19.0", - "@rollup/rollup-linux-riscv64-gnu": "4.19.0", - "@rollup/rollup-linux-s390x-gnu": "4.19.0", - "@rollup/rollup-linux-x64-gnu": "4.19.0", - "@rollup/rollup-linux-x64-musl": "4.19.0", - "@rollup/rollup-win32-arm64-msvc": "4.19.0", - "@rollup/rollup-win32-ia32-msvc": "4.19.0", - "@rollup/rollup-win32-x64-msvc": "4.19.0", + "@napi-rs/lzma-linux-x64-gnu": "1.5.1", + "@rollup/rollup-android-arm-eabi": "4.64.0", + "@rollup/rollup-android-arm64": "4.64.0", + "@rollup/rollup-darwin-arm64": "4.64.0", + "@rollup/rollup-darwin-x64": "4.64.0", + "@rollup/rollup-freebsd-arm64": "4.64.0", + "@rollup/rollup-freebsd-x64": "4.64.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.64.0", + "@rollup/rollup-linux-arm-musleabihf": "4.64.0", + "@rollup/rollup-linux-arm64-gnu": "4.64.0", + "@rollup/rollup-linux-arm64-musl": "4.64.0", + "@rollup/rollup-linux-loong64-gnu": "4.64.0", + "@rollup/rollup-linux-loong64-musl": "4.64.0", + "@rollup/rollup-linux-ppc64-gnu": "4.64.0", + "@rollup/rollup-linux-ppc64-musl": "4.64.0", + "@rollup/rollup-linux-riscv64-gnu": "4.64.0", + "@rollup/rollup-linux-riscv64-musl": "4.64.0", + "@rollup/rollup-linux-s390x-gnu": "4.64.0", + "@rollup/rollup-linux-x64-gnu": "4.64.0", + "@rollup/rollup-linux-x64-musl": "4.64.0", + "@rollup/rollup-openbsd-x64": "4.64.0", + "@rollup/rollup-openharmony-arm64": "4.64.0", + "@rollup/rollup-win32-arm64-msvc": "4.64.0", + "@rollup/rollup-win32-ia32-msvc": "4.64.0", + "@rollup/rollup-win32-x64-gnu": "4.64.0", + "@rollup/rollup-win32-x64-msvc": "4.64.0", "fsevents": "~2.3.2" } }, "node_modules/rollup-plugin-visualizer": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.12.0.tgz", - "integrity": "sha512-8/NU9jXcHRs7Nnj07PF2o4gjxmm9lXIrZ8r175bT9dK8qoLlvKTwRMArRCMgpMGlq8CTLugRvEmyMeMXIU2pNQ==", + "version": "5.14.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.14.0.tgz", + "integrity": "sha512-VlDXneTDaKsHIw8yzJAFWtrzguoJ/LnQ+lMpoVfYJ3jJF4Ihe5oYLAqLklIK/35lgUY+1yEzCkHyZ1j4A5w5fA==", "dev": true, "license": "MIT", "dependencies": { "open": "^8.4.0", - "picomatch": "^2.3.1", + "picomatch": "^4.0.2", "source-map": "^0.7.4", "yargs": "^17.5.1" }, @@ -3060,12 +3561,16 @@ "rollup-plugin-visualizer": "dist/bin/cli.js" }, "engines": { - "node": ">=14" + "node": ">=18" }, "peerDependencies": { + "rolldown": "1.x", "rollup": "2.x || 3.x || 4.x" }, "peerDependenciesMeta": { + "rolldown": { + "optional": true + }, "rollup": { "optional": true } @@ -3096,14 +3601,11 @@ } }, "node_modules/scheduler": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", - "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz", + "integrity": "sha512-juorfCmIkIw8tT+p5BXSm6PJjQF/ycEYmKyzURCIt/RaZIhL+PulbQ9Yu2z1HdOJDdqDTlxA1+xKBmHXJsczAw==", "license": "MIT", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0" - } + "peer": true }, "node_modules/scroll-into-view-if-needed": { "version": "2.2.31", @@ -3115,9 +3617,9 @@ } }, "node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "dev": true, "license": "ISC", "bin": { @@ -3157,19 +3659,19 @@ } }, "node_modules/source-map": { - "version": "0.7.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", - "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "version": "0.7.6", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz", + "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==", "dev": true, "license": "BSD-3-Clause", "engines": { - "node": ">= 8" + "node": ">= 12" } }, "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.2.tgz", + "integrity": "sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==", "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -3217,9 +3719,9 @@ } }, "node_modules/stylis": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.2.tgz", - "integrity": "sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.4.0.tgz", + "integrity": "sha512-5Z9ZpRzfuH6l/UAvCPAPUo3665Nk2wLaZU3x+TLHKVzIz33+sbJqbtrYoC3KD4/uVOr2Zp+L0LySezP9OHV9yA==", "license": "MIT" }, "node_modules/supports-color": { @@ -3236,20 +3738,19 @@ } }, "node_modules/synckit": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz", - "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.13.tgz", + "integrity": "sha512-eNRKgb3z66Yp3D2CixVujOUvXLFUTij/zVnV8KRyvFdQwpz7I5DS8UfRkTeLzb64u+dkzDSdelE24izu+zSSUg==", "dev": true, "license": "MIT", "dependencies": { - "@pkgr/core": "^0.1.0", - "tslib": "^2.6.2" + "@pkgr/core": "^0.3.6" }, "engines": { "node": "^14.18.0 || >=16.0.0" }, "funding": { - "url": "https://opencollective.com/unts" + "url": "https://opencollective.com/synckit" } }, "node_modules/text-table": { @@ -3281,13 +3782,6 @@ "node": ">=8.0" } }, - "node_modules/tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==", - "dev": true, - "license": "0BSD" - }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -3315,45 +3809,43 @@ } }, "node_modules/ufo": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz", - "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==", + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.4.tgz", + "integrity": "sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==", "dev": true, "license": "MIT" }, "node_modules/unplugin": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.11.0.tgz", - "integrity": "sha512-3r7VWZ/webh0SGgJScpWl2/MRCZK5d3ZYFcNaeci/GQ7Teop7zf0Nl2pUuz7G21BwPd9pcUPOC5KmJ2L3WgC5g==", + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.16.1.tgz", + "integrity": "sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==", "dev": true, "license": "MIT", "dependencies": { - "acorn": "^8.11.3", - "chokidar": "^3.6.0", - "webpack-sources": "^3.2.3", - "webpack-virtual-modules": "^0.6.1" + "acorn": "^8.14.0", + "webpack-virtual-modules": "^0.6.2" }, "engines": { "node": ">=14.0.0" } }, "node_modules/unplugin-vue-components": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/unplugin-vue-components/-/unplugin-vue-components-0.27.3.tgz", - "integrity": "sha512-5wg7lbdg5ZcrAQNzyYK+6gcg/DG8K6rO+f5YeuvqGHs/PhpapBvpA4O/0ex/pFthE5WgRk43iWuRZEMLVsdz4Q==", + "version": "0.27.5", + "resolved": "https://registry.npmjs.org/unplugin-vue-components/-/unplugin-vue-components-0.27.5.tgz", + "integrity": "sha512-m9j4goBeNwXyNN8oZHHxvIIYiG8FQ9UfmKWeNllpDvhU7btKNNELGPt+o3mckQKuPwrE7e0PvCsx+IWuDSD9Vg==", "dev": true, "license": "MIT", "dependencies": { "@antfu/utils": "^0.7.10", - "@rollup/pluginutils": "^5.1.0", + "@rollup/pluginutils": "^5.1.3", "chokidar": "^3.6.0", - "debug": "^4.3.5", + "debug": "^4.3.7", "fast-glob": "^3.3.2", - "local-pkg": "^0.5.0", - "magic-string": "^0.30.10", + "local-pkg": "^0.5.1", + "magic-string": "^0.30.14", "minimatch": "^9.0.5", - "mlly": "^1.7.1", - "unplugin": "^1.11.0" + "mlly": "^1.7.3", + "unplugin": "^1.16.0" }, "engines": { "node": ">=14" @@ -3376,9 +3868,9 @@ } }, "node_modules/unplugin-vue-components/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz", + "integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==", "dev": true, "license": "MIT", "dependencies": { @@ -3386,13 +3878,13 @@ } }, "node_modules/unplugin-vue-components/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", "dev": true, "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^2.0.2" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -3419,15 +3911,15 @@ "license": "MIT" }, "node_modules/vite": { - "version": "5.3.4", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.4.tgz", - "integrity": "sha512-Cw+7zL3ZG9/NZBB8C+8QbQZmR54GwqIz+WMI4b3JgdYJvX+ny9AjJXqkGQlDXSXRP9rP0B4tbciRMOVEKulVOA==", + "version": "5.4.21", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz", + "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==", "dev": true, "license": "MIT", "dependencies": { "esbuild": "^0.21.3", - "postcss": "^8.4.39", - "rollup": "^4.13.0" + "postcss": "^8.4.43", + "rollup": "^4.20.0" }, "bin": { "vite": "bin/vite.js" @@ -3446,6 +3938,7 @@ "less": "*", "lightningcss": "^1.21.0", "sass": "*", + "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.4.0" @@ -3463,6 +3956,9 @@ "sass": { "optional": true }, + "sass-embedded": { + "optional": true + }, "stylus": { "optional": true }, @@ -3475,16 +3971,16 @@ } }, "node_modules/vue": { - "version": "3.4.33", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.33.tgz", - "integrity": "sha512-VdMCWQOummbhctl4QFMcW6eNtXHsFyDlX60O/tsSQuCcuDOnJ1qPOhhVla65Niece7xq/P2zyZReIO5mP+LGTQ==", + "version": "3.5.43", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.43.tgz", + "integrity": "sha512-o5qZoksdnjIKvW1srZ3ab7pcDNYAerBjRe54D0LBLfRdCYFrSgBHVXokMas35czQc0//lmx4/tuY4ZNQ+Rf2Ng==", "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.4.33", - "@vue/compiler-sfc": "3.4.33", - "@vue/runtime-dom": "3.4.33", - "@vue/server-renderer": "3.4.33", - "@vue/shared": "3.4.33" + "@vue/compiler-dom": "3.5.43", + "@vue/compiler-sfc": "3.5.43", + "@vue/runtime-dom": "3.5.43", + "@vue/server-renderer": "3.5.43", + "@vue/shared": "3.5.43" }, "peerDependencies": { "typescript": "*" @@ -3521,12 +4017,14 @@ } }, "node_modules/vue-i18n": { - "version": "10.0.5", - "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-10.0.5.tgz", - "integrity": "sha512-9/gmDlCblz3i8ypu/afiIc/SUIfTTE1mr0mZhb9pk70xo2csHAM9mp2gdQ3KD2O0AM3Hz/5ypb+FycTj/lHlPQ==", + "version": "10.0.8", + "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-10.0.8.tgz", + "integrity": "sha512-mIjy4utxMz9lMMo6G9vYePv7gUFt4ztOMhY9/4czDJxZ26xPeJ49MAGa9wBAE3XuXbYCrtVPmPxNjej7JJJkZQ==", + "deprecated": "v9 and v10 no longer supported. please migrate to v11. about maintenance status, see https://vue-i18n.intlify.dev/guide/maintenance.html", + "license": "MIT", "dependencies": { - "@intlify/core-base": "10.0.5", - "@intlify/shared": "10.0.5", + "@intlify/core-base": "10.0.8", + "@intlify/shared": "10.0.8", "@vue/devtools-api": "^6.5.0" }, "engines": { @@ -3540,18 +4038,18 @@ } }, "node_modules/vue-router": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.4.0.tgz", - "integrity": "sha512-HB+t2p611aIZraV2aPSRNXf0Z/oLZFrlygJm+sZbdJaW6lcFqEDQwnzUBXn+DApw+/QzDU/I9TeWx9izEjTmsA==", + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.6.4.tgz", + "integrity": "sha512-Hz9q5sa33Yhduglwz6g9skT8OBPii+4bFn88w6J+J4MfEo4KRRpmiNG/hHHkdbRFlLBOqxN8y8gf2Fb0MTUgVg==", "license": "MIT", "dependencies": { - "@vue/devtools-api": "^6.5.1" + "@vue/devtools-api": "^6.6.4" }, "funding": { "url": "https://github.com/sponsors/posva" }, "peerDependencies": { - "vue": "^3.2.0" + "vue": "^3.5.0" } }, "node_modules/vue-types": { @@ -3578,16 +4076,6 @@ "loose-envify": "^1.0.0" } }, - "node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/webpack-virtual-modules": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz", @@ -3667,9 +4155,9 @@ } }, "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "version": "17.7.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz", + "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==", "dev": true, "license": "MIT", "dependencies": { diff --git a/frontend/package.json b/frontend/package.json index fa5aea8..4fa707f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -13,9 +13,9 @@ "dependencies": { "@ant-design/icons": "^5.4.0", "ant-design-vue": "^4.2.3", - "axios": "^1.7.2", - "vue": "^3.4.29", - "vue-i18n": "^10.0.5", + "axios": "^1.20.0", + "vue": "^3.5.43", + "vue-i18n": "^10.0.8", "vue-router": "^4.4.0" }, "devDependencies": { @@ -27,6 +27,6 @@ "prettier": "^3.2.5", "rollup-plugin-visualizer": "^5.12.0", "unplugin-vue-components": "^0.27.3", - "vite": "^5.3.1" + "vite": "^5.4.21" } } From fa69c993f6379a845ab277a8a6034440d138fc1b Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:12:48 +0800 Subject: [PATCH 03/36] fix(location): verify TLS and bound IP lookup resources --- candy/location.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/candy/location.go b/candy/location.go index 56b52c4..eb36d8b 100644 --- a/candy/location.go +++ b/candy/location.go @@ -1,10 +1,11 @@ package candy import ( - "crypto/tls" "net" "net/http" "path" + "sync" + "time" "github.com/ipinfo/go/v2/ipinfo" "github.com/ipinfo/go/v2/ipinfo/cache" @@ -16,7 +17,7 @@ import ( ) func GetLocation(ip net.IP) (country, region string) { - if !ip.IsPrivate() { + if ip != nil && ip.IsGlobalUnicast() && !ip.IsPrivate() { ok := false if country, region, ok = ipdbLocation(ip); !ok { if country, region, ok = mmdbLocation(ip); !ok { @@ -28,11 +29,12 @@ func GetLocation(ip net.IP) (country, region string) { } type dummyCacheEngine struct { + mutex sync.Mutex cache map[string]interface{} } var dummyCache = ipinfo.NewCache(newDummyCacheEngine()) -var httpClient = &http.Client{Transport: &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}} +var httpClient = &http.Client{Timeout: 5 * time.Second} func newDummyCacheEngine() *dummyCacheEngine { return &dummyCacheEngine{ @@ -41,6 +43,8 @@ func newDummyCacheEngine() *dummyCacheEngine { } func (c *dummyCacheEngine) Get(key string) (interface{}, error) { + c.mutex.Lock() + defer c.mutex.Unlock() if v, ok := c.cache[key]; ok { return v, nil } @@ -48,6 +52,15 @@ func (c *dummyCacheEngine) Get(key string) (interface{}, error) { } func (c *dummyCacheEngine) Set(key string, value interface{}) error { + c.mutex.Lock() + defer c.mutex.Unlock() + if len(c.cache) >= 4096 { + // Bound metadata growth when peers advertise many public addresses. + for oldKey := range c.cache { + delete(c.cache, oldKey) + break + } + } c.cache[key] = value return nil } From 91dc89e62c306eb46d0485412dcfad31b3d7ecb3 Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:23:51 +0800 Subject: [PATCH 04/36] fix(dev): default the frontend proxy and listener to localhost --- frontend/README.md | 7 +++++++ frontend/vite.config.js | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/README.md b/frontend/README.md index 33ed729..b43a793 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -22,6 +22,13 @@ npm install npm run dev ``` +The development server binds to `127.0.0.1` and proxies `/api` to +`http://127.0.0.1:80`, matching the backend's default HTTP listener. Set the +`CACAO_DEV_API_TARGET` environment variable before `npm run dev` to use a +different local backend URL. Use a server you control: login passwords and +session cookies are sent to this target. +Deploy the production build with the Cacao backend for public access. + ### Compile and Minify for Production ```sh diff --git a/frontend/vite.config.js b/frontend/vite.config.js index b6864fa..3faf806 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -1,4 +1,5 @@ import { fileURLToPath, URL } from 'node:url' +import process from 'node:process' import { defineConfig } from 'vite' import vue from '@vitejs/plugin-vue' @@ -25,9 +26,11 @@ export default defineConfig({ } }, server: { + host: '127.0.0.1', proxy: { - '/api': 'https://canets.org' + '/api': process.env.CACAO_DEV_API_TARGET || 'http://127.0.0.1:80' } }, + preview: { host: '127.0.0.1' }, build: { chunkSizeWarningLimit: 1024 } }) From cabd8124f7e8a7bfa763566df63057d0514ad9bc Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:23:54 +0800 Subject: [PATCH 05/36] fix(api): enforce authorization on registered private routes --- api/admin.go | 41 ++++++++++++++++--------------- api/user.go | 16 +++--------- main.go | 69 +++++++++++++++++++++++++++++++++------------------- main_test.go | 39 +++++++++++++++++++++++++++++ 4 files changed, 107 insertions(+), 58 deletions(-) create mode 100644 main_test.go diff --git a/api/admin.go b/api/admin.go index 3c1ebaf..90c439d 100644 --- a/api/admin.go +++ b/api/admin.go @@ -14,27 +14,28 @@ import ( func AdminMiddleware() gin.HandlerFunc { return func(c *gin.Context) { - path := c.Request.URL.String() - if strings.HasPrefix(path, "/api/") { - if user, ok := c.Get("user"); ok { - user := user.(*model.User) - if strings.HasPrefix(path, "/api/admin/") { - if user.Role == "admin" { - c.Next() - } else { - setErrorCode(c, PermissionDenied) - c.Abort() - } - } else if path == "/api/user/info" || path == "/api/user/logout" { - c.Next() - } else if user.Role == "normal" { - c.Next() - } else { - setErrorCode(c, PermissionDenied) - c.Abort() - } - } + value, ok := c.Get("user") + user, valid := value.(*model.User) + if !ok || !valid || user == nil { + setErrorCode(c, NotLoggedIn) + c.Abort() + return } + path := c.FullPath() + allowed := false + if strings.HasPrefix(path, "/api/admin/") { + allowed = user.Role == "admin" + } else if path == "/api/user/info" || path == "/api/user/logout" || path == "/api/user/changePassword" { + allowed = user.Role == "admin" || user.Role == "normal" + } else { + allowed = user.Role == "normal" + } + if !allowed { + setErrorCode(c, PermissionDenied) + c.Abort() + return + } + c.Next() } } diff --git a/api/user.go b/api/user.go index 78f95cb..e4ac755 100644 --- a/api/user.go +++ b/api/user.go @@ -1,31 +1,21 @@ package api import ( - "crypto/sha256" - "fmt" - "math/rand" "strconv" - "strings" "time" + "crypto/sha256" + "fmt" "github.com/gin-gonic/gin" "github.com/google/uuid" "github.com/lanthora/cacao/candy" "github.com/lanthora/cacao/model" "github.com/lanthora/cacao/storage" + "math/rand" ) func LoginMiddleware() gin.HandlerFunc { return func(c *gin.Context) { - path := c.Request.URL.String() - if !strings.HasPrefix(path, "/api/") { - c.Next() - return - } - if path == "/api/user/register" || path == "/api/user/login" { - c.Next() - return - } idstr, errid := c.Cookie("id") token, errtoken := c.Cookie("token") if errid != nil || errtoken != nil || len(idstr) == 0 || len(token) == 0 { diff --git a/main.go b/main.go index 3497f99..500d21e 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,9 @@ package main import ( + "net/http" "path" + "strings" "github.com/gin-gonic/gin" "github.com/lanthora/cacao/api" @@ -17,10 +19,39 @@ func init() { } func main() { + r, err := newRouter("") + if err != nil { + logger.Fatal("router initialization failed: %v", err) + } + + storageDir := argp.Get("storage", ".") + crtFilename, findCrtErr := util.FindFileByExtFromDir(storageDir, ".crt") + keyFilename, findKeyErr := util.FindFileByExtFromDir(storageDir, ".key") + if findCrtErr == nil && findKeyErr == nil { + addr := argp.Get("listen", ":443") + logger.Info("listen=[%v]", addr) + if err := r.RunTLS(addr, path.Join(storageDir, crtFilename), path.Join(storageDir, keyFilename)); err != nil { + logger.Fatal("tls service run failed: %v", err) + } + } else { + addr := argp.Get("listen", ":80") + logger.Info("listen=[%v]", addr) + if err := r.Run(addr); err != nil { + logger.Fatal("service run failed: %v", err) + } + } +} + +func newRouter(trustedProxies string) (*gin.Engine, error) { r := gin.New() - r.Use(candy.WebsocketMiddleware(), api.LoginMiddleware(), api.AdminMiddleware()) + r.Use(candy.WebsocketMiddleware()) + + public := r.Group("/api") + public.POST("/user/register", api.UserRegister) + public.POST("/user/login", api.UserLogin) + protected := public.Group("", api.LoginMiddleware(), api.AdminMiddleware()) - admin := r.Group("/api/admin") + admin := protected.Group("/admin") admin.POST("/showUsers", api.AdminShowUsers) admin.POST("/addUser", api.AdminAddUser) admin.POST("/deleteUser", api.AdminDeleteUser) @@ -35,45 +66,33 @@ func main() { admin.POST("/setInactiveUserThresholdConfig", api.AdminSetInactiveUserThresholdConfig) admin.POST("/cleanInactiveUser", api.AdminCleanInactiveUser) - user := r.Group("/api/user") + user := protected.Group("/user") user.POST("/info", api.UserInfo) user.POST("/statistics", api.UserStatistics) - user.POST("/register", api.UserRegister) - user.POST("/login", api.UserLogin) user.POST("/changePassword", api.ChangePassword) user.POST("/logout", api.UserLogout) - net := r.Group("/api/net") + net := protected.Group("/net") net.POST("/show", api.NetShow) net.POST("/insert", api.NetInsert) net.POST("/edit", api.NetEdit) net.POST("/delete", api.NetDelete) - device := r.Group("/api/device") + device := protected.Group("/device") device.POST("/show", api.DeviceShow) device.POST("/delete", api.DeviceDelete) - route := r.Group("/api/route") + route := protected.Group("/route") route.POST("/show", api.RouteShow) route.POST("/insert", api.RouteInsert) route.POST("/delete", api.RouteDelete) - r.NoRoute(frontend.Static) - - storageDir := argp.Get("storage", ".") - crtFilename, findCrtErr := util.FindFileByExtFromDir(storageDir, ".crt") - keyFilename, findKeyErr := util.FindFileByExtFromDir(storageDir, ".key") - if findCrtErr == nil && findKeyErr == nil { - addr := argp.Get("listen", ":443") - logger.Info("listen=[%v]", addr) - if err := r.RunTLS(addr, path.Join(storageDir, crtFilename), path.Join(storageDir, keyFilename)); err != nil { - logger.Fatal("tls service run failed: %v", err) + r.NoRoute(func(c *gin.Context) { + if c.Request.URL.Path == "/api" || strings.HasPrefix(c.Request.URL.Path, "/api/") { + c.AbortWithStatus(http.StatusNotFound) + return } - } else { - addr := argp.Get("listen", ":80") - logger.Info("listen=[%v]", addr) - if err := r.Run(addr); err != nil { - logger.Fatal("service run failed: %v", err) - } - } + frontend.Static(c) + }) + return r, nil } diff --git a/main_test.go b/main_test.go new file mode 100644 index 0000000..6e8ac40 --- /dev/null +++ b/main_test.go @@ -0,0 +1,39 @@ +package main + +import ( + "encoding/json" + "net/http/httptest" + "testing" +) + +func TestEveryPrivateAPIRouteRequiresAuthentication(t *testing.T) { + router, err := newRouter("") + if err != nil { + t.Fatal(err) + } + checked := 0 + for _, route := range router.Routes() { + if route.Path == "/api/user/login" || route.Path == "/api/user/register" { + continue + } + checked++ + t.Run(route.Path, func(t *testing.T) { + // Query strings must never affect the authorization policy. + request := httptest.NewRequest(route.Method, route.Path+"?next=/api/user/login", nil) + response := httptest.NewRecorder() + router.ServeHTTP(response, request) + var body struct { + Status int `json:"status"` + } + if err := json.Unmarshal(response.Body.Bytes(), &body); err != nil { + t.Fatalf("invalid authentication response: %v (%s)", err, response.Body.String()) + } + if body.Status != 2 { + t.Fatalf("anonymous request reached private route: status=%d body=%s", response.Code, response.Body.String()) + } + }) + } + if checked == 0 { + t.Fatal("no private API routes were checked") + } +} From e2f418e4ee8016697ac5b0d9aa2669d8d0c203d9 Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:24:00 +0800 Subject: [PATCH 06/36] fix(auth): expire, hash and revoke web sessions --- api/admin.go | 10 ++-- api/security.go | 51 +++++++++++++++++ api/security_test.go | 127 +++++++++++++++++++++++++++++++++++++++++++ api/user.go | 74 +++++++++++++++++-------- model/user.go | 22 ++++---- 5 files changed, 248 insertions(+), 36 deletions(-) create mode 100644 api/security.go create mode 100644 api/security_test.go diff --git a/api/admin.go b/api/admin.go index 90c439d..74ba050 100644 --- a/api/admin.go +++ b/api/admin.go @@ -6,7 +6,6 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/google/uuid" "github.com/lanthora/cacao/candy" "github.com/lanthora/cacao/model" "github.com/lanthora/cacao/storage" @@ -105,7 +104,6 @@ func AdminAddUser(c *gin.Context) { user := model.User{ Name: request.Username, Password: hashUserPassword(request.Username, request.Password), - Token: uuid.NewString(), Role: "normal", } @@ -180,8 +178,12 @@ func AdminUpdateUserPassword(c *gin.Context) { setErrorCode(c, Unexpected) return } - user.Password = hashUserPassword(user.Name, request.Password) - user.Save() + if err := db.Model(&model.User{}).Where("id = ?", user.ID).Updates(map[string]interface{}{ + "password": hashUserPassword(user.Name, request.Password), "token": "", "token_expires_at": nil, + }).Error; err != nil { + setErrorCode(c, Unexpected) + return + } setResponseData(c, nil) } diff --git a/api/security.go b/api/security.go new file mode 100644 index 0000000..0e621de --- /dev/null +++ b/api/security.go @@ -0,0 +1,51 @@ +package api + +import ( + "crypto/sha256" + "crypto/subtle" + "encoding/hex" + "net/http" + "strconv" + "strings" + "time" + + "github.com/gin-gonic/gin" + "github.com/google/uuid" + "github.com/lanthora/cacao/argp" + "github.com/lanthora/cacao/model" +) + +const sessionLifetime = 24 * time.Hour + +func hashSessionToken(token string) string { + digest := sha256.Sum256([]byte(token)) + return "sha256:" + hex.EncodeToString(digest[:]) +} + +func validSessionToken(stored, supplied string) bool { + if strings.HasPrefix(stored, "sha256:") { + supplied = hashSessionToken(supplied) + } + return stored != "" && subtle.ConstantTimeCompare([]byte(stored), []byte(supplied)) == 1 +} + +func newSession(user *model.User) string { + token := uuid.NewString() + expires := time.Now().Add(sessionLifetime) + user.Token = hashSessionToken(token) + user.TokenExpiresAt = &expires + return token +} + +func setSessionCookies(c *gin.Context, userID uint, token string, maxAge int) { + // Behind TLS termination, explicitly set --secure-cookies=true. Never trust + // an arbitrary X-Forwarded-Proto header to make this decision. + secure := c.Request.TLS != nil || argp.Get("secure-cookies", "false") == "true" + c.SetSameSite(http.SameSiteLaxMode) + id := "" + if maxAge > 0 { + id = strconv.FormatUint(uint64(userID), 10) + } + c.SetCookie("id", id, maxAge, "/", "", secure, true) + c.SetCookie("token", token, maxAge, "/", "", secure, true) +} diff --git a/api/security_test.go b/api/security_test.go new file mode 100644 index 0000000..4daedbc --- /dev/null +++ b/api/security_test.go @@ -0,0 +1,127 @@ +package api + +import ( + "crypto/sha256" + "crypto/tls" + "encoding/hex" + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "strings" + "testing" + "time" + + "github.com/gin-gonic/gin" + "github.com/google/uuid" + "github.com/lanthora/cacao/model" + "github.com/lanthora/cacao/storage" +) + +func securityRouter() *gin.Engine { + gin.SetMode(gin.TestMode) + r := gin.New() + r.SetTrustedProxies(nil) + r.POST("/api/user/login", UserLogin) + r.POST("/api/user/register", UserRegister) + protected := r.Group("/api", LoginMiddleware(), AdminMiddleware()) + protected.POST("/user/info", UserInfo) + protected.POST("/user/logout", UserLogout) + protected.POST("/user/changePassword", ChangePassword) + protected.POST("/admin/updateUserPassword", AdminUpdateUserPassword) + protected.POST("/admin/showUsers", AdminShowUsers) + protected.POST("/net/delete", NetDelete) + protected.POST("/device/delete", DeviceDelete) + protected.POST("/route/delete", RouteDelete) + return r +} + +func securityRequest(t *testing.T, r http.Handler, path, body string, cookies ...*http.Cookie) (*httptest.ResponseRecorder, int) { + t.Helper() + req := httptest.NewRequest(http.MethodPost, path, strings.NewReader(body)) + req.Header.Set("Content-Type", "application/json") + req.RemoteAddr = "192.0.2.10:12345" + for _, cookie := range cookies { + req.AddCookie(cookie) + } + w := httptest.NewRecorder() + r.ServeHTTP(w, req) + var response struct { + Status int `json:"status"` + } + if err := json.Unmarshal(w.Body.Bytes(), &response); err != nil { + t.Fatalf("invalid response: %s: %v", w.Body.String(), err) + } + return w, response.Status +} + +func testUser(t *testing.T, role string) (model.User, []*http.Cookie) { + t.Helper() + u := model.User{Name: "test" + strings.ReplaceAll(uuid.NewString(), "-", "")[:20], Role: role} + digest := sha256.Sum256([]byte(u.Name + ":old-password")) + u.Password = hex.EncodeToString(digest[:]) + token := newSession(&u) + if err := storage.Get().Create(&u).Error; err != nil { + t.Fatal(err) + } + t.Cleanup(func() { storage.Get().Unscoped().Delete(&u) }) + return u, []*http.Cookie{{Name: "id", Value: fmt.Sprint(u.ID)}, {Name: "token", Value: token}} +} + +func TestSessionAuthorization(t *testing.T) { + r := securityRouter() + u, cookies := testUser(t, "normal") + for _, path := range []string{"/api/user/info", "/api/admin/showUsers", "/api/net/delete", "/api/device/delete", "/api/route/delete"} { + if _, status := securityRequest(t, r, path, "{}"); status != NotLoggedIn { + t.Fatalf("anonymous %s: %d", path, status) + } + } + if _, status := securityRequest(t, r, "/api/user/info?cache=1", "{}", cookies...); status != Success { + t.Fatalf("query-string session failed: %d", status) + } + if _, status := securityRequest(t, r, "/api/admin/showUsers?cache=1", "{}", cookies...); status != PermissionDenied { + t.Fatalf("normal user reached admin: %d", status) + } + if _, status := securityRequest(t, r, "/api/user/info", "{}", &http.Cookie{Name: "id", Value: "0"}, cookies[1]); status != NotLoggedIn { + t.Fatal("zero user ID accepted") + } + if _, status := securityRequest(t, r, "/api/user/info", "{}", cookies[0], &http.Cookie{Name: "token", Value: u.Token}); status != NotLoggedIn { + t.Fatal("database token digest accepted as cookie") + } + storage.Get().Model(&u).Update("token_expires_at", time.Now().Add(-time.Second)) + if _, status := securityRequest(t, r, "/api/user/info", "{}", cookies...); status != NotLoggedIn { + t.Fatal("expired session accepted") + } +} + +func TestLegacySessionUpgradeAndLogout(t *testing.T) { + r := securityRouter() + u, cookies := testUser(t, "normal") + storage.Get().Model(&u).Update("token", cookies[1].Value) + if _, status := securityRequest(t, r, "/api/user/info", "{}", cookies...); status != Success { + t.Fatalf("legacy session rejected: %d", status) + } + storage.Get().First(&u, u.ID) + if !strings.HasPrefix(u.Token, "sha256:") { + t.Fatal("legacy token not migrated") + } + if _, status := securityRequest(t, r, "/api/user/logout", "{}", cookies...); status != Success { + t.Fatalf("logout failed: %d", status) + } + model.RefreshUserLastActiveTimeByUserID(u.ID) + if _, status := securityRequest(t, r, "/api/user/info", "{}", cookies...); status != NotLoggedIn { + t.Fatal("logout token survived activity refresh") + } +} + +func TestCookiesSecureWithTLS(t *testing.T) { + c, _ := gin.CreateTestContext(httptest.NewRecorder()) + c.Request = httptest.NewRequest(http.MethodPost, "https://example.test/", nil) + c.Request.TLS = &tls.ConnectionState{} + setSessionCookies(c, 1, "test-token", 86400) + for _, value := range c.Writer.Header().Values("Set-Cookie") { + if !strings.Contains(value, "Secure") || !strings.Contains(value, "HttpOnly") || !strings.Contains(value, "SameSite=Lax") { + t.Fatalf("unsafe TLS cookie: %s", value) + } + } +} diff --git a/api/user.go b/api/user.go index e4ac755..0ec1d81 100644 --- a/api/user.go +++ b/api/user.go @@ -2,12 +2,12 @@ package api import ( "strconv" + "strings" "time" "crypto/sha256" "fmt" "github.com/gin-gonic/gin" - "github.com/google/uuid" "github.com/lanthora/cacao/candy" "github.com/lanthora/cacao/model" "github.com/lanthora/cacao/storage" @@ -24,7 +24,7 @@ func LoginMiddleware() gin.HandlerFunc { return } id, err := strconv.ParseUint(idstr, 10, 64) - if err != nil { + if err != nil || id == 0 || uint64(uint(id)) != id || len(token) > 128 { setErrorCode(c, NotLoggedIn) c.Abort() return @@ -33,12 +33,31 @@ func LoginMiddleware() gin.HandlerFunc { user.ID = uint(id) db := storage.Get() - result := db.Where(user).Take(user) - if result.Error != nil || user.Token != token { + result := db.Where("id = ?", id).Take(user) + if result.Error != nil || !validSessionToken(user.Token, token) || user.TokenExpiresAt == nil || !time.Now().Before(*user.TokenExpiresAt) { setErrorCode(c, NotLoggedIn) c.Abort() return } + if !strings.HasPrefix(user.Token, "sha256:") { + // Upgrade stored legacy tokens without changing the browser cookie. + result := db.Model(&model.User{}).Where("id = ? AND token = ?", user.ID, user.Token).UpdateColumn("token", hashSessionToken(token)) + if result.Error != nil { + setErrorCode(c, Unexpected) + c.Abort() + return + } + if result.RowsAffected == 0 { + // Another request may have migrated or revoked this session. + if db.Where("id = ?", id).Take(user).Error != nil || !validSessionToken(user.Token, token) || user.TokenExpiresAt == nil || !time.Now().Before(*user.TokenExpiresAt) { + setErrorCode(c, NotLoggedIn) + c.Abort() + return + } + } else { + user.Token = hashSessionToken(token) + } + } c.Set("user", user) c.Next() } @@ -121,18 +140,18 @@ func UserRegister(c *gin.Context) { user := model.User{ Name: request.Username, Password: hashUserPassword(request.Username, request.Password), - Token: uuid.NewString(), Role: role, IP: c.ClientIP(), } + token := newSession(&user) + if result := db.Create(&user); result.Error != nil { setUnexpectedMessage(c, result.Error.Error()) return } - c.SetCookie("id", strconv.FormatUint(uint64(user.ID), 10), 86400, "/", "", false, true) - c.SetCookie("token", user.Token, 86400, "/", "", false, true) + setSessionCookies(c, user.ID, token, int(sessionLifetime.Seconds())) setResponseData(c, gin.H{ "name": user.Name, @@ -182,11 +201,16 @@ func UserLogin(c *gin.Context) { user.IP = c.ClientIP() } - user.Token = uuid.NewString() - user.Save() - - c.SetCookie("id", strconv.FormatUint(uint64(user.ID), 10), 86400, "/", "", false, true) - c.SetCookie("token", user.Token, 86400, "/", "", false, true) + previousPassword := user.Password + token := newSession(&user) + result := db.Model(&model.User{}).Where("id = ? AND password = ?", user.ID, previousPassword).Updates(map[string]interface{}{ + "password": user.Password, "token": user.Token, "token_expires_at": user.TokenExpiresAt, "ip": user.IP, + }) + if result.Error != nil || result.RowsAffected != 1 { + setErrorCode(c, IncorrectUsernameOrPassword) + return + } + setSessionCookies(c, user.ID, token, int(sessionLifetime.Seconds())) setResponseData(c, gin.H{ "name": user.Name, @@ -196,11 +220,12 @@ func UserLogin(c *gin.Context) { func UserLogout(c *gin.Context) { user := c.MustGet("user").(*model.User) - user.Token = uuid.NewString() - user.Save() - - c.SetCookie("id", "", -1, "/", "", false, true) - c.SetCookie("token", "", -1, "/", "", false, true) + result := storage.Get().Model(&model.User{}).Where("id = ? AND token = ?", user.ID, user.Token).Updates(map[string]interface{}{"token": "", "token_expires_at": nil}) + if result.Error != nil { + setErrorCode(c, Unexpected) + return + } + setSessionCookies(c, 0, "", -1) setResponseData(c, nil) } @@ -227,12 +252,17 @@ func ChangePassword(c *gin.Context) { return } + previousPassword, previousToken := user.Password, user.Token user.Password = hashUserPassword(user.Name, request.NewPassword) - user.Token = uuid.NewString() - user.Save() - - c.SetCookie("id", strconv.FormatUint(uint64(user.ID), 10), 86400, "/", "", false, true) - c.SetCookie("token", user.Token, 86400, "/", "", false, true) + token := newSession(user) + result := storage.Get().Model(&model.User{}).Where("id = ? AND password = ? AND token = ?", user.ID, previousPassword, previousToken).Updates(map[string]interface{}{ + "password": user.Password, "token": user.Token, "token_expires_at": user.TokenExpiresAt, + }) + if result.Error != nil || result.RowsAffected != 1 { + setErrorCode(c, NotLoggedIn) + return + } + setSessionCookies(c, user.ID, token, int(sessionLifetime.Seconds())) setResponseData(c, nil) } diff --git a/model/user.go b/model/user.go index 8279a5e..c566cf8 100644 --- a/model/user.go +++ b/model/user.go @@ -14,15 +14,20 @@ func init() { if err != nil { logger.Fatal("auto migrate users failed: %v", err) } + // Give existing sessions a one-time grace period when upgrading. + if err := db.Model(&User{}).Where("token <> ? AND token_expires_at IS NULL", "").UpdateColumn("token_expires_at", time.Now().Add(24*time.Hour)).Error; err != nil { + logger.Fatal("migrate session expiry failed: %v", err) + } } type User struct { gorm.Model - Name string `gorm:"index"` - Password string - Token string - Role string - IP string + Name string `gorm:"index"` + Password string + Token string + TokenExpiresAt *time.Time + Role string + IP string } func (u *User) Save() { @@ -60,10 +65,7 @@ func GetLastActiveTimeByUserID(userid uint) time.Time { func RefreshUserLastActiveTimeByUserID(userid uint) { if userid != 0 { db := storage.Get() - u := &User{Model: gorm.Model{ID: userid}} - if result := db.Model(u).Take(&u); result.Error == nil { - u.UpdatedAt = time.Now() - u.Save() - } + // Updating activity must never restore a concurrently revoked session. + db.Model(&User{}).Where("id = ?", userid).UpdateColumn("updated_at", time.Now()) } } From 9311e0e5a5a1d11c880f6ffc3d83351daaeaacd2 Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:24:05 +0800 Subject: [PATCH 07/36] fix(auth): migrate password hashes and use secure random secrets --- api/security.go | 30 ++++++++++++++++++++++++ api/security_test.go | 55 ++++++++++++++++++++++++++++++++++++++++++++ api/user.go | 33 ++++++++------------------ 3 files changed, 94 insertions(+), 24 deletions(-) diff --git a/api/security.go b/api/security.go index 0e621de..8e12251 100644 --- a/api/security.go +++ b/api/security.go @@ -1,8 +1,10 @@ package api import ( + "crypto/rand" "crypto/sha256" "crypto/subtle" + "encoding/base64" "encoding/hex" "net/http" "strconv" @@ -13,10 +15,30 @@ import ( "github.com/google/uuid" "github.com/lanthora/cacao/argp" "github.com/lanthora/cacao/model" + "golang.org/x/crypto/bcrypt" ) const sessionLifetime = 24 * time.Hour +// Hash a fixed-size digest with bcrypt so existing long passwords remain usable. +func hashUserPassword(username, password string) string { + digest := sha256.Sum256([]byte(username + ":" + password)) + hash, err := bcrypt.GenerateFromPassword([]byte(hex.EncodeToString(digest[:])), bcrypt.DefaultCost) + if err != nil { + panic("password hashing failed") + } + return "bcrypt-sha256:" + string(hash) +} + +func verifyUserPassword(user *model.User, password string) bool { + digest := sha256.Sum256([]byte(user.Name + ":" + password)) + encoded := hex.EncodeToString(digest[:]) + if strings.HasPrefix(user.Password, "bcrypt-sha256:") { + return bcrypt.CompareHashAndPassword([]byte(strings.TrimPrefix(user.Password, "bcrypt-sha256:")), []byte(encoded)) == nil + } + return subtle.ConstantTimeCompare([]byte(user.Password), []byte(encoded)) == 1 +} + func hashSessionToken(token string) string { digest := sha256.Sum256([]byte(token)) return "sha256:" + hex.EncodeToString(digest[:]) @@ -49,3 +71,11 @@ func setSessionCookies(c *gin.Context, userID uint, token string, maxAge int) { c.SetCookie("id", id, maxAge, "/", "", secure, true) c.SetCookie("token", token, maxAge, "/", "", secure, true) } + +func randomString(n int) string { + buf := make([]byte, n) + if _, err := rand.Read(buf); err != nil { + panic("secure random generation failed") + } + return base64.RawURLEncoding.EncodeToString(buf)[:n] +} diff --git a/api/security_test.go b/api/security_test.go index 4daedbc..3741a51 100644 --- a/api/security_test.go +++ b/api/security_test.go @@ -114,6 +114,61 @@ func TestLegacySessionUpgradeAndLogout(t *testing.T) { } } +func TestLegacyPasswordUpgradeAndRevocation(t *testing.T) { + r := securityRouter() + u, oldCookies := testUser(t, "normal") + w, status := securityRequest(t, r, "/api/user/login", fmt.Sprintf(`{"username":%q,"password":"old-password"}`, u.Name)) + if status != Success { + t.Fatalf("legacy login failed: %d", status) + } + storage.Get().First(&u, u.ID) + if !strings.HasPrefix(u.Password, "bcrypt-sha256:") || !verifyUserPassword(&u, "old-password") { + t.Fatal("legacy password migration failed") + } + if _, status := securityRequest(t, r, "/api/user/info", "{}", oldCookies...); status != NotLoggedIn { + t.Fatal("login did not rotate token") + } + cookies := w.Result().Cookies() + for _, cookie := range cookies { + if !cookie.HttpOnly || cookie.SameSite != http.SameSiteLaxMode { + t.Fatalf("unsafe cookie: %s", cookie.Name) + } + } + if _, status := securityRequest(t, r, "/api/user/info", "{}", cookies...); status != Success { + t.Fatal("new login cookies rejected") + } + _, adminCookies := testUser(t, "admin") + if _, status := securityRequest(t, r, "/api/admin/updateUserPassword", fmt.Sprintf(`{"username":%q,"password":"new-password"}`, u.Name), adminCookies...); status != Success { + t.Fatalf("password reset failed: %d", status) + } + if _, status := securityRequest(t, r, "/api/user/info", "{}", cookies...); status != NotLoggedIn { + t.Fatal("reset did not revoke old session") + } + if _, status := securityRequest(t, r, "/api/user/login", fmt.Sprintf(`{"username":%q,"password":"old-password"}`, u.Name)); status != IncorrectUsernameOrPassword { + t.Fatal("old password accepted") + } +} + +func TestPasswordChangeForAdminAndLongPasswords(t *testing.T) { + r := securityRouter() + u, cookies := testUser(t, "admin") + password := strings.Repeat("long-password", 20) + w, status := securityRequest(t, r, "/api/user/changePassword", fmt.Sprintf(`{"old":"old-password","new":%q}`, password), cookies...) + if status != Success { + t.Fatalf("admin password change failed: %d", status) + } + storage.Get().First(&u, u.ID) + if !verifyUserPassword(&u, password) || verifyUserPassword(&u, password+"x") { + t.Fatal("long password truncated") + } + if _, status := securityRequest(t, r, "/api/user/info", "{}", cookies...); status != NotLoggedIn { + t.Fatal("password change kept old token") + } + if _, status := securityRequest(t, r, "/api/user/info", "{}", w.Result().Cookies()...); status != Success { + t.Fatal("new session rejected") + } +} + func TestCookiesSecureWithTLS(t *testing.T) { c, _ := gin.CreateTestContext(httptest.NewRecorder()) c.Request = httptest.NewRequest(http.MethodPost, "https://example.test/", nil) diff --git a/api/user.go b/api/user.go index 0ec1d81..3c21f64 100644 --- a/api/user.go +++ b/api/user.go @@ -5,13 +5,10 @@ import ( "strings" "time" - "crypto/sha256" - "fmt" "github.com/gin-gonic/gin" "github.com/lanthora/cacao/candy" "github.com/lanthora/cacao/model" "github.com/lanthora/cacao/storage" - "math/rand" ) func LoginMiddleware() gin.HandlerFunc { @@ -185,14 +182,15 @@ func UserLogin(c *gin.Context) { return } - user := model.User{ - Name: request.Username, - Password: hashUserPassword(request.Username, request.Password), + if !candy.IsValidUsername(request.Username) || request.Password == "" { + setErrorCode(c, IncorrectUsernameOrPassword) + return } + user := model.User{} db := storage.Get() - if result := db.Where(user).Take(&user); result.Error != nil { + if result := db.Where("name = ?", request.Username).Take(&user); result.Error != nil || !verifyUserPassword(&user, request.Password) { setErrorCode(c, IncorrectUsernameOrPassword) return } @@ -202,6 +200,9 @@ func UserLogin(c *gin.Context) { } previousPassword := user.Password + if !strings.HasPrefix(user.Password, "bcrypt-sha256:") { + user.Password = hashUserPassword(user.Name, request.Password) + } token := newSession(&user) result := db.Model(&model.User{}).Where("id = ? AND password = ?", user.ID, previousPassword).Updates(map[string]interface{}{ "password": user.Password, "token": user.Token, "token_expires_at": user.TokenExpiresAt, "ip": user.IP, @@ -242,8 +243,7 @@ func ChangePassword(c *gin.Context) { } user := c.MustGet("user").(*model.User) - - if user.Password != hashUserPassword(user.Name, request.OldPassword) { + if !verifyUserPassword(user, request.OldPassword) { setErrorCode(c, IncorrectUsernameOrPassword) return } @@ -275,18 +275,3 @@ func registerInterval() time.Duration { } return time.Duration(interval) * time.Minute } - -func hashUserPassword(username, password string) string { - hash := sha256.Sum256([]byte(username + ":" + password)) - return fmt.Sprintf("%x", hash[:]) -} - -func randomString(n int) string { - letters := "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" - r := rand.New(rand.NewSource(time.Now().UnixNano())) - b := make([]byte, n) - for i := range b { - b[i] = letters[r.Intn(len(letters))] - } - return string(b) -} From 62ebc13f88fe437964e18db74fd0c5c9a15f9e0b Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:24:09 +0800 Subject: [PATCH 08/36] fix(http): recover panics without disclosing request secrets --- api/status.go | 2 +- main.go | 8 +++++++- main_test.go | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/api/status.go b/api/status.go index 294a578..e7b3bbb 100644 --- a/api/status.go +++ b/api/status.go @@ -72,7 +72,7 @@ func setErrorCode(c *gin.Context, code int) { } func setUnexpectedMessage(c *gin.Context, msg string) { - setResponse(c, Unexpected, msg, nil) + setErrorCode(c, Unexpected) } func setResponseData(c *gin.Context, data gin.H) { diff --git a/main.go b/main.go index 500d21e..5736a3d 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,7 @@ package main import ( + "io" "net/http" "path" "strings" @@ -44,7 +45,12 @@ func main() { func newRouter(trustedProxies string) (*gin.Engine, error) { r := gin.New() - r.Use(candy.WebsocketMiddleware()) + // Gin's default panic logger dumps request headers, including session cookies. + recovery := gin.CustomRecoveryWithWriter(io.Discard, func(c *gin.Context, _ any) { + logger.Info("http handler panic: method=%s path=%s", c.Request.Method, c.FullPath()) + c.AbortWithStatus(http.StatusInternalServerError) + }) + r.Use(recovery, candy.WebsocketMiddleware()) public := r.Group("/api") public.POST("/user/register", api.UserRegister) diff --git a/main_test.go b/main_test.go index 6e8ac40..90d6b2b 100644 --- a/main_test.go +++ b/main_test.go @@ -2,8 +2,12 @@ package main import ( "encoding/json" + "net/http" "net/http/httptest" + "strings" "testing" + + "github.com/gin-gonic/gin" ) func TestEveryPrivateAPIRouteRequiresAuthentication(t *testing.T) { @@ -37,3 +41,18 @@ func TestEveryPrivateAPIRouteRequiresAuthentication(t *testing.T) { t.Fatal("no private API routes were checked") } } + +func TestPanicRecoveryDoesNotExposeDetails(t *testing.T) { + router, err := newRouter("") + if err != nil { + t.Fatal(err) + } + router.GET("/panic-test", func(c *gin.Context) { panic("private panic details") }) + request := httptest.NewRequest(http.MethodGet, "/panic-test", nil) + request.Header.Set("Cookie", "token=private-session-token") + response := httptest.NewRecorder() + router.ServeHTTP(response, request) + if response.Code != http.StatusInternalServerError || strings.Contains(response.Body.String(), "private") { + t.Fatalf("unexpected panic response: %d %s", response.Code, response.Body.String()) + } +} From a2a2e6b0d7eb67a4b808ae738db975e4f0b9c2aa Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:24:13 +0800 Subject: [PATCH 09/36] fix(http): trust forwarded client addresses only from configured proxies --- main.go | 14 ++++++++++++-- main_test.go | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 5736a3d..7163503 100644 --- a/main.go +++ b/main.go @@ -20,9 +20,9 @@ func init() { } func main() { - r, err := newRouter("") + r, err := newRouter(argp.Get("trusted-proxies", "")) if err != nil { - logger.Fatal("router initialization failed: %v", err) + logger.Fatal("invalid trusted proxies: %v", err) } storageDir := argp.Get("storage", ".") @@ -45,6 +45,16 @@ func main() { func newRouter(trustedProxies string) (*gin.Engine, error) { r := gin.New() + var proxies []string + if strings.TrimSpace(trustedProxies) != "" { + for _, proxy := range strings.Split(trustedProxies, ",") { + proxies = append(proxies, strings.TrimSpace(proxy)) + } + } + // Forwarded client addresses must only come from explicitly trusted proxies. + if err := r.SetTrustedProxies(proxies); err != nil { + return nil, err + } // Gin's default panic logger dumps request headers, including session cookies. recovery := gin.CustomRecoveryWithWriter(io.Discard, func(c *gin.Context, _ any) { logger.Info("http handler panic: method=%s path=%s", c.Request.Method, c.FullPath()) diff --git a/main_test.go b/main_test.go index 90d6b2b..46045af 100644 --- a/main_test.go +++ b/main_test.go @@ -42,6 +42,38 @@ func TestEveryPrivateAPIRouteRequiresAuthentication(t *testing.T) { } } +func TestClientIPOnlyTrustsConfiguredProxies(t *testing.T) { + for _, test := range []struct { + name string + proxies string + want string + }{ + {"direct request", "", "192.0.2.10"}, + {"untrusted proxy", "198.51.100.0/24", "192.0.2.10"}, + {"trusted proxy", "192.0.2.0/24", "203.0.113.4"}, + } { + t.Run(test.name, func(t *testing.T) { + router, err := newRouter(test.proxies) + if err != nil { + t.Fatal(err) + } + router.GET("/client-ip-test", func(c *gin.Context) { c.String(http.StatusOK, c.ClientIP()) }) + request := httptest.NewRequest(http.MethodGet, "/client-ip-test", nil) + request.RemoteAddr = "192.0.2.10:12345" + request.Header.Set("X-Forwarded-For", "203.0.113.4") + request.Header.Set("X-Real-IP", "203.0.113.5") + response := httptest.NewRecorder() + router.ServeHTTP(response, request) + if got := response.Body.String(); got != test.want { + t.Fatalf("ClientIP=%q, want %q", got, test.want) + } + }) + } + if _, err := newRouter("not-a-proxy"); err == nil { + t.Fatal("invalid trusted proxy must fail startup") + } +} + func TestPanicRecoveryDoesNotExposeDetails(t *testing.T) { router, err := newRouter("") if err != nil { From 9f3a08f3446b795e88b2fc7c315991f8d4e79952 Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:24:23 +0800 Subject: [PATCH 10/36] fix(auth): require an operator secret for initial administrator setup --- api/admin.go | 4 ++- api/security.go | 13 +++++++ api/security_test.go | 44 ++++++++++++++++++++++++ api/status.go | 2 ++ api/user.go | 42 ++++++++++++++--------- frontend/src/App.vue | 9 ++++- frontend/src/i18n/en-US.js | 6 ++++ frontend/src/i18n/zh-CN.js | 6 ++++ frontend/src/views/RegisterView.vue | 53 ++++++++++++++++++++--------- 9 files changed, 144 insertions(+), 35 deletions(-) diff --git a/api/admin.go b/api/admin.go index 74ba050..834fdc6 100644 --- a/api/admin.go +++ b/api/admin.go @@ -74,6 +74,8 @@ func AdminShowUsers(c *gin.Context) { } func AdminAddUser(c *gin.Context) { + registrationMu.Lock() + defer registrationMu.Unlock() var request struct { Username string `json:"username"` Password string `json:"password"` @@ -188,7 +190,7 @@ func AdminUpdateUserPassword(c *gin.Context) { } func AdminGetOpenRegisterConfig(c *gin.Context) { - openreg := model.GetConfig("openreg", "true") == "true" + openreg := model.GetConfig("openreg", "false") == "true" setResponseData(c, gin.H{ "openreg": openreg, }) diff --git a/api/security.go b/api/security.go index 8e12251..e5560f2 100644 --- a/api/security.go +++ b/api/security.go @@ -7,8 +7,10 @@ import ( "encoding/base64" "encoding/hex" "net/http" + "os" "strconv" "strings" + "sync" "time" "github.com/gin-gonic/gin" @@ -20,6 +22,8 @@ import ( const sessionLifetime = 24 * time.Hour +var registrationMu sync.Mutex + // Hash a fixed-size digest with bcrypt so existing long passwords remain usable. func hashUserPassword(username, password string) string { digest := sha256.Sum256([]byte(username + ":" + password)) @@ -72,6 +76,15 @@ func setSessionCookies(c *gin.Context, userID uint, token string, maxAge int) { c.SetCookie("token", token, maxAge, "/", "", secure, true) } +func validSetupToken(supplied string) bool { + expected := os.Getenv("CACAO_SETUP_TOKEN") + if len(expected) < 32 || supplied == "" { + return false + } + a, b := sha256.Sum256([]byte(expected)), sha256.Sum256([]byte(supplied)) + return subtle.ConstantTimeCompare(a[:], b[:]) == 1 +} + func randomString(n int) string { buf := make([]byte, n) if _, err := rand.Read(buf); err != nil { diff --git a/api/security_test.go b/api/security_test.go index 3741a51..063a10e 100644 --- a/api/security_test.go +++ b/api/security_test.go @@ -169,6 +169,50 @@ func TestPasswordChangeForAdminAndLongPasswords(t *testing.T) { } } +func TestSetupRequiresSecret(t *testing.T) { + t.Setenv("CACAO_SETUP_TOKEN", "") + if validSetupToken("") { + t.Fatal("unconfigured setup accepted") + } + secret := strings.Repeat("s", 32) + t.Setenv("CACAO_SETUP_TOKEN", secret) + if validSetupToken("wrong") || !validSetupToken(secret) { + t.Fatal("setup secret comparison failed") + } + var count int64 + storage.Get().Unscoped().Model(&model.User{}).Count(&count) + if count != 0 { + t.Skip("bootstrap endpoint test needs a fresh test database") + } + r := securityRouter() + if _, status := securityRequest(t, r, "/api/user/register", `{"username":"attacker","password":"password"}`); status != SetupRequired { + t.Fatal("anonymous first user can claim admin") + } + previousRegistration := model.GetConfig("openreg", "missing") + t.Cleanup(func() { + storage.Get().Unscoped().Where("name = ?", "bootstrap").Delete(&model.User{}) + if previousRegistration == "missing" { + storage.Get().Unscoped().Where("key = ?", "openreg").Delete(&model.Config{}) + } else { + model.SetConfig("openreg", previousRegistration) + } + }) + w, status := securityRequest(t, r, "/api/user/register", fmt.Sprintf(`{"username":"bootstrap","password":"password","setupToken":%q}`, secret)) + if status != Success { + t.Fatalf("authorized setup rejected: %d", status) + } + var admin model.User + if storage.Get().Where("name = ?", "bootstrap").First(&admin).Error != nil || admin.Role != "admin" { + t.Fatal("authorized setup did not create administrator") + } + if _, status := securityRequest(t, r, "/api/user/info", "{}", w.Result().Cookies()...); status != Success { + t.Fatal("bootstrap login session rejected") + } + if _, status := securityRequest(t, r, "/api/user/register", fmt.Sprintf(`{"username":"attacker","password":"password","setupToken":%q}`, secret)); status != RegistrationDisabled { + t.Fatal("setup secret remained usable after initialization") + } +} + func TestCookiesSecureWithTLS(t *testing.T) { c, _ := gin.CreateTestContext(httptest.NewRecorder()) c.Request = httptest.NewRequest(http.MethodPost, "https://example.test/", nil) diff --git a/api/status.go b/api/status.go index e7b3bbb..60626e8 100644 --- a/api/status.go +++ b/api/status.go @@ -30,6 +30,7 @@ func init() { statusMessage[DeviceNotExists] = "device not exists" statusMessage[CannotDeleteOnlineDevice] = "cannot delete online device" statusMessage[InvalidInactiveUserThreshold] = "invalid inactive user threshold" + statusMessage[SetupRequired] = "initial setup requires a valid setup token" } const ( @@ -55,6 +56,7 @@ const ( DeviceNotExists CannotDeleteOnlineDevice InvalidInactiveUserThreshold + SetupRequired ) var statusMessage map[int]string diff --git a/api/user.go b/api/user.go index 3c21f64..0dd52a5 100644 --- a/api/user.go +++ b/api/user.go @@ -80,19 +80,33 @@ func UserStatistics(c *gin.Context) { } func UserRegister(c *gin.Context) { - if model.GetConfig("openreg", "true") != "true" { - setErrorCode(c, RegistrationDisabled) - return - } - var request struct { - Username string `json:"username"` - Password string `json:"password"` + Username string `json:"username"` + Password string `json:"password"` + SetupToken string `json:"setupToken"` } if err := c.ShouldBindJSON(&request); err != nil { setErrorCode(c, InvalidRequest) return } + registrationMu.Lock() + defer registrationMu.Unlock() + db := storage.Get() + var count int64 + if err := db.Unscoped().Model(&model.User{}).Count(&count).Error; err != nil { + setErrorCode(c, Unexpected) + return + } + initialSetup := count == 0 + if initialSetup { + if !validSetupToken(request.SetupToken) { + setErrorCode(c, SetupRequired) + return + } + } else if model.GetConfig("openreg", "false") != "true" { + setErrorCode(c, RegistrationDisabled) + return + } if request.Username == "@" { setErrorCode(c, InvalidUsername) return @@ -106,7 +120,6 @@ func UserRegister(c *gin.Context) { return } - db := storage.Get() if func() bool { count := int64(0) db.Model(&model.User{}).Where(&model.User{IP: c.ClientIP(), Role: "normal"}).Where("created_at > ?", time.Now().Add(-1*registerInterval())).Count(&count) @@ -125,14 +138,10 @@ func UserRegister(c *gin.Context) { return } - role := func() string { - count := int64(0) - db.Model(&model.User{}).Count(&count) - if count == 0 { - return "admin" - } - return "normal" - }() + role := "normal" + if initialSetup { + role = "admin" + } user := model.User{ Name: request.Username, @@ -140,7 +149,6 @@ func UserRegister(c *gin.Context) { Role: role, IP: c.ClientIP(), } - token := newSession(&user) if result := db.Create(&user); result.Error != nil { diff --git a/frontend/src/App.vue b/frontend/src/App.vue index d6a261e..772c867 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -23,7 +23,7 @@ import { ref } from 'vue' import { LOCAL_LANGUAGE_KEY } from './i18n' const router = useRouter() -const { locale } = useI18n() +const { locale, t } = useI18n() const currentLang = ref(locale.value) const handleLangChange = (value) => { @@ -45,6 +45,13 @@ axios.interceptors.response.use( return response }, (error) => { + const status = error.response?.status + message.warning(error.response?.data?.msg || t('security.requestFailed')) + if (status === 401) { + router.replace('/login') + } else if (status === 403 && !router.currentRoute.value.meta.public) { + router.replace('/') + } return Promise.reject(error) } ) diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 68e60f6..1cd5c62 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -10,6 +10,9 @@ export default { or: 'Or' }, register: { + setupToken: 'Initial setup key (optional)', + setupTokenPlaceholder: 'Required for the first administrator', + setupTokenHelp: 'Only needed to create the first administrator. Ask the operator for this key. Leave blank for ordinary registration on an existing site.', username: 'Username', password: 'Password', register: 'Register', @@ -19,6 +22,9 @@ export default { loading: { title: 'Loading' }, + security: { + requestFailed: 'Request failed. Please try again later.' + }, user: { title: 'User', subtitle: 'user information', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 84f9740..c4cdf42 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -10,6 +10,9 @@ export default { or: '或者' }, register: { + setupToken: '首次部署初始化密钥(可选)', + setupTokenPlaceholder: '首次创建管理员时填写', + setupTokenHelp: '仅创建首个管理员时需要,由部署者提供。已有站点的普通用户注册请留空。', username: '用户名', password: '密码', register: '注册', @@ -19,6 +22,9 @@ export default { loading: { title: '加载中' }, + security: { + requestFailed: '请求失败,请稍后重试' + }, user: { title: '用户', subtitle: '用户信息', diff --git a/frontend/src/views/RegisterView.vue b/frontend/src/views/RegisterView.vue index 415061f..4d94b1e 100644 --- a/frontend/src/views/RegisterView.vue +++ b/frontend/src/views/RegisterView.vue @@ -37,8 +37,17 @@ + + + {{ $t('register.setupTokenHelp') }} + + - + {{ $t('register.register') }} @@ -47,32 +56,39 @@ From b08cf2dbbf8cc9bf5ad9b162b154c9ed96d4edd8 Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:24:28 +0800 Subject: [PATCH 11/36] fix(auth): bound failed attempts and concurrent password work --- api/security.go | 99 ++++++++++++++++++++++++++++++++++++++++++++ api/security_test.go | 35 ++++++++++++++++ api/status.go | 2 + api/user.go | 21 ++++++++++ 4 files changed, 157 insertions(+) diff --git a/api/security.go b/api/security.go index e5560f2..0d91936 100644 --- a/api/security.go +++ b/api/security.go @@ -24,6 +24,21 @@ const sessionLifetime = 24 * time.Hour var registrationMu sync.Mutex +// A concurrent burst must not schedule unbounded bcrypt work before failed +// attempts have had a chance to reach the per-IP/account limiter. +var passwordWork = make(chan struct{}, 8) + +func acquirePasswordWork(c *gin.Context) bool { + select { + case passwordWork <- struct{}{}: + return true + default: + c.Header("Retry-After", "1") + c.AbortWithStatusJSON(http.StatusTooManyRequests, gin.H{"status": TooManyRequests, "msg": "authentication busy; retry shortly", "data": nil}) + return false + } +} + // Hash a fixed-size digest with bcrypt so existing long passwords remain usable. func hashUserPassword(username, password string) string { digest := sha256.Sum256([]byte(username + ":" + password)) @@ -92,3 +107,87 @@ func randomString(n int) string { } return base64.RawURLEncoding.EncodeToString(buf)[:n] } + +type attemptWindow struct { + count int + until time.Time +} + +type attemptLimiter struct { + mu sync.Mutex + entries map[string]attemptWindow +} + +var authAttempts = &attemptLimiter{entries: make(map[string]attemptWindow)} + +// Bound failed guesses and memory consumption. Successful authentication, +// ordinary API calls and established tunnel traffic do not consume the budget. +func (l *attemptLimiter) allow(key string, limit int, period time.Duration, now time.Time) bool { + l.mu.Lock() + defer l.mu.Unlock() + w, exists := l.entries[key] + if !exists || !now.Before(w.until) { + if len(l.entries) >= 4096 { + for k, entry := range l.entries { + if !now.Before(entry.until) { + delete(l.entries, k) + } + } + if len(l.entries) >= 4096 && !exists { + return false + } + } + w = attemptWindow{until: now.Add(period)} + } + if w.count >= limit { + return false + } + w.count++ + l.entries[key] = w + return true +} + +func allowAuthentication(c *gin.Context, username string) bool { + now := time.Now() + allowed := true + authAttempts.mu.Lock() + for _, key := range authenticationKeys(c, username) { + entry := authAttempts.entries[key] + if now.Before(entry.until) && entry.count >= 30 { + allowed = false + } + } + // Fail closed if attackers have filled the bounded table with active keys. + if len(authAttempts.entries) >= 4096 { + for key, entry := range authAttempts.entries { + if !now.Before(entry.until) { + delete(authAttempts.entries, key) + } + } + if len(authAttempts.entries) >= 4096 { + allowed = false + } + } + authAttempts.mu.Unlock() + if !allowed { + c.Header("Retry-After", "60") + c.AbortWithStatusJSON(http.StatusTooManyRequests, gin.H{"status": TooManyRequests, "msg": "too many authentication attempts", "data": nil}) + } + return allowed +} + +func authenticationKeys(c *gin.Context, username string) []string { + keys := []string{"ip:" + c.ClientIP()} + if username != "" { + // Digest untrusted names so an oversized name cannot grow the limiter map. + digest := sha256.Sum256([]byte(username)) + keys = append(keys, "user:"+hex.EncodeToString(digest[:])) + } + return keys +} + +func recordAuthenticationFailure(c *gin.Context, username string) { + for _, key := range authenticationKeys(c, username) { + authAttempts.allow(key, 30, time.Minute, time.Now()) + } +} diff --git a/api/security_test.go b/api/security_test.go index 063a10e..40d917d 100644 --- a/api/security_test.go +++ b/api/security_test.go @@ -68,6 +68,11 @@ func testUser(t *testing.T, role string) (model.User, []*http.Cookie) { return u, []*http.Cookie{{Name: "id", Value: fmt.Sprint(u.ID)}, {Name: "token", Value: token}} } +func resetAuthAttempts(t *testing.T) { + t.Helper() + authAttempts = &attemptLimiter{entries: make(map[string]attemptWindow)} +} + func TestSessionAuthorization(t *testing.T) { r := securityRouter() u, cookies := testUser(t, "normal") @@ -115,12 +120,16 @@ func TestLegacySessionUpgradeAndLogout(t *testing.T) { } func TestLegacyPasswordUpgradeAndRevocation(t *testing.T) { + resetAuthAttempts(t) r := securityRouter() u, oldCookies := testUser(t, "normal") w, status := securityRequest(t, r, "/api/user/login", fmt.Sprintf(`{"username":%q,"password":"old-password"}`, u.Name)) if status != Success { t.Fatalf("legacy login failed: %d", status) } + if len(authAttempts.entries) != 0 { + t.Fatal("successful login consumed the failed-authentication budget") + } storage.Get().First(&u, u.ID) if !strings.HasPrefix(u.Password, "bcrypt-sha256:") || !verifyUserPassword(&u, "old-password") { t.Fatal("legacy password migration failed") @@ -150,6 +159,7 @@ func TestLegacyPasswordUpgradeAndRevocation(t *testing.T) { } func TestPasswordChangeForAdminAndLongPasswords(t *testing.T) { + resetAuthAttempts(t) r := securityRouter() u, cookies := testUser(t, "admin") password := strings.Repeat("long-password", 20) @@ -169,7 +179,32 @@ func TestPasswordChangeForAdminAndLongPasswords(t *testing.T) { } } +func TestAuthenticationRateLimit(t *testing.T) { + resetAuthAttempts(t) + r := securityRouter() + for i := 0; i < 30; i++ { + _, status := securityRequest(t, r, "/api/user/login", `{"username":"missing-user","password":"wrong"}`) + if status != IncorrectUsernameOrPassword { + t.Fatalf("attempt %d: %d", i, status) + } + } + w, status := securityRequest(t, r, "/api/user/login", `{"username":"missing-user","password":"wrong"}`) + if w.Code != http.StatusTooManyRequests || status != TooManyRequests || w.Header().Get("Retry-After") == "" { + t.Fatal("brute force not throttled") + } + _, cookies := testUser(t, "normal") + if _, status := securityRequest(t, r, "/api/user/info", "{}", cookies...); status != Success { + t.Fatal("authentication limiter disrupted business API") + } + now := time.Now() + l := &attemptLimiter{entries: map[string]attemptWindow{}} + if !l.allow("a", 1, time.Minute, now) || l.allow("a", 1, time.Minute, now) || !l.allow("a", 1, time.Minute, now.Add(time.Minute)) { + t.Fatal("limiter expiry failed") + } +} + func TestSetupRequiresSecret(t *testing.T) { + resetAuthAttempts(t) t.Setenv("CACAO_SETUP_TOKEN", "") if validSetupToken("") { t.Fatal("unconfigured setup accepted") diff --git a/api/status.go b/api/status.go index 60626e8..75745f6 100644 --- a/api/status.go +++ b/api/status.go @@ -31,6 +31,7 @@ func init() { statusMessage[CannotDeleteOnlineDevice] = "cannot delete online device" statusMessage[InvalidInactiveUserThreshold] = "invalid inactive user threshold" statusMessage[SetupRequired] = "initial setup requires a valid setup token" + statusMessage[TooManyRequests] = "too many authentication attempts" } const ( @@ -57,6 +58,7 @@ const ( CannotDeleteOnlineDevice InvalidInactiveUserThreshold SetupRequired + TooManyRequests ) var statusMessage map[int]string diff --git a/api/user.go b/api/user.go index 0dd52a5..e172b7e 100644 --- a/api/user.go +++ b/api/user.go @@ -89,6 +89,9 @@ func UserRegister(c *gin.Context) { setErrorCode(c, InvalidRequest) return } + if !allowAuthentication(c, request.Username) { + return + } registrationMu.Lock() defer registrationMu.Unlock() db := storage.Get() @@ -100,6 +103,7 @@ func UserRegister(c *gin.Context) { initialSetup := count == 0 if initialSetup { if !validSetupToken(request.SetupToken) { + recordAuthenticationFailure(c, request.Username) setErrorCode(c, SetupRequired) return } @@ -190,15 +194,24 @@ func UserLogin(c *gin.Context) { return } + if !allowAuthentication(c, request.Username) { + return + } if !candy.IsValidUsername(request.Username) || request.Password == "" { + recordAuthenticationFailure(c, request.Username) setErrorCode(c, IncorrectUsernameOrPassword) return } user := model.User{} + if !acquirePasswordWork(c) { + return + } + defer func() { <-passwordWork }() db := storage.Get() if result := db.Where("name = ?", request.Username).Take(&user); result.Error != nil || !verifyUserPassword(&user, request.Password) { + recordAuthenticationFailure(c, request.Username) setErrorCode(c, IncorrectUsernameOrPassword) return } @@ -251,7 +264,15 @@ func ChangePassword(c *gin.Context) { } user := c.MustGet("user").(*model.User) + if !allowAuthentication(c, user.Name) { + return + } + if !acquirePasswordWork(c) { + return + } + defer func() { <-passwordWork }() if !verifyUserPassword(user, request.OldPassword) { + recordAuthenticationFailure(c, user.Name) setErrorCode(c, IncorrectUsernameOrPassword) return } From e3fbe2b79cd4956eedda06fafd7944eec8fe4fcf Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:24:38 +0800 Subject: [PATCH 12/36] fix(api): enforce resource ownership and deleted tenant boundaries --- api/device.go | 9 ++++----- api/net.go | 2 +- api/security_test.go | 32 ++++++++++++++++++++++++++++++++ candy/user.go | 5 +++++ model/device.go | 2 +- model/net.go | 6 +++--- model/route.go | 2 +- 7 files changed, 47 insertions(+), 11 deletions(-) diff --git a/api/device.go b/api/device.go index be0acac..b3870a5 100644 --- a/api/device.go +++ b/api/device.go @@ -60,11 +60,6 @@ func DeviceDelete(c *gin.Context) { } deviceModel := model.GetDeviceByDevID(request.DevID) - if deviceModel.Online { - setErrorCode(c, CannotDeleteOnlineDevice) - return - } - netModel := model.GetNetByNetID(deviceModel.NetID) user := c.MustGet("user").(*model.User) @@ -72,6 +67,10 @@ func DeviceDelete(c *gin.Context) { setErrorCode(c, DeviceNotExists) return } + if deviceModel.Online { + setErrorCode(c, CannotDeleteOnlineDevice) + return + } deviceModel.Delete() setResponseData(c, nil) diff --git a/api/net.go b/api/net.go index feaac87..b0be88f 100644 --- a/api/net.go +++ b/api/net.go @@ -167,7 +167,7 @@ func NetDelete(c *gin.Context) { netModel := &model.Net{} netModel.ID = request.ID db := storage.Get() - result := db.Where(netModel).Take(netModel) + result := db.Where("id = ? AND user_id = ?", request.ID, user.ID).Take(netModel) if result.Error != nil || netModel.UserID != user.ID { setErrorCode(c, NetworkNotExists) diff --git a/api/security_test.go b/api/security_test.go index 40d917d..2249ae3 100644 --- a/api/security_test.go +++ b/api/security_test.go @@ -259,3 +259,35 @@ func TestCookiesSecureWithTLS(t *testing.T) { } } } + +func TestCrossTenantAndZeroIDMutations(t *testing.T) { + r := securityRouter() + owner, _ := testUser(t, "normal") + _, cookies := testUser(t, "normal") + network := model.Net{UserID: owner.ID, Name: "test-net"} + storage.Get().Create(&network) + t.Cleanup(func() { storage.Get().Unscoped().Delete(&network) }) + device := model.Device{NetID: network.ID, Online: true} + storage.Get().Create(&device) + t.Cleanup(func() { storage.Get().Unscoped().Delete(&device) }) + route := model.Route{NetID: network.ID} + storage.Get().Create(&route) + t.Cleanup(func() { storage.Get().Unscoped().Delete(&route) }) + for _, item := range []struct { + path, body string + status int + }{ + {"/api/net/delete", fmt.Sprintf(`{"netid":%d}`, network.ID), NetworkNotExists}, + {"/api/net/delete", `{"netid":0}`, NetworkNotExists}, + {"/api/device/delete", fmt.Sprintf(`{"devid":%d}`, device.ID), DeviceNotExists}, + {"/api/route/delete", fmt.Sprintf(`{"routeid":%d}`, route.ID), RouteNotExists}, + } { + if _, status := securityRequest(t, r, item.path, item.body, cookies...); status != item.status { + t.Fatalf("%s: got %d want %d", item.path, status, item.status) + } + } + storage.Get().Delete(&network) + if model.GetNetByNetID(network.ID).ID != 0 { + t.Fatal("deleted network still accessible") + } +} diff --git a/candy/user.go b/candy/user.go index 40baf9f..20b4da7 100644 --- a/candy/user.go +++ b/candy/user.go @@ -23,6 +23,11 @@ func CleanInactiveUser() { users := model.GetUsers() for _, u := range users { if u.Role == "normal" && model.GetLastActiveTimeByUserID(u.ID).AddDate(0, 0, threshold).Before(time.Now()) { + for _, n := range model.GetNetsByUserID(u.ID) { + DeleteNet(n.ID) + model.DeleteDevicesByNetID(n.ID) + n.Delete() + } u.Delete() } } diff --git a/model/device.go b/model/device.go index 9d428b5..abfb24a 100644 --- a/model/device.go +++ b/model/device.go @@ -81,7 +81,7 @@ func GetDevicesByNetID(netid uint) (devices []Device) { func GetDevicesByUserID(userid uint) (devices []Device) { if userid != 0 { db := storage.Get() - db.Model(&Device{}).Joins("left join nets on devices.net_id = nets.id").Where("nets.user_id = ?", userid).Find(&devices) + db.Model(&Device{}).Joins("join nets on devices.net_id = nets.id AND nets.deleted_at IS NULL").Where("nets.user_id = ?", userid).Find(&devices) } return } diff --git a/model/net.go b/model/net.go index 6d743d6..3537c9d 100644 --- a/model/net.go +++ b/model/net.go @@ -41,14 +41,14 @@ func (n *Net) Delete() { func GetNets() (nets []Net) { db := storage.Get() - db.Find(&nets) + db.Model(&Net{}).Joins("join users on users.id = nets.user_id AND users.deleted_at IS NULL").Find(&nets) return } func GetNetByNetID(netid uint) (net Net) { if netid != 0 { db := storage.Get() - db.Where(&Net{Model: gorm.Model{ID: netid}}).Unscoped().Take(&net) + db.Where(&Net{Model: gorm.Model{ID: netid}}).Take(&net) } return } @@ -64,7 +64,7 @@ func GetNetsByUserID(userid uint) (nets []Net) { func GetNetIdByUsernameAndNetname(username, netname string) uint { netid := uint(0) db := storage.Get() - db.Model(&Net{}).Select("nets.id").Joins("left join users on users.id = nets.user_id").Where("users.name = ? and nets.name = ?", username, netname).Take(&netid) + db.Model(&Net{}).Select("nets.id").Joins("join users on users.id = nets.user_id AND users.deleted_at IS NULL").Where("users.name = ? and nets.name = ?", username, netname).Take(&netid) return netid } diff --git a/model/route.go b/model/route.go index 911a2b2..498d09c 100644 --- a/model/route.go +++ b/model/route.go @@ -46,7 +46,7 @@ func GetRouteByRouteID(routeid uint) (route Route) { func GetRoutesByUserID(userid uint) (routes []Route) { if userid != 0 { db := storage.Get() - db.Model(&Route{}).Joins("left join nets on routes.net_id = nets.id").Where("nets.user_id = ?", userid).Order("routes.net_id,routes.priority").Find(&routes) + db.Model(&Route{}).Joins("join nets on routes.net_id = nets.id AND nets.deleted_at IS NULL").Where("nets.user_id = ?", userid).Order("routes.net_id,routes.priority").Find(&routes) } return } From 201d2fa7f3e0d40a03972427cbaa3ab8d6dbf667 Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:24:43 +0800 Subject: [PATCH 13/36] fix(storage): restrict permissions for newly created database files --- storage/storage.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/storage/storage.go b/storage/storage.go index da86783..be308df 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -13,11 +13,21 @@ import ( func init() { storageDir := argp.Get("storage", ".") - err := os.MkdirAll(storageDir, os.ModeDir|os.ModePerm) + err := os.MkdirAll(storageDir, 0700) if err != nil { logger.Fatal("make storage dir failed: %v", err) } - db, err = gorm.Open(sqlite.Open(path.Join(storageDir, "sqlite.db")), &gorm.Config{ + databasePath := path.Join(storageDir, "sqlite.db") + // SQLite contains password hashes and session credentials. Restrict new + // files while preserving the permissions of existing deployment volumes. + file, err := os.OpenFile(databasePath, os.O_CREATE|os.O_RDWR, 0600) + if err != nil { + logger.Fatal("create storage database failed: %v", err) + } + if err := file.Close(); err != nil { + logger.Fatal("close storage database failed: %v", err) + } + db, err = gorm.Open(sqlite.Open(databasePath), &gorm.Config{ Logger: gormlogger.Default.LogMode(gormlogger.Silent), }) if err != nil { From e36c6213e6e1a7671dd17973ba3490ad4abf999f Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:24:47 +0800 Subject: [PATCH 14/36] fix(http): validate API origins, request bodies and response headers --- main.go | 82 ++++++++++++++++++++++++++++++++++++++- main_test.go | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 186 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 7163503..4485b3c 100644 --- a/main.go +++ b/main.go @@ -1,8 +1,12 @@ package main import ( + "bytes" + "errors" "io" + "mime" "net/http" + "net/url" "path" "strings" @@ -60,9 +64,9 @@ func newRouter(trustedProxies string) (*gin.Engine, error) { logger.Info("http handler panic: method=%s path=%s", c.Request.Method, c.FullPath()) c.AbortWithStatus(http.StatusInternalServerError) }) - r.Use(recovery, candy.WebsocketMiddleware()) + r.Use(recovery, securityHeaders(), candy.WebsocketMiddleware()) - public := r.Group("/api") + public := r.Group("/api", apiRequestSecurity()) public.POST("/user/register", api.UserRegister) public.POST("/user/login", api.UserLogin) protected := public.Group("", api.LoginMiddleware(), api.AdminMiddleware()) @@ -112,3 +116,77 @@ func newRouter(trustedProxies string) (*gin.Engine, error) { }) return r, nil } + +func securityHeaders() gin.HandlerFunc { + return func(c *gin.Context) { + c.Header("X-Content-Type-Options", "nosniff") + c.Header("X-Frame-Options", "DENY") + c.Header("Referrer-Policy", "no-referrer") + c.Header("Permissions-Policy", "camera=(), microphone=(), geolocation=()") + c.Header("Content-Security-Policy", "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:; connect-src 'self'; object-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'self'") + if c.Request.TLS != nil { + c.Header("Strict-Transport-Security", "max-age=31536000") + } + c.Next() + } +} + +const maxAPIRequestBytes = 1 << 20 + +func apiRequestSecurity() gin.HandlerFunc { + return func(c *gin.Context) { + c.Header("Cache-Control", "no-store") + if strings.EqualFold(c.GetHeader("Sec-Fetch-Site"), "cross-site") { + c.AbortWithStatus(http.StatusForbidden) + return + } + if origin := c.GetHeader("Origin"); origin != "" && !sameOriginHost(origin, c.Request.Host) { + c.AbortWithStatus(http.StatusForbidden) + return + } + if c.Request.ContentLength > maxAPIRequestBytes { + c.AbortWithStatus(http.StatusRequestEntityTooLarge) + return + } + if c.Request.Body != nil { + body := http.MaxBytesReader(c.Writer, c.Request.Body, maxAPIRequestBytes) + data, err := io.ReadAll(body) + body.Close() + if err != nil { + var tooLarge *http.MaxBytesError + if errors.As(err, &tooLarge) { + c.AbortWithStatus(http.StatusRequestEntityTooLarge) + } else { + c.AbortWithStatus(http.StatusBadRequest) + } + return + } + // Existing read-only calls and logout use an empty axios POST body. + if len(data) != 0 { + contentType, _, err := mime.ParseMediaType(c.GetHeader("Content-Type")) + if err != nil || contentType != "application/json" { + c.AbortWithStatus(http.StatusUnsupportedMediaType) + return + } + } + c.Request.Body = io.NopCloser(bytes.NewReader(data)) + } + c.Next() + } +} + +func sameOriginHost(origin, host string) bool { + parsed, err := url.Parse(origin) + if err != nil || (parsed.Scheme != "http" && parsed.Scheme != "https") || parsed.Host == "" || parsed.User != nil || parsed.Path != "" || parsed.RawQuery != "" || parsed.Fragment != "" { + return false + } + // Compare against the preserved Host header, including behind TLS termination. + // Scheme cannot be inferred from untrusted X-Forwarded-Proto headers. + defaultPort := ":80" + if parsed.Scheme == "https" { + defaultPort = ":443" + } + originHost := strings.TrimSuffix(strings.ToLower(parsed.Host), defaultPort) + requestHost := strings.TrimSuffix(strings.ToLower(host), defaultPort) + return originHost == requestHost +} diff --git a/main_test.go b/main_test.go index 46045af..cc8d25c 100644 --- a/main_test.go +++ b/main_test.go @@ -2,6 +2,7 @@ package main import ( "encoding/json" + "io" "net/http" "net/http/httptest" "strings" @@ -74,6 +75,111 @@ func TestClientIPOnlyTrustsConfiguredProxies(t *testing.T) { } } +func TestAPIRequestSecurity(t *testing.T) { + for _, test := range []struct { + name string + body string + contentType string + origin string + fetchSite string + chunked bool + want int + }{ + {name: "same origin JSON", body: `{}`, contentType: "application/json; charset=utf-8", origin: "https://panel.example", want: http.StatusOK}, + {name: "non-browser JSON", body: `{}`, contentType: "application/json", want: http.StatusOK}, + {name: "empty axios POST", contentType: "application/x-www-form-urlencoded", origin: "https://panel.example", want: http.StatusOK}, + {name: "cross origin", body: `{}`, contentType: "application/json", origin: "https://attacker.example", want: http.StatusForbidden}, + {name: "null origin", origin: "null", want: http.StatusForbidden}, + {name: "cross site metadata", fetchSite: "cross-site", want: http.StatusForbidden}, + {name: "form request", body: "id=1", contentType: "application/x-www-form-urlencoded", want: http.StatusUnsupportedMediaType}, + {name: "plain JSON CSRF", body: `{}`, contentType: "text/plain", want: http.StatusUnsupportedMediaType}, + {name: "missing content type", body: `{}`, want: http.StatusUnsupportedMediaType}, + {name: "oversized body", body: strings.Repeat("x", maxAPIRequestBytes+1), contentType: "application/json", want: http.StatusRequestEntityTooLarge}, + {name: "oversized chunked body", body: strings.Repeat("x", maxAPIRequestBytes+1), contentType: "application/json", chunked: true, want: http.StatusRequestEntityTooLarge}, + } { + t.Run(test.name, func(t *testing.T) { + router := gin.New() + router.POST("/api/test", apiRequestSecurity(), func(c *gin.Context) { + body, err := io.ReadAll(c.Request.Body) + if err != nil || string(body) != test.body { + t.Errorf("request body changed: %q, %v", body, err) + } + c.Status(http.StatusOK) + }) + request := httptest.NewRequest(http.MethodPost, "http://panel.example/api/test", strings.NewReader(test.body)) + request.Header.Set("Content-Type", test.contentType) + request.Header.Set("Origin", test.origin) + request.Header.Set("Sec-Fetch-Site", test.fetchSite) + if test.chunked { + request.ContentLength = -1 + request.TransferEncoding = []string{"chunked"} + } + response := httptest.NewRecorder() + router.ServeHTTP(response, request) + if response.Code != test.want { + t.Fatalf("HTTP %d, want %d", response.Code, test.want) + } + if response.Header().Get("Cache-Control") != "no-store" { + t.Fatal("API response may be cached") + } + }) + } +} + +func TestSameOriginHost(t *testing.T) { + for _, test := range []struct { + origin string + host string + want bool + }{ + {"https://panel.example", "panel.example", true}, + {"https://PANEL.example:443", "panel.example", true}, + {"http://panel.example", "panel.example:80", true}, + {"https://panel.example:8443", "panel.example:8443", true}, + {"https://[::1]:8443", "[::1]:8443", true}, + {"https://panel.example:8443", "panel.example", false}, + {"https://panel.example.attacker.example", "panel.example", false}, + {"https://attacker.example@panel.example", "panel.example", false}, + {"https://panel.example/path", "panel.example", false}, + {"https://panel.example?x=1", "panel.example", false}, + {"file://panel.example", "panel.example", false}, + {"null", "panel.example", false}, + } { + if got := sameOriginHost(test.origin, test.host); got != test.want { + t.Errorf("sameOriginHost(%q, %q)=%v, want %v", test.origin, test.host, got, test.want) + } + } +} + +func TestSecurityHeadersAndUnknownAPI(t *testing.T) { + router, err := newRouter("") + if err != nil { + t.Fatal(err) + } + request := httptest.NewRequest(http.MethodGet, "https://panel.example/api/unknown", nil) + response := httptest.NewRecorder() + router.ServeHTTP(response, request) + if response.Code != http.StatusNotFound || strings.Contains(response.Body.String(), " Date: Wed, 7 Oct 2026 10:24:50 +0800 Subject: [PATCH 15/36] fix(http): bound server timeouts and require modern TLS --- main.go | 19 +++++++++++++++++-- main_test.go | 11 +++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 4485b3c..34fcd7c 100644 --- a/main.go +++ b/main.go @@ -2,6 +2,7 @@ package main import ( "bytes" + "crypto/tls" "errors" "io" "mime" @@ -9,6 +10,7 @@ import ( "net/url" "path" "strings" + "time" "github.com/gin-gonic/gin" "github.com/lanthora/cacao/api" @@ -35,13 +37,13 @@ func main() { if findCrtErr == nil && findKeyErr == nil { addr := argp.Get("listen", ":443") logger.Info("listen=[%v]", addr) - if err := r.RunTLS(addr, path.Join(storageDir, crtFilename), path.Join(storageDir, keyFilename)); err != nil { + if err := newHTTPServer(addr, r).ListenAndServeTLS(path.Join(storageDir, crtFilename), path.Join(storageDir, keyFilename)); err != nil && !errors.Is(err, http.ErrServerClosed) { logger.Fatal("tls service run failed: %v", err) } } else { addr := argp.Get("listen", ":80") logger.Info("listen=[%v]", addr) - if err := r.Run(addr); err != nil { + if err := newHTTPServer(addr, r).ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) { logger.Fatal("service run failed: %v", err) } } @@ -117,6 +119,19 @@ func newRouter(trustedProxies string) (*gin.Engine, error) { return r, nil } +func newHTTPServer(addr string, handler http.Handler) *http.Server { + return &http.Server{ + Addr: addr, + Handler: handler, + ReadHeaderTimeout: 5 * time.Second, + ReadTimeout: 15 * time.Second, + WriteTimeout: 30 * time.Second, + IdleTimeout: 60 * time.Second, + MaxHeaderBytes: 32 << 10, + TLSConfig: &tls.Config{MinVersion: tls.VersionTLS12}, + } +} + func securityHeaders() gin.HandlerFunc { return func(c *gin.Context) { c.Header("X-Content-Type-Options", "nosniff") diff --git a/main_test.go b/main_test.go index cc8d25c..ba3e31e 100644 --- a/main_test.go +++ b/main_test.go @@ -1,6 +1,7 @@ package main import ( + "crypto/tls" "encoding/json" "io" "net/http" @@ -180,6 +181,16 @@ func TestSecurityHeadersAndUnknownAPI(t *testing.T) { } } +func TestHTTPServerLimits(t *testing.T) { + server := newHTTPServer(":80", http.NotFoundHandler()) + if server.ReadHeaderTimeout <= 0 || server.ReadTimeout <= 0 || server.WriteTimeout <= 0 || server.IdleTimeout <= 0 || server.MaxHeaderBytes <= 0 { + t.Fatal("HTTP server is missing resource limits") + } + if server.TLSConfig == nil || server.TLSConfig.MinVersion < tls.VersionTLS12 { + t.Fatal("TLS 1.2 or newer is required") + } +} + func TestPanicRecoveryDoesNotExposeDetails(t *testing.T) { router, err := newRouter("") if err != nil { From a8febd6839e8072a026e8e038d65cc02362bf513 Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:24:57 +0800 Subject: [PATCH 16/36] fix(tunnel): validate signed authentication timestamps --- candy/net.go | 31 ++++++++++++++++++--- candy/security_test.go | 63 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 candy/security_test.go diff --git a/candy/net.go b/candy/net.go index c38d7c4..6308657 100644 --- a/candy/net.go +++ b/candy/net.go @@ -2,6 +2,7 @@ package candy import ( "crypto/sha256" + "crypto/subtle" "encoding/binary" "fmt" "math/rand/v2" @@ -85,6 +86,9 @@ func (n *Net) ipConflict(ip, vmac string) bool { } func (n *Net) checkAuthMessage(message *AuthMessage) error { + if err := checkMessageTimestamp(message.Timestamp); err != nil { + return err + } reported := message.Hash var data []byte @@ -92,27 +96,35 @@ func (n *Net) checkAuthMessage(message *AuthMessage) error { data = binary.BigEndian.AppendUint32(data, message.IP) data = binary.BigEndian.AppendUint64(data, uint64(message.Timestamp)) - if sha256.Sum256([]byte(data)) != reported { + expected := sha256.Sum256(data) + if subtle.ConstantTimeCompare(expected[:], reported[:]) != 1 { return fmt.Errorf("auth check failed: hash does not match") } return nil } func (n *Net) checkDHCPMessage(message *DHCPMessage) error { + if err := checkMessageTimestamp(message.Timestamp); err != nil { + return err + } reported := message.Hash var data []byte data = append(data, n.model.Password...) data = binary.BigEndian.AppendUint64(data, uint64(message.Timestamp)) - if sha256.Sum256([]byte(data)) != reported { + expected := sha256.Sum256(data) + if subtle.ConstantTimeCompare(expected[:], reported[:]) != 1 { return fmt.Errorf("dhcp check failed: hash does not match") } return nil } func (n *Net) checkVMacMessage(message *VMacMessage) error { - if _, err := strconv.ParseUint(message.VMac, 16, 64); err != nil { + if err := checkMessageTimestamp(message.Timestamp); err != nil { + return err + } + if _, err := strconv.ParseUint(message.VMac, 16, 64); len(message.VMac) != 16 || err != nil { return fmt.Errorf("vmac check failed: invalid vmac") } @@ -123,7 +135,8 @@ func (n *Net) checkVMacMessage(message *VMacMessage) error { data = append(data, message.VMac...) data = binary.BigEndian.AppendUint64(data, uint64(message.Timestamp)) - if sha256.Sum256([]byte(data)) != reported { + expected := sha256.Sum256(data) + if subtle.ConstantTimeCompare(expected[:], reported[:]) != 1 { return fmt.Errorf("vmac check failed: hash does not match") } return nil @@ -264,3 +277,13 @@ func strIpToUint32(ip string) uint32 { rv := uint32(s[0]<<24 | s[1]<<16 | s[2]<<8 | s[3]) return rv } + +func checkMessageTimestamp(timestamp int64) error { + // Candy clients use Unix seconds. Compare bounds instead of subtracting + // untrusted int64 values, which could overflow. + now := time.Now().Unix() + if timestamp < now-300 || timestamp > now+300 { + return fmt.Errorf("authentication timestamp outside the five-minute window") + } + return nil +} diff --git a/candy/security_test.go b/candy/security_test.go new file mode 100644 index 0000000..ffa7c68 --- /dev/null +++ b/candy/security_test.go @@ -0,0 +1,63 @@ +package candy + +import ( + "bytes" + "crypto/sha256" + "encoding/binary" + "fmt" + "math" + "testing" + "time" + + "github.com/lanthora/cacao/model" + "github.com/lunixbochs/struc" +) + +func signedMessage(t *testing.T, password string, message interface{}) []byte { + t.Helper() + data := []byte(password) + switch m := message.(type) { + case *VMacMessage: + data = append(data, m.VMac...) + data = binary.BigEndian.AppendUint64(data, uint64(m.Timestamp)) + m.Hash = sha256.Sum256(data) + case *AuthMessage: + data = binary.BigEndian.AppendUint32(data, m.IP) + data = binary.BigEndian.AppendUint64(data, uint64(m.Timestamp)) + m.Hash = sha256.Sum256(data) + case *DHCPMessage: + data = binary.BigEndian.AppendUint64(data, uint64(m.Timestamp)) + m.Hash = sha256.Sum256(data) + } + var output bytes.Buffer + if err := struc.Pack(&output, message); err != nil { + t.Fatal(err) + } + return output.Bytes() +} + +func TestAuthenticationTimestamps(t *testing.T) { + n := &Net{model: &model.Net{Password: "secret"}} + for _, timestamp := range []int64{time.Now().Unix(), time.Now().Unix() - 299, time.Now().Unix() + 299, 0, math.MinInt64, math.MaxInt64, time.Now().Unix() - 301, time.Now().Unix() + 301} { + t.Run(fmt.Sprint(timestamp), func(t *testing.T) { + wantValid := timestamp >= time.Now().Unix()-300 && timestamp <= time.Now().Unix()+300 + auth := &AuthMessage{Type: AUTH, IP: 0x0a000001, Timestamp: timestamp} + dhcp := &DHCPMessage{Type: DHCP, Cidr: make([]byte, 32), Timestamp: timestamp} + vmac := &VMacMessage{Type: VMAC, VMac: "0123456789abcdef", Timestamp: timestamp} + signedMessage(t, n.model.Password, auth) + signedMessage(t, n.model.Password, dhcp) + signedMessage(t, n.model.Password, vmac) + for name, err := range map[string]error{"auth": n.checkAuthMessage(auth), "dhcp": n.checkDHCPMessage(dhcp), "vmac": n.checkVMacMessage(vmac)} { + if (err == nil) != wantValid { + t.Errorf("%s accepted=%v, want %v", name, err == nil, wantValid) + } + } + auth.Hash[0] ^= 1 + dhcp.Hash[0] ^= 1 + vmac.Hash[0] ^= 1 + if n.checkAuthMessage(auth) == nil || n.checkDHCPMessage(dhcp) == nil || n.checkVMacMessage(vmac) == nil { + t.Fatal("invalid signature accepted") + } + }) + } +} From f646ceb716d5604f7f58277e731008b403bee34f Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:25:03 +0800 Subject: [PATCH 17/36] fix(tunnel): validate upgrade routes and websocket frame boundaries --- candy/net.go | 8 ++- candy/security_test.go | 128 +++++++++++++++++++++++++++++++++++++++++ candy/websocket.go | 78 +++++++++++++++++-------- 3 files changed, 188 insertions(+), 26 deletions(-) diff --git a/candy/net.go b/candy/net.go index 6308657..836cd61 100644 --- a/candy/net.go +++ b/candy/net.go @@ -233,7 +233,13 @@ func getNetByPath(path string) *Net { netname := "@" result := strings.Split(strings.Trim(path, "/"), "/") - if IsValidUsername(result[0]) { + if len(result) > 2 { + return nil + } + if result[0] != "" { + if !IsValidUsername(result[0]) { + return nil + } username = result[0] } if len(result) > 1 { diff --git a/candy/security_test.go b/candy/security_test.go index ffa7c68..ac2d657 100644 --- a/candy/security_test.go +++ b/candy/security_test.go @@ -4,12 +4,22 @@ import ( "bytes" "crypto/sha256" "encoding/binary" + "errors" "fmt" "math" + "net" + "net/http" + "net/http/httptest" + "runtime" + "strings" + "syscall" "testing" "time" + "github.com/gin-gonic/gin" + "github.com/gorilla/websocket" "github.com/lanthora/cacao/model" + "github.com/lanthora/cacao/storage" "github.com/lunixbochs/struc" ) @@ -36,6 +46,99 @@ func signedMessage(t *testing.T, password string, message interface{}) []byte { return output.Bytes() } +func newTestWebsocketNetwork(t *testing.T, cidr string) (*Net, string) { + t.Helper() + return newNamedTestWebsocketNetwork(t, cidr, fmt.Sprintf("ws%x", time.Now().UnixNano()), "secure") +} + +func newNamedTestWebsocketNetwork(t *testing.T, cidr, username, netname string) (*Net, string) { + t.Helper() + user := &model.User{Name: username, Role: "normal"} + db := storage.Get() + if err := db.Create(user).Error; err != nil { + t.Fatal(err) + } + network := &model.Net{UserID: user.ID, Name: netname, Password: "test-password", DHCP: cidr} + if err := db.Create(network).Error; err != nil { + t.Fatal(err) + } + InsertNet(network) + n := getNetById(network.ID) + t.Cleanup(func() { + DeleteNet(network.ID) + db.Unscoped().Where("net_id = ?", network.ID).Delete(&model.Device{}) + db.Unscoped().Delete(network) + db.Unscoped().Delete(user) + }) + gin.SetMode(gin.TestMode) + router := gin.New() + router.SetTrustedProxies(nil) + router.Use(WebsocketMiddleware()) + router.GET("/api/protected", func(c *gin.Context) { c.Status(http.StatusUnauthorized) }) + server := httptest.NewServer(router) + t.Cleanup(server.Close) + url := "ws" + strings.TrimPrefix(server.URL, "http") + "/" + user.Name + if network.Name != "@" { + url += "/" + network.Name + } + return n, url +} + +func dialTestWebsocket(t *testing.T, url string) *websocket.Conn { + t.Helper() + conn, _, err := dialTestWebsocketRequest(t, url, nil) + if err != nil { + t.Fatal(err) + } + conn.SetReadDeadline(time.Now().Add(2 * time.Second)) + t.Cleanup(func() { conn.Close() }) + return conn +} + +func dialTestWebsocketRequest(t *testing.T, url string, headers http.Header) (*websocket.Conn, *http.Response, error) { + t.Helper() + for attempt := 0; ; attempt++ { + conn, response, err := websocket.DefaultDialer.Dial(url, headers) + var dialError *net.OpError + // Windows exposes WSAEADDRINUSE (10048), separately from Go's + // synthetic syscall.EADDRINUSE. Retry only this local dial failure; + // server responses and other network/protocol failures remain visible. + addressInUse := errors.Is(err, syscall.EADDRINUSE) || + (runtime.GOOS == "windows" && errors.Is(err, syscall.Errno(10048))) + if attempt >= 2 || !addressInUse || !errors.As(err, &dialError) || dialError.Op != "dial" { + return conn, response, err + } + t.Logf("retrying transient local dial address collision: %v", err) + time.Sleep(time.Duration(attempt+1) * 25 * time.Millisecond) + } +} + +func sendVMac(t *testing.T, conn *websocket.Conn, n *Net, vmac string) { + t.Helper() + message := &VMacMessage{Type: VMAC, VMac: vmac, Timestamp: time.Now().Unix()} + if err := conn.WriteMessage(websocket.BinaryMessage, signedMessage(t, n.model.Password, message)); err != nil { + t.Fatal(err) + } +} + +func authenticateTestWebsocket(t *testing.T, conn *websocket.Conn, n *Net, vmac string, ip uint32) { + t.Helper() + sendVMac(t, conn, n, vmac) + message := &AuthMessage{Type: AUTH, IP: ip, Timestamp: time.Now().Unix()} + if err := conn.WriteMessage(websocket.BinaryMessage, signedMessage(t, n.model.Password, message)); err != nil { + t.Fatal(err) + } + // An echoed discovery message confirms AUTH completed without changing the + // existing protocol, which does not send a separate authentication reply. + echo := signedMessage(t, "", &DiscoveryMessage{Type: DISCOVERY, Src: ip, Dst: ip}) + if err := conn.WriteMessage(websocket.BinaryMessage, echo); err != nil { + t.Fatal(err) + } + if _, response, err := conn.ReadMessage(); err != nil || !bytes.Equal(response, echo) { + t.Fatalf("authentication did not complete: %x, %v", response, err) + } +} + func TestAuthenticationTimestamps(t *testing.T) { n := &Net{model: &model.Net{Password: "secret"}} for _, timestamp := range []int64{time.Now().Unix(), time.Now().Unix() - 299, time.Now().Unix() + 299, 0, math.MinInt64, math.MaxInt64, time.Now().Unix() - 301, time.Now().Unix() + 301} { @@ -61,3 +164,28 @@ func TestAuthenticationTimestamps(t *testing.T) { }) } } + +func TestWebsocketHandshakeAndFrameLimits(t *testing.T) { + _, url := newTestWebsocketNetwork(t, "10.20.0.0/24") + for _, origin := range []string{"https://attacker.invalid", "null"} { + conn, response, err := dialTestWebsocketRequest(t, url, http.Header{"Origin": []string{origin}}) + if conn != nil { + conn.Close() + } + if err == nil || response == nil || response.StatusCode != http.StatusForbidden { + t.Fatalf("cross-origin upgrade accepted: %v, %v", response, err) + } + } + for _, payload := range [][]byte{{}, make([]byte, maxWebsocketMessageSize+1)} { + conn := dialTestWebsocket(t, url) + conn.WriteMessage(websocket.BinaryMessage, payload) + if _, _, err := conn.ReadMessage(); err == nil { + t.Fatal("malformed websocket frame was not rejected") + } + } + baseURL := url[:strings.Index(url[5:], "/")+5] + _, response, err := dialTestWebsocketRequest(t, baseURL+"/api/protected", nil) + if err == nil || response == nil || response.StatusCode != http.StatusUnauthorized { + t.Fatalf("websocket bypassed API routing: %v, %v", response, err) + } +} diff --git a/candy/websocket.go b/candy/websocket.go index 40c4627..c1e4040 100644 --- a/candy/websocket.go +++ b/candy/websocket.go @@ -19,9 +19,21 @@ import ( "gorm.io/gorm" ) +const ( + maxWebsocketMessageSize = 65536 // Type byte plus the largest IPv4 packet. + websocketAuthTimeout = 15 * time.Second + websocketWriteTimeout = 10 * time.Second +) + func WebsocketMiddleware() gin.HandlerFunc { return func(c *gin.Context) { - if c.GetHeader("Upgrade") == "websocket" { + path := c.Request.URL.Path + apiRoute := c.FullPath() == "/api" || strings.HasPrefix(c.FullPath(), "/api/") + // Candy paths contain at most a username and network name. Preserve + // networks owned by the valid username "api", while HTTP API routes + // always keep their own authentication middleware. + apiPath := strings.HasPrefix(path, "/api/") && strings.Count(strings.Trim(path, "/"), "/") >= 2 + if !apiRoute && !apiPath && websocket.IsWebSocketUpgrade(c.Request) { handleWebsocket(c) c.Abort() } else { @@ -31,8 +43,13 @@ func WebsocketMiddleware() gin.HandlerFunc { } func handleWebsocket(c *gin.Context) { + net := getNetByPath(c.Request.URL.Path) + if net == nil { + c.Status(http.StatusNotFound) + return + } upgrader := websocket.Upgrader{ - CheckOrigin: func(r *http.Request) bool { return true }, + HandshakeTimeout: websocketAuthTimeout, } conn, err := upgrader.Upgrade(c.Writer, c.Request, nil) if err != nil { @@ -40,39 +57,23 @@ func handleWebsocket(c *gin.Context) { return } defer conn.Close() - net := getNetByPath(c.Request.URL.Path) - if net == nil { - logger.Debug("net not found: %v", c.Request.URL.Path) - return - } + conn.SetReadLimit(maxWebsocketMessageSize) ws := &candysocket{ctx: c, conn: conn, net: net} conn.SetPingHandler(func(buffer string) error { return ws.handlePingMessage(buffer) }) for { - ws.updateReadDeadline() + if err := ws.updateReadDeadline(); err != nil { + break + } messageType, buffer, err := conn.ReadMessage() if err != nil { logger.Debug("read websocket failed: %v", err) break } if messageType != websocket.BinaryMessage { - continue - } - switch uint8(buffer[0]) { - case AUTH: - err = ws.handleAuthMessage(buffer) - case FORWARD: - err = ws.handleForwardMessage(buffer) - case DHCP: - err = ws.handleDHCPMessage(buffer) - case PEER: - err = ws.handlePeerConnMessage(buffer) - case VMAC: - err = ws.handleVMacMessage(buffer) - case DISCOVERY: - err = ws.handleDiscoveryMessage(buffer) - case GENERAL: - err = ws.handleGeneralMessage(buffer) + err = fmt.Errorf("only binary messages are supported") + } else { + err = ws.handleMessage(buffer) } if err != nil { logger.Debug("handle client message failed: %v", err) @@ -480,6 +481,9 @@ func (ws *candysocket) updateSystemRoute() { routes := []model.Route{} db.Where(&model.Route{NetID: ws.net.model.ID}).Order("priority").Find(&routes) for _, route := range routes { + if header.Size == 255 { + break + } deviceAddr := strIpToUint32(route.DevAddr) deviceMask := strIpToUint32(route.DevMask) if deviceAddr != deviceMask&ws.dev.ip { @@ -498,3 +502,27 @@ func (ws *candysocket) updateSystemRoute() { ws.writeMessage(append(headerBuffer.Bytes(), bodyBuffer.Bytes()...)) } } + +func (ws *candysocket) handleMessage(buffer []byte) error { + if len(buffer) == 0 || len(buffer) > maxWebsocketMessageSize { + return fmt.Errorf("invalid websocket message size") + } + switch buffer[0] { + case AUTH: + return ws.handleAuthMessage(buffer) + case FORWARD: + return ws.handleForwardMessage(buffer) + case DHCP: + return ws.handleDHCPMessage(buffer) + case PEER: + return ws.handlePeerConnMessage(buffer) + case VMAC: + return ws.handleVMacMessage(buffer) + case DISCOVERY: + return ws.handleDiscoveryMessage(buffer) + case GENERAL: + return ws.handleGeneralMessage(buffer) + default: + return fmt.Errorf("unsupported websocket message type") + } +} From e7fb6fab56b2a70d753b847a53ccab0c731b2e0f Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:25:09 +0800 Subject: [PATCH 18/36] fix(tunnel): enforce authenticated connection lifecycle and revocation --- candy/device.go | 2 + candy/net.go | 67 ++++++++----- candy/security_test.go | 153 ++++++++++++++++++++++++++++++ candy/websocket.go | 210 ++++++++++++++++++++++++++--------------- 4 files changed, 331 insertions(+), 101 deletions(-) diff --git a/candy/device.go b/candy/device.go index 9e90072..dffaa5a 100644 --- a/candy/device.go +++ b/candy/device.go @@ -1,6 +1,7 @@ package candy import ( + "sync" "time" "github.com/lanthora/cacao/model" @@ -26,6 +27,7 @@ func autoCleanInactiveDevice() { } type Device struct { + mutex sync.Mutex model *model.Device ip uint32 } diff --git a/candy/net.go b/candy/net.go index 836cd61..7d4487e 100644 --- a/candy/net.go +++ b/candy/net.go @@ -33,6 +33,8 @@ type Net struct { model *model.Net ipWsMap map[uint32]*candysocket ipWsMapMutex sync.RWMutex + connections map[*candysocket]struct{} + closed bool net uint32 host uint32 @@ -50,14 +52,16 @@ func flush() { for _, n := range idNetMap { n.ipWsMapMutex.RLock() - defer n.ipWsMapMutex.RUnlock() hasDeviceOnline := false for _, ws := range n.ipWsMap { + ws.dev.mutex.Lock() if ws.dev.model.Online { hasDeviceOnline = true ws.dev.model.SaveRxTxOnline() } + ws.dev.mutex.Unlock() } + n.ipWsMapMutex.RUnlock() if hasDeviceOnline && !refreshedUsers.ContainsOne(n.model.UserID) { model.RefreshUserLastActiveTimeByUserID(n.model.UserID) refreshedUsers.Add(n.model.UserID) @@ -149,12 +153,31 @@ func (n *Net) updateHost() string { return uint32ToStrIp(n.net | n.host) } +func checkMessageTimestamp(timestamp int64) error { + // Candy clients use Unix seconds. Compare bounds instead of subtracting + // untrusted int64 values, which could overflow. + now := time.Now().Unix() + if timestamp < now-300 || timestamp > now+300 { + return fmt.Errorf("authentication timestamp outside the five-minute window") + } + return nil +} + func (n *Net) close() { n.ipWsMapMutex.Lock() defer n.ipWsMapMutex.Unlock() - for ip, ws := range n.ipWsMap { - ws.writeCloseMessage("net close") + n.closed = true + // Include connections that have not finished authentication. Otherwise a + // connection could authenticate with the old password after a rotation. + for ws := range n.connections { + ws.authenticated.Store(false) ws.conn.Close() + } + for ip, ws := range n.ipWsMap { + ws.dev.mutex.Lock() + ws.dev.model.Online = false + ws.dev.model.SaveRxTxOnline() + ws.dev.mutex.Unlock() delete(n.ipWsMap, ip) } } @@ -171,7 +194,10 @@ func IsInvalidDHCP(cidr string) bool { func InsertNet(netModel *model.Net) { idNetMapMutex.Lock() defer idNetMapMutex.Unlock() + insertNetLocked(netModel) +} +func insertNetLocked(netModel *model.Net) { if IsInvalidDHCP(netModel.DHCP) { logger.Fatal("invalid net cidr: %v", netModel.DHCP) return @@ -183,19 +209,24 @@ func InsertNet(netModel *model.Net) { hostid := rand.Uint32() & ^mask net := &Net{ - model: netModel, - ipWsMap: make(map[uint32]*candysocket), - net: netid, - host: hostid, - mask: mask, + model: netModel, + ipWsMap: make(map[uint32]*candysocket), + connections: make(map[*candysocket]struct{}), + net: netid, + host: hostid, + mask: mask, } net.updateHost() idNetMap[netModel.ID] = net } func UpdateNet(netModel *model.Net) { - DeleteNet(netModel.ID) - InsertNet(netModel) + idNetMapMutex.Lock() + defer idNetMapMutex.Unlock() + if n := idNetMap[netModel.ID]; n != nil { + n.close() + } + insertNetLocked(netModel) } func DeleteNet(netid uint) { @@ -212,9 +243,9 @@ func DeleteNet(netid uint) { func ReloadNet(netid uint) { idNetMapMutex.Lock() defer idNetMapMutex.Unlock() - - if net, ok := idNetMap[netid]; ok { - net.close() + if n := idNetMap[netid]; n != nil { + n.close() + insertNetLocked(n.model) } } @@ -283,13 +314,3 @@ func strIpToUint32(ip string) uint32 { rv := uint32(s[0]<<24 | s[1]<<16 | s[2]<<8 | s[3]) return rv } - -func checkMessageTimestamp(timestamp int64) error { - // Candy clients use Unix seconds. Compare bounds instead of subtracting - // untrusted int64 values, which could overflow. - now := time.Now().Unix() - if timestamp < now-300 || timestamp > now+300 { - return fmt.Errorf("authentication timestamp outside the five-minute window") - } - return nil -} diff --git a/candy/security_test.go b/candy/security_test.go index ac2d657..9437aa8 100644 --- a/candy/security_test.go +++ b/candy/security_test.go @@ -66,6 +66,16 @@ func newNamedTestWebsocketNetwork(t *testing.T, cidr, username, netname string) n := getNetById(network.ID) t.Cleanup(func() { DeleteNet(network.ID) + deadline := time.Now().Add(2 * time.Second) + for time.Now().Before(deadline) { + n.ipWsMapMutex.RLock() + remaining := len(n.connections) + n.ipWsMapMutex.RUnlock() + if remaining == 0 { + break + } + time.Sleep(time.Millisecond) + } db.Unscoped().Where("net_id = ?", network.ID).Delete(&model.Device{}) db.Unscoped().Delete(network) db.Unscoped().Delete(user) @@ -165,6 +175,25 @@ func TestAuthenticationTimestamps(t *testing.T) { } } +func TestUnauthenticatedMessagesRejected(t *testing.T) { + for _, kind := range []uint8{AUTH, DHCP, PEER, FORWARD, DISCOVERY, GENERAL} { + t.Run(fmt.Sprint(kind), func(t *testing.T) { + for _, dev := range []*Device{nil, {model: &model.Device{}}} { + ws := &candysocket{dev: dev, net: &Net{model: &model.Net{}}} + if err := ws.handleMessage([]byte{kind}); err == nil { + t.Fatal("unauthenticated or truncated message accepted") + } + } + }) + } + ws := &candysocket{} + for _, input := range [][]byte{nil, {}, {ROUTE}, make([]byte, maxWebsocketMessageSize+1)} { + if ws.handleMessage(input) == nil { + t.Fatal("malformed frame accepted") + } + } +} + func TestWebsocketHandshakeAndFrameLimits(t *testing.T) { _, url := newTestWebsocketNetwork(t, "10.20.0.0/24") for _, origin := range []string{"https://attacker.invalid", "null"} { @@ -189,3 +218,127 @@ func TestWebsocketHandshakeAndFrameLimits(t *testing.T) { t.Fatalf("websocket bypassed API routing: %v, %v", response, err) } } + +func TestAPIUsernameWebsocketCompatibility(t *testing.T) { + for _, netname := range []string{"@", "secure"} { + t.Run(netname, func(t *testing.T) { + n, url := newNamedTestWebsocketNetwork(t, "10.20.0.0/24", "api", netname) + conn := dialTestWebsocket(t, url) + authenticateTestWebsocket(t, conn, n, "0123456789abcdef", 0x0a140001) + }) + } +} + +func TestVMacDoesNotAuthorizePeerRelay(t *testing.T) { + n, url := newTestWebsocketNetwork(t, "10.20.0.0/24") + conn := dialTestWebsocket(t, url) + sendVMac(t, conn, n, "0123456789abcdef") + peer := signedMessage(t, "", &PeerConnMessage{Type: PEER, Src: 0, Dst: 0x0a140001, IP: 0x7f000001, Port: 1234}) + conn.WriteMessage(websocket.BinaryMessage, peer) + if _, _, err := conn.ReadMessage(); err == nil { + t.Fatal("VMAC alone authorized a peer message") + } + var count int64 + storage.Get().Model(&model.Device{}).Where("net_id = ?", n.model.ID).Count(&count) + if count != 0 { + t.Fatal("unauthenticated peer message created a device") + } +} + +func TestAuthenticatedForwardingAndIdentityImmutability(t *testing.T) { + n, url := newTestWebsocketNetwork(t, "10.20.0.0/24") + conn := dialTestWebsocket(t, url) + ip := uint32(0x0a140001) + authenticateTestWebsocket(t, conn, n, "0123456789abcdef", ip) + // Routed packets keep their original source IP. Preserve subnet gateways. + packet := signedMessage(t, "", &ForwardMessage{Type: FORWARD, Src: 0xac100001, Dst: ip}) + conn.WriteMessage(websocket.BinaryMessage, packet) + if _, response, err := conn.ReadMessage(); err != nil || !bytes.Equal(packet, response) { + t.Fatalf("legitimate routed forwarding failed: %v", err) + } + sendVMac(t, conn, n, "fedcba9876543210") + if _, _, err := conn.ReadMessage(); err == nil { + t.Fatal("authenticated connection changed its identity") + } +} + +func TestNetworkRevocationClosesPendingAuthentication(t *testing.T) { + n, url := newTestWebsocketNetwork(t, "10.20.0.0/24") + conn := dialTestWebsocket(t, url) + sendVMac(t, conn, n, "0123456789abcdef") + n.close() + if _, _, err := conn.ReadMessage(); err == nil { + t.Fatal("pending connection survived network revocation") + } +} + +func TestPasswordRotationRetiresExistingNetwork(t *testing.T) { + n, url := newTestWebsocketNetwork(t, "10.20.0.0/24") + online := dialTestWebsocket(t, url) + authenticateTestWebsocket(t, online, n, "0123456789abcdef", 0x0a140001) + pending := dialTestWebsocket(t, url) + sendVMac(t, pending, n, "fedcba9876543210") + updated := *n.model + updated.Password = "rotated-password" + updated.Update() + UpdateNet(&updated) + for _, conn := range []*websocket.Conn{online, pending} { + if _, _, err := conn.ReadMessage(); err == nil { + t.Fatal("old connection survived password rotation") + } + } + newNetwork := getNetById(n.model.ID) + reconnected := dialTestWebsocket(t, url) + authenticateTestWebsocket(t, reconnected, newNetwork, "0123456789abcdef", 0x0a140001) + var device model.Device + if err := storage.Get().Where(&model.Device{NetID: n.model.ID, VMac: "0123456789abcdef"}).Take(&device).Error; err != nil || !device.Online { + t.Fatalf("old connection cleanup overwrote the reconnected device: %v", err) + } +} + +func TestReconnectDoesNotLoseReplacementConnection(t *testing.T) { + n, url := newTestWebsocketNetwork(t, "10.20.0.0/24") + first := dialTestWebsocket(t, url) + authenticateTestWebsocket(t, first, n, "0123456789abcdef", 0x0a140001) + second := dialTestWebsocket(t, url) + authenticateTestWebsocket(t, second, n, "0123456789abcdef", 0x0a140001) + if _, _, err := first.ReadMessage(); err == nil { + t.Fatal("duplicate device connection was not retired") + } + echo := signedMessage(t, "", &DiscoveryMessage{Type: DISCOVERY, Src: 0x0a140001, Dst: 0x0a140001}) + second.WriteMessage(websocket.BinaryMessage, echo) + if _, response, err := second.ReadMessage(); err != nil || !bytes.Equal(response, echo) { + t.Fatalf("replacement device lost after old connection cleanup: %v", err) + } +} + +func TestUnauthenticatedPingCannotExtendDeadline(t *testing.T) { + finished := make(chan error, 1) + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + conn, err := (&websocket.Upgrader{}).Upgrade(w, r, nil) + if err != nil { + finished <- err + return + } + defer conn.Close() + ws := &candysocket{conn: conn, authDeadline: time.Now().Add(100 * time.Millisecond)} + conn.SetPingHandler(ws.handlePingMessage) + ws.updateReadDeadline() + _, _, err = conn.ReadMessage() + finished <- err + })) + defer server.Close() + conn := dialTestWebsocket(t, "ws"+strings.TrimPrefix(server.URL, "http")) + for i := 0; i < 3; i++ { + conn.WriteControl(websocket.PingMessage, []byte("candy::test::1"), time.Now().Add(time.Second)) + time.Sleep(10 * time.Millisecond) + } + select { + case err := <-finished: + if timeout, ok := err.(net.Error); !ok || !timeout.Timeout() { + t.Fatalf("expected authentication timeout, received %v", err) + } + case <-time.After(time.Second): + t.Fatal("unauthenticated ping extended the authentication deadline") + } +} diff --git a/candy/websocket.go b/candy/websocket.go index c1e4040..5a6250a 100644 --- a/candy/websocket.go +++ b/candy/websocket.go @@ -8,6 +8,7 @@ import ( "net/http" "strings" "sync" + "sync/atomic" "time" "github.com/gin-gonic/gin" @@ -58,7 +59,15 @@ func handleWebsocket(c *gin.Context) { } defer conn.Close() conn.SetReadLimit(maxWebsocketMessageSize) - ws := &candysocket{ctx: c, conn: conn, net: net} + ws := &candysocket{ctx: c, conn: conn, net: net, authDeadline: time.Now().Add(websocketAuthTimeout)} + net.ipWsMapMutex.Lock() + if net.closed { + net.ipWsMapMutex.Unlock() + return + } + net.connections[ws] = struct{}{} + net.ipWsMapMutex.Unlock() + defer ws.disconnect() conn.SetPingHandler(func(buffer string) error { return ws.handlePingMessage(buffer) }) for { @@ -81,52 +90,91 @@ func handleWebsocket(c *gin.Context) { } } - if ws.dev != nil && ws.dev.model.Online { +} + +type candysocket struct { + ctx *gin.Context + conn *websocket.Conn + connMutex sync.Mutex + dev *Device + net *Net + authenticated atomic.Bool + authDeadline time.Time +} + +func (ws *candysocket) disconnect() { + ws.net.ipWsMapMutex.Lock() + defer ws.net.ipWsMapMutex.Unlock() + ws.authenticated.Store(false) + delete(ws.net.connections, ws) + if ws.dev != nil && ws.net.ipWsMap[ws.dev.ip] == ws { + delete(ws.net.ipWsMap, ws.dev.ip) + ws.dev.mutex.Lock() + defer ws.dev.mutex.Unlock() ws.dev.model.Online = false ws.dev.model.SaveRxTxOnline() - - net.ipWsMapMutex.Lock() - defer net.ipWsMapMutex.Unlock() - delete(net.ipWsMap, ws.dev.ip) } } -type candysocket struct { - ctx *gin.Context - conn *websocket.Conn - connMutex sync.Mutex - dev *Device - net *Net +func (ws *candysocket) handleMessage(buffer []byte) error { + if len(buffer) == 0 || len(buffer) > maxWebsocketMessageSize { + return fmt.Errorf("invalid websocket message size") + } + switch buffer[0] { + case AUTH: + return ws.handleAuthMessage(buffer) + case FORWARD: + return ws.handleForwardMessage(buffer) + case DHCP: + return ws.handleDHCPMessage(buffer) + case PEER: + return ws.handlePeerConnMessage(buffer) + case VMAC: + return ws.handleVMacMessage(buffer) + case DISCOVERY: + return ws.handleDiscoveryMessage(buffer) + case GENERAL: + return ws.handleGeneralMessage(buffer) + default: + return fmt.Errorf("unsupported websocket message type") + } } func (ws *candysocket) updateReadDeadline() error { - ws.connMutex.Lock() - defer ws.connMutex.Unlock() - return ws.conn.SetReadDeadline((time.Now().Add(60 * time.Second))) + deadline := time.Now().Add(60 * time.Second) + if !ws.authenticated.Load() { + deadline = ws.authDeadline + } + return ws.conn.SetReadDeadline(deadline) } func (ws *candysocket) writeCloseMessage(text string) error { ws.connMutex.Lock() defer ws.connMutex.Unlock() - return ws.conn.WriteMessage(websocket.CloseMessage, []byte(text)) + return ws.conn.WriteControl(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.ClosePolicyViolation, text), time.Now().Add(websocketWriteTimeout)) } func (ws *candysocket) writeMessage(buffer []byte) error { ws.connMutex.Lock() defer ws.connMutex.Unlock() + if err := ws.conn.SetWriteDeadline(time.Now().Add(websocketWriteTimeout)); err != nil { + return err + } return ws.conn.WriteMessage(websocket.BinaryMessage, buffer) } func (ws *candysocket) writePong(buffer []byte) error { ws.connMutex.Lock() defer ws.connMutex.Unlock() - return ws.conn.WriteMessage(websocket.PongMessage, buffer) + return ws.conn.WriteControl(websocket.PongMessage, buffer, time.Now().Add(websocketWriteTimeout)) } func (ws *candysocket) handlePingMessage(buffer string) error { - ws.updateReadDeadline() + if err := ws.updateReadDeadline(); err != nil { + return err + } - if ws.dev == nil { + if !ws.authenticated.Load() { logger.Debug("ping failed: the client is not logged in: %v", buffer) return nil } @@ -137,6 +185,8 @@ func (ws *candysocket) handlePingMessage(buffer string) error { return nil } + ws.dev.mutex.Lock() + defer ws.dev.mutex.Unlock() ws.dev.model.OS = info[1] ws.dev.model.Version = info[2] @@ -148,11 +198,13 @@ func (ws *candysocket) handlePingMessage(buffer string) error { ws.dev.model.SaveOsVersionHostname() } - ws.writePong([]byte(buffer)) - return nil + return ws.writePong([]byte(buffer)) } func (ws *candysocket) handleAuthMessage(buffer []byte) error { + if ws.authenticated.Load() || ws.dev == nil { + return fmt.Errorf("auth failed: unexpected authentication message") + } r := bytes.NewReader(buffer) message := &AuthMessage{} if err := struc.Unpack(r, message); err != nil { @@ -163,27 +215,27 @@ func (ws *candysocket) handleAuthMessage(buffer []byte) error { return err } - if ws.dev == nil { - return fmt.Errorf("auth failed: vmac not received") - } - if ws.net.net != ws.net.mask&message.IP || (^ws.net.mask)&(message.IP) == 0 || (^ws.net.mask)&(message.IP+1) == 0 { ws.writeCloseMessage("ip invalid") return fmt.Errorf("auth failed: network does not match") } + ws.net.ipWsMapMutex.Lock() + defer ws.net.ipWsMapMutex.Unlock() + if ws.net.closed { + return fmt.Errorf("auth failed: network has been revoked") + } if ws.net.ipConflict(uint32ToStrIp(message.IP), ws.dev.model.VMac) { ws.writeCloseMessage("ip conflict") return fmt.Errorf("auth failed: ip conflict: %v", uint32ToStrIp(message.IP)) } - ws.net.ipWsMapMutex.Lock() - defer ws.net.ipWsMapMutex.Unlock() - if oldws, ok := ws.net.ipWsMap[message.IP]; ok { + oldws.authenticated.Store(false) + oldws.dev.mutex.Lock() oldws.dev.model.Online = false oldws.dev.model.SaveRxTxOnline() - oldws.writeCloseMessage("vmac conflict") + oldws.dev.mutex.Unlock() oldws.conn.Close() } @@ -196,34 +248,34 @@ func (ws *candysocket) handleAuthMessage(buffer []byte) error { ws.dev.model.Online = true ws.dev.model.Country, ws.dev.model.Region = GetLocation(net.ParseIP(ws.ctx.ClientIP())) ws.dev.model.Save() + ws.authenticated.Store(true) ws.updateSystemRoute() return nil } func (ws *candysocket) handleForwardMessage(buffer []byte) error { - if ws.dev == nil { + if !ws.authenticated.Load() { return fmt.Errorf("forward failed: conn is not logged in") } - if !ws.dev.model.Online { - return nil - } - r := bytes.NewReader(buffer) message := &ForwardMessage{} if err := struc.Unpack(r, message); err != nil { return err } - ws.dev.model.TX += uint64(len(buffer)) + ws.addTX(len(buffer)) ws.net.ipWsMapMutex.RLock() defer ws.net.ipWsMapMutex.RUnlock() + if !ws.authenticated.Load() { + return fmt.Errorf("forward failed: authentication has been revoked") + } if dstWs, ok := ws.net.ipWsMap[message.Dst]; ok { dstWs.writeMessage(buffer) - dstWs.dev.model.RX += uint64(len(buffer)) + dstWs.addRX(len(buffer)) } broadcast := func() bool { @@ -244,9 +296,9 @@ func (ws *candysocket) handleForwardMessage(buffer []byte) error { if broadcast { for _, dstWs := range ws.net.ipWsMap { - if dstWs != ws && dstWs.dev.model.Online { + if dstWs != ws && dstWs.authenticated.Load() { dstWs.writeMessage(buffer) - dstWs.dev.model.RX += uint64(len(buffer)) + dstWs.addRX(len(buffer)) } } } @@ -255,6 +307,9 @@ func (ws *candysocket) handleForwardMessage(buffer []byte) error { } func (ws *candysocket) handleDHCPMessage(buffer []byte) error { + if ws.dev == nil || ws.dev.model == nil || ws.authenticated.Load() { + return fmt.Errorf("dhcp failed: unexpected DHCP message") + } r := bytes.NewReader(buffer) message := &DHCPMessage{} if err := struc.Unpack(r, message); err != nil { @@ -265,10 +320,6 @@ func (ws *candysocket) handleDHCPMessage(buffer []byte) error { return err } - if ws.dev.model == nil { - return fmt.Errorf("dhcp failed: vmac not received") - } - db := storage.Get() // 检查能否使用数据库中地址, 地址可用时更新响应结果 @@ -356,7 +407,7 @@ func (ws *candysocket) handleDHCPMessage(buffer []byte) error { } func (ws *candysocket) handlePeerConnMessage(buffer []byte) error { - if ws.dev == nil { + if !ws.authenticated.Load() { return fmt.Errorf("peer conn failed: conn is not logged in") } @@ -372,6 +423,9 @@ func (ws *candysocket) handlePeerConnMessage(buffer []byte) error { ws.net.ipWsMapMutex.RLock() defer ws.net.ipWsMapMutex.RUnlock() + if !ws.authenticated.Load() { + return fmt.Errorf("peer conn failed: authentication has been revoked") + } if dstWs, ok := ws.net.ipWsMap[message.Dst]; ok { dstWs.writeMessage(buffer) @@ -379,13 +433,19 @@ func (ws *candysocket) handlePeerConnMessage(buffer []byte) error { ip := make(net.IP, 4) binary.BigEndian.PutUint32(ip, message.IP) - ws.dev.model.Country, ws.dev.model.Region = GetLocation(ip) + country, region := GetLocation(ip) + ws.dev.mutex.Lock() + defer ws.dev.mutex.Unlock() + ws.dev.model.Country, ws.dev.model.Region = country, region ws.dev.model.Save() return nil } func (ws *candysocket) handleVMacMessage(buffer []byte) error { + if ws.dev != nil || ws.authenticated.Load() { + return fmt.Errorf("vmac failed: identity is already set") + } r := bytes.NewReader(buffer) message := &VMacMessage{} if err := struc.Unpack(r, message); err != nil { @@ -400,8 +460,8 @@ func (ws *candysocket) handleVMacMessage(buffer []byte) error { } func (ws *candysocket) handleDiscoveryMessage(buffer []byte) error { - if ws.dev == nil || !ws.dev.model.Online { - return nil + if !ws.authenticated.Load() { + return fmt.Errorf("discovery failed: conn is not logged in") } r := bytes.NewReader(buffer) @@ -414,21 +474,24 @@ func (ws *candysocket) handleDiscoveryMessage(buffer []byte) error { return fmt.Errorf("discovery failed: source address does not match login information") } - ws.dev.model.TX += uint64(len(buffer)) + ws.addTX(len(buffer)) ws.net.ipWsMapMutex.RLock() defer ws.net.ipWsMapMutex.RUnlock() + if !ws.authenticated.Load() { + return fmt.Errorf("discovery failed: authentication has been revoked") + } if dstWs, ok := ws.net.ipWsMap[message.Dst]; ok { dstWs.writeMessage(buffer) - dstWs.dev.model.RX += uint64(len(buffer)) + dstWs.addRX(len(buffer)) } if uint32(0xFFFFFFFF) == message.Dst { for _, dstWs := range ws.net.ipWsMap { - if dstWs != ws && dstWs.dev.model.Online { + if dstWs != ws && dstWs.authenticated.Load() { dstWs.writeMessage(buffer) - dstWs.dev.model.RX += uint64(len(buffer)) + dstWs.addRX(len(buffer)) } } } @@ -437,8 +500,8 @@ func (ws *candysocket) handleDiscoveryMessage(buffer []byte) error { } func (ws *candysocket) handleGeneralMessage(buffer []byte) error { - if ws.dev == nil || !ws.dev.model.Online { - return nil + if !ws.authenticated.Load() { + return fmt.Errorf("general failed: conn is not logged in") } r := bytes.NewReader(buffer) @@ -451,21 +514,24 @@ func (ws *candysocket) handleGeneralMessage(buffer []byte) error { return fmt.Errorf("general failed: source address does not match login information") } - ws.dev.model.TX += uint64(len(buffer)) + ws.addTX(len(buffer)) ws.net.ipWsMapMutex.RLock() defer ws.net.ipWsMapMutex.RUnlock() + if !ws.authenticated.Load() { + return fmt.Errorf("general failed: authentication has been revoked") + } if dstWs, ok := ws.net.ipWsMap[message.Dst]; ok { dstWs.writeMessage(buffer) - dstWs.dev.model.RX += uint64(len(buffer)) + dstWs.addRX(len(buffer)) } if ws.net.model.Broadcast && uint32(0xFFFFFFFF) == message.Dst { for _, dstWs := range ws.net.ipWsMap { - if dstWs != ws && dstWs.dev.model.Online { + if dstWs != ws && dstWs.authenticated.Load() { dstWs.writeMessage(buffer) - dstWs.dev.model.RX += uint64(len(buffer)) + dstWs.addRX(len(buffer)) } } } @@ -503,26 +569,14 @@ func (ws *candysocket) updateSystemRoute() { } } -func (ws *candysocket) handleMessage(buffer []byte) error { - if len(buffer) == 0 || len(buffer) > maxWebsocketMessageSize { - return fmt.Errorf("invalid websocket message size") - } - switch buffer[0] { - case AUTH: - return ws.handleAuthMessage(buffer) - case FORWARD: - return ws.handleForwardMessage(buffer) - case DHCP: - return ws.handleDHCPMessage(buffer) - case PEER: - return ws.handlePeerConnMessage(buffer) - case VMAC: - return ws.handleVMacMessage(buffer) - case DISCOVERY: - return ws.handleDiscoveryMessage(buffer) - case GENERAL: - return ws.handleGeneralMessage(buffer) - default: - return fmt.Errorf("unsupported websocket message type") - } +func (ws *candysocket) addTX(size int) { + ws.dev.mutex.Lock() + defer ws.dev.mutex.Unlock() + ws.dev.model.TX += uint64(size) +} + +func (ws *candysocket) addRX(size int) { + ws.dev.mutex.Lock() + defer ws.dev.mutex.Unlock() + ws.dev.model.RX += uint64(size) } From 6e1d2d15fab32be6cb7a8d3ac981a6d1f4509f18 Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:25:14 +0800 Subject: [PATCH 19/36] fix(tunnel): validate DHCP inputs and bound address allocation --- candy/net.go | 3 ++- candy/security_test.go | 44 +++++++++++++++++++++++++++++++++++ candy/websocket.go | 52 ++++++++++++++++++++++++++++++------------ 3 files changed, 83 insertions(+), 16 deletions(-) diff --git a/candy/net.go b/candy/net.go index 7d4487e..750e70a 100644 --- a/candy/net.go +++ b/candy/net.go @@ -35,6 +35,7 @@ type Net struct { ipWsMapMutex sync.RWMutex connections map[*candysocket]struct{} closed bool + dhcpMutex sync.Mutex net uint32 host uint32 @@ -184,7 +185,7 @@ func (n *Net) close() { func IsInvalidDHCP(cidr string) bool { _, ipNet, err := net.ParseCIDR(cidr) - if err != nil { + if err != nil || ipNet.IP.To4() == nil || len(ipNet.Mask) != net.IPv4len { return true } mask := binary.BigEndian.Uint32(ipNet.Mask) diff --git a/candy/security_test.go b/candy/security_test.go index 9437aa8..6d1747c 100644 --- a/candy/security_test.go +++ b/candy/security_test.go @@ -262,6 +262,22 @@ func TestAuthenticatedForwardingAndIdentityImmutability(t *testing.T) { } } +func TestDHCPWithoutNullTerminator(t *testing.T) { + n, url := newTestWebsocketNetwork(t, "10.20.0.0/24") + conn := dialTestWebsocket(t, url) + sendVMac(t, conn, n, "0123456789abcdef") + message := &DHCPMessage{Type: DHCP, Timestamp: time.Now().Unix(), Cidr: bytes.Repeat([]byte{'x'}, 32)} + conn.WriteMessage(websocket.BinaryMessage, signedMessage(t, n.model.Password, message)) + _, reply, err := conn.ReadMessage() + if err != nil { + t.Fatal(err) + } + var response DHCPMessage + if err := struc.Unpack(bytes.NewReader(reply), &response); err != nil || !bytes.HasPrefix(response.Cidr, []byte("10.20.0.")) { + t.Fatalf("DHCP allocation failed: %q, %v", response.Cidr, err) + } +} + func TestNetworkRevocationClosesPendingAuthentication(t *testing.T) { n, url := newTestWebsocketNetwork(t, "10.20.0.0/24") conn := dialTestWebsocket(t, url) @@ -312,6 +328,23 @@ func TestReconnectDoesNotLoseReplacementConnection(t *testing.T) { } } +func TestExhaustedDHCPTerminates(t *testing.T) { + n, url := newTestWebsocketNetwork(t, "10.20.0.0/30") + for i := 1; i <= 2; i++ { + device := &model.Device{NetID: n.model.ID, VMac: fmt.Sprintf("%016x", i), IP: fmt.Sprintf("10.20.0.%d", i)} + if err := storage.Get().Create(device).Error; err != nil { + t.Fatal(err) + } + } + conn := dialTestWebsocket(t, url) + sendVMac(t, conn, n, "0123456789abcdef") + message := &DHCPMessage{Type: DHCP, Timestamp: time.Now().Unix(), Cidr: make([]byte, 32)} + conn.WriteMessage(websocket.BinaryMessage, signedMessage(t, n.model.Password, message)) + if _, _, err := conn.ReadMessage(); err == nil { + t.Fatal("exhausted DHCP unexpectedly allocated an address") + } +} + func TestUnauthenticatedPingCannotExtendDeadline(t *testing.T) { finished := make(chan error, 1) server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { @@ -342,3 +375,14 @@ func TestUnauthenticatedPingCannotExtendDeadline(t *testing.T) { t.Fatal("unauthenticated ping extended the authentication deadline") } } + +func TestDHCPRejectsUnsupportedSubnets(t *testing.T) { + for _, cidr := range []string{"::/0", "2001:db8::/64", "10.0.0.0/31", "10.0.0.1/32", "invalid"} { + if !IsInvalidDHCP(cidr) { + t.Errorf("unsupported DHCP subnet accepted: %s", cidr) + } + } + if IsInvalidDHCP("10.0.0.0/24") { + t.Fatal("existing IPv4 subnet rejected") + } +} diff --git a/candy/websocket.go b/candy/websocket.go index 5a6250a..ca9447b 100644 --- a/candy/websocket.go +++ b/candy/websocket.go @@ -17,7 +17,6 @@ import ( "github.com/lanthora/cacao/model" "github.com/lanthora/cacao/storage" "github.com/lunixbochs/struc" - "gorm.io/gorm" ) const ( @@ -321,6 +320,8 @@ func (ws *candysocket) handleDHCPMessage(buffer []byte) error { } db := storage.Get() + ws.net.dhcpMutex.Lock() + defer ws.net.dhcpMutex.Unlock() // 检查能否使用数据库中地址, 地址可用时更新响应结果 canUseLatestAddress := func() bool { @@ -356,19 +357,26 @@ func (ws *candysocket) handleDHCPMessage(buffer []byte) error { return false } cidr := func(input []byte) string { - return string(input[:bytes.IndexByte(input[:], 0)]) + if end := bytes.IndexByte(input, 0); end >= 0 { + input = input[:end] + } + return string(input) }(message.Cidr) ip, ipNet, err := net.ParseCIDR(cidr) - if err != nil { + if err != nil || ip.To4() == nil || len(ipNet.Mask) != net.IPv4len { return true } - if binary.BigEndian.Uint32(ipNet.IP) != ws.net.net { + if binary.BigEndian.Uint32(ipNet.IP.To4()) != ws.net.net { return true } if binary.BigEndian.Uint32(ipNet.Mask) != ws.net.mask { return true } + host := binary.BigEndian.Uint32(ip.To4()) & ^ws.net.mask + if host == 0 || host == ^ws.net.mask { + return true + } devices := []model.Device{} db.Where(&model.Device{NetID: ws.net.model.ID, IP: ip.String()}).Find(&devices) if len(devices) > 1 { @@ -384,26 +392,40 @@ func (ws *candysocket) handleDHCPMessage(buffer []byte) error { }() // 用户传入的地址也不可用时, 生成一个新地址, 并更新响应结果 - var oldHost = ws.net.host - for needGenNewAddress { - device := &model.Device{NetID: ws.net.model.ID, IP: ws.net.updateHost()} - if db.Where(device).Take(&device).Error == gorm.ErrRecordNotFound { + // One query bounds the database work even for a large or exhausted subnet. + var assignedIPs []string + if needGenNewAddress { + if err := db.Model(&model.Device{}).Where("net_id = ?", ws.net.model.ID).Pluck("ip", &assignedIPs).Error; err != nil { + return err + } + } + assigned := make(map[string]struct{}, len(assignedIPs)) + for _, ip := range assignedIPs { + assigned[ip] = struct{}{} + } + maxAttempts := uint64(len(assigned)) + 1 + if capacity := uint64(^ws.net.mask) - 1; maxAttempts > capacity { + maxAttempts = capacity + } + for attempts := uint64(0); needGenNewAddress; attempts++ { + if attempts >= maxAttempts { + ws.writeCloseMessage("not enough address") + return fmt.Errorf("dhcp failed: not enough address") + } + if _, used := assigned[ws.net.updateHost()]; !used { ipNet := net.IPNet{IP: make(net.IP, 4), Mask: make(net.IPMask, 4)} binary.BigEndian.PutUint32(ipNet.IP, ws.net.net|ws.net.host) binary.BigEndian.PutUint32(ipNet.Mask, ws.net.mask) message.Cidr = []byte(ipNet.String()) break } - if oldHost == ws.net.host { - ws.writeCloseMessage("not enough address") - return fmt.Errorf("dhcp failed: not enough address") - } } var output bytes.Buffer - struc.Pack(&output, message) - ws.writeMessage(output.Bytes()) - return nil + if err := struc.Pack(&output, message); err != nil { + return err + } + return ws.writeMessage(output.Bytes()) } func (ws *candysocket) handlePeerConnMessage(buffer []byte) error { From a549b7c81aff7a3f595480722b8667d9e5379163 Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:25:20 +0800 Subject: [PATCH 20/36] fix(tunnel): bound failed authentication attempts per client IP --- candy/security.go | 70 ++++++++++++++++++++++++++++++++++++++++++ candy/security_test.go | 33 ++++++++++++++++++++ candy/websocket.go | 8 +++++ 3 files changed, 111 insertions(+) create mode 100644 candy/security.go diff --git a/candy/security.go b/candy/security.go new file mode 100644 index 0000000..3516c17 --- /dev/null +++ b/candy/security.go @@ -0,0 +1,70 @@ +package candy + +import ( + "sync" + "time" +) + +const ( + websocketFailureLimit = 60 + maxWebsocketFailureEntries = 4096 +) + +type websocketFailure struct { + count int + expires time.Time +} + +// Only unsuccessful authentication attempts consume this allowance. Normal +// reconnects and authenticated tunnel traffic are not rate limited. +type websocketFailureLimiter struct { + mutex sync.Mutex + entries map[string]websocketFailure +} + +var websocketFailures = websocketFailureLimiter{entries: make(map[string]websocketFailure)} + +func (l *websocketFailureLimiter) allow(ip string) bool { + l.mutex.Lock() + defer l.mutex.Unlock() + entry, ok := l.entries[ip] + if !ok { + if len(l.entries) >= maxWebsocketFailureEntries { + now := time.Now() + for key, value := range l.entries { + if now.After(value.expires) { + delete(l.entries, key) + } + } + } + return len(l.entries) < maxWebsocketFailureEntries + } + if time.Now().After(entry.expires) { + delete(l.entries, ip) + return true + } + return entry.count < websocketFailureLimit +} + +func (l *websocketFailureLimiter) record(ip string) { + l.mutex.Lock() + defer l.mutex.Unlock() + now := time.Now() + entry, ok := l.entries[ip] + if !ok || now.After(entry.expires) { + if len(l.entries) >= maxWebsocketFailureEntries { + for key, value := range l.entries { + if now.After(value.expires) { + delete(l.entries, key) + } + } + // Keep memory bounded under a distributed attack. + if len(l.entries) >= maxWebsocketFailureEntries && !ok { + return + } + } + entry = websocketFailure{expires: now.Add(time.Minute)} + } + entry.count++ + l.entries[ip] = entry +} diff --git a/candy/security_test.go b/candy/security_test.go index 6d1747c..b88a85d 100644 --- a/candy/security_test.go +++ b/candy/security_test.go @@ -376,6 +376,39 @@ func TestUnauthenticatedPingCannotExtendDeadline(t *testing.T) { } } +func TestWebsocketFailureLimiter(t *testing.T) { + limiter := websocketFailureLimiter{entries: make(map[string]websocketFailure)} + for i := 0; i < websocketFailureLimit; i++ { + if !limiter.allow("192.0.2.1") { + t.Fatal("failure allowance exhausted early") + } + limiter.record("192.0.2.1") + } + if limiter.allow("192.0.2.1") || !limiter.allow("192.0.2.2") { + t.Fatal("failure limit is not isolated by client IP") + } + limiter.entries["192.0.2.1"] = websocketFailure{count: websocketFailureLimit, expires: time.Now().Add(-time.Second)} + if !limiter.allow("192.0.2.1") { + t.Fatal("expired failure limit was not released") + } + for i := 0; i < maxWebsocketFailureEntries+100; i++ { + limiter.record(fmt.Sprint(i)) + } + if len(limiter.entries) > maxWebsocketFailureEntries { + t.Fatal("failure limiter exceeded its memory bound") + } + if limiter.allow("new-client") { + t.Fatal("a full failure table allowed an untracked client to bypass throttling") + } + if !limiter.allow("0") { + t.Fatal("a full failure table blocked an existing client below its failure limit") + } + limiter.entries["0"] = websocketFailure{count: 1, expires: time.Now().Add(-time.Second)} + if !limiter.allow("new-client") { + t.Fatal("expired entries were not released for a new client") + } +} + func TestDHCPRejectsUnsupportedSubnets(t *testing.T) { for _, cidr := range []string{"::/0", "2001:db8::/64", "10.0.0.0/31", "10.0.0.1/32", "invalid"} { if !IsInvalidDHCP(cidr) { diff --git a/candy/websocket.go b/candy/websocket.go index ca9447b..36545ca 100644 --- a/candy/websocket.go +++ b/candy/websocket.go @@ -48,6 +48,11 @@ func handleWebsocket(c *gin.Context) { c.Status(http.StatusNotFound) return } + if !websocketFailures.allow(c.ClientIP()) { + c.Header("Retry-After", "60") + c.Status(http.StatusTooManyRequests) + return + } upgrader := websocket.Upgrader{ HandshakeTimeout: websocketAuthTimeout, } @@ -84,6 +89,9 @@ func handleWebsocket(c *gin.Context) { err = ws.handleMessage(buffer) } if err != nil { + if !ws.authenticated.Load() { + websocketFailures.record(c.ClientIP()) + } logger.Debug("handle client message failed: %v", err) break } From b0d1b8c1dfa2e7136554d331d1d3d6b9a9532c1e Mon Sep 17 00:00:00 2001 From: SoraKasvgano <8521327+SoraKasvgano@users.noreply.github.com> Date: Wed, 7 Oct 2026 10:25:27 +0800 Subject: [PATCH 21/36] fix(ui): guard navigation with current session and role --- frontend/package.json | 1 + frontend/src/App.vue | 6 ++- frontend/src/main.js | 23 +++++---- frontend/src/security/auth.js | 22 +++++++++ frontend/src/security/auth.test.js | 78 ++++++++++++++++++++++++++++++ frontend/src/views/LoadingView.vue | 25 ---------- 6 files changed, 118 insertions(+), 37 deletions(-) create mode 100644 frontend/src/security/auth.js create mode 100644 frontend/src/security/auth.test.js diff --git a/frontend/package.json b/frontend/package.json index 4fa707f..f6734f1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,6 +6,7 @@ "scripts": { "dev": "vite", "build": "vite build", + "test": "node --test src/security/*.test.js", "preview": "vite preview", "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore", "format": "prettier --write src/" diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 772c867..68cd29a 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -34,17 +34,19 @@ const handleLangChange = (value) => { axios.interceptors.response.use( (response) => { + if (response.config.skipAuthRedirect) return response if (response.data.status != 0) { message.warning(response.data.msg) } if (response.data.status == 2) { - router.push('/login') + router.replace('/login') } else if (response.data.status == 11) { - router.push('/') + router.replace('/') } return response }, (error) => { + if (error.config?.skipAuthRedirect) return Promise.reject(error) const status = error.response?.status message.warning(error.response?.data?.msg || t('security.requestFailed')) if (status === 401) { diff --git a/frontend/src/main.js b/frontend/src/main.js index 77962be..4d829d1 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -2,6 +2,7 @@ import { createWebHistory, createRouter } from 'vue-router' import { createApp } from 'vue' import App from './App.vue' import i18n from './i18n/index' +import { createAuthGuard } from './security/auth' import RegisterView from './views/RegisterView.vue' import LoginView from './views/LoginView.vue' @@ -17,16 +18,16 @@ import StatisticsView from './views/StatisticsView.vue' const routes = [ { path: '/', component: LoadingView }, - { path: '/login', component: LoginView }, - { path: '/register', component: RegisterView }, - { path: '/statistics', component: StatisticsView }, - { path: '/network', component: NetworkView }, - { path: '/device', component: DeviceView }, - { path: '/route', component: RouteView }, - { path: '/user', component: UserView }, - { path: '/admin/license', component: AdminLicense }, - { path: '/admin/user', component: AdminUser }, - { path: '/admin/setting', component: AdminSetting }, + { path: '/login', component: LoginView, meta: { public: true } }, + { path: '/register', component: RegisterView, meta: { public: true } }, + { path: '/statistics', component: StatisticsView, meta: { role: 'normal' } }, + { path: '/network', component: NetworkView, meta: { role: 'normal' } }, + { path: '/device', component: DeviceView, meta: { role: 'normal' } }, + { path: '/route', component: RouteView, meta: { role: 'normal' } }, + { path: '/user', component: UserView, meta: { role: 'normal' } }, + { path: '/admin/license', component: AdminLicense, meta: { role: 'admin' } }, + { path: '/admin/user', component: AdminUser, meta: { role: 'admin' } }, + { path: '/admin/setting', component: AdminSetting, meta: { role: 'admin' } }, { path: '/:pathMatch(.*)', redirect: '/' } ] @@ -35,6 +36,8 @@ const router = createRouter({ routes }) +router.beforeEach(createAuthGuard()) + const app = createApp(App) app.use(router) app.use(i18n) diff --git a/frontend/src/security/auth.js b/frontend/src/security/auth.js new file mode 100644 index 0000000..f23ede2 --- /dev/null +++ b/frontend/src/security/auth.js @@ -0,0 +1,22 @@ +import axios from 'axios' + +// The API remains the authorization boundary. Check the current session before +// mounting a protected page, without trusting a role cached in browser storage. +export const createAuthGuard = (client = axios) => async (to) => { + if (to.meta.public) return true + + try { + const response = await client.post('/api/user/info', null, { + skipAuthRedirect: true, + timeout: 10000 + }) + const role = response.data?.status === 0 ? response.data.data?.role : null + if (role !== 'admin' && role !== 'normal') return '/login' + + const home = role === 'admin' ? '/admin/setting' : '/statistics' + if (to.path === '/' || (to.meta.role && to.meta.role !== role)) return home + return true + } catch { + return '/login' + } +} diff --git a/frontend/src/security/auth.test.js b/frontend/src/security/auth.test.js new file mode 100644 index 0000000..0d12528 --- /dev/null +++ b/frontend/src/security/auth.test.js @@ -0,0 +1,78 @@ +import assert from 'node:assert/strict' +import test from 'node:test' +import { createMemoryHistory, createRouter } from 'vue-router' +import { createAuthGuard } from './auth.js' + +const createRouterFor = (post) => { + const component = { render: () => null } + const router = createRouter({ + history: createMemoryHistory(), + routes: [ + { path: '/', component }, + { path: '/login', component, meta: { public: true } }, + { path: '/register', component, meta: { public: true } }, + { path: '/statistics', component, meta: { role: 'normal' } }, + { path: '/network', component, meta: { role: 'normal' } }, + { path: '/admin/setting', component, meta: { role: 'admin' } } + ] + }) + router.beforeEach(createAuthGuard({ post })) + return router +} + +const session = (role) => ({ data: { status: 0, data: { role } } }) + +test('public login and registration do not require a session', async () => { + const router = createRouterFor(() => assert.fail('must not query the session')) + await router.push('/login') + assert.equal(router.currentRoute.value.path, '/login') + await router.push('/register') + assert.equal(router.currentRoute.value.path, '/register') +}) + +test('anonymous users cannot navigate directly to protected pages', async () => { + const router = createRouterFor(async () => ({ data: { status: 2 } })) + for (const path of ['/admin/setting', '/network', '/']) { + await router.push(path) + assert.equal(router.currentRoute.value.path, '/login') + } +}) + +test('ordinary users are redirected away from administrator pages', async () => { + const router = createRouterFor(async () => session('normal')) + await router.push('/admin/setting') + assert.equal(router.currentRoute.value.path, '/statistics') + await router.push('/network') + assert.equal(router.currentRoute.value.path, '/network') +}) + +test('administrators retain their management landing page', async () => { + const router = createRouterFor(async () => session('admin')) + await router.push('/') + assert.equal(router.currentRoute.value.path, '/admin/setting') + await router.push('/network') + assert.equal(router.currentRoute.value.path, '/admin/setting') +}) + +test('an expired session is checked again on the next navigation', async () => { + let current = session('normal') + const router = createRouterFor(async () => current) + await router.push('/statistics') + current = { data: { status: 2 } } + await router.push('/network') + assert.equal(router.currentRoute.value.path, '/login') +}) + +test('failed requests and unrecognized roles cannot authorize a page', async () => { + const responses = [ + async () => { throw new Error('unavailable') }, + async () => session('unknown'), + async () => ({ data: { status: 11, data: { role: 'admin' } } }), + async () => ({ data: {} }) + ] + for (const post of responses) { + const router = createRouterFor(post) + await router.push('/admin/setting') + assert.equal(router.currentRoute.value.path, '/login') + } +}) diff --git a/frontend/src/views/LoadingView.vue b/frontend/src/views/LoadingView.vue index b4d0015..fb6215e 100644 --- a/frontend/src/views/LoadingView.vue +++ b/frontend/src/views/LoadingView.vue @@ -4,31 +4,6 @@ - -