diff --git a/.gitignore b/.gitignore index 0fee12c..a2e9e9d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ cacao cacao-* sqlite.db +sqlite.db-wal +sqlite.db-shm cookie *.mmdb *.crt diff --git a/README.md b/README.md index e25ad59..774a324 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 @@ -21,3 +23,62 @@ cacao # loglevel=[debug] listen=[127.0.0.1:8080] storage=[/var/lib/cacao] cacao --loglevel=debug --listen=127.0.0.1:8080 --storage=/var/lib/cacao ``` + +## 公网访问加固 + +默认监听地址仍为 `:80`(存储目录存在证书与私钥时为 `:443`)。已有账号、网络密码、客户端报文格式及子网转发保持兼容;不需要重新注册或修改网络密钥。 + +- 登录、首次初始化和修改密码按来源 IP 与账号累计认证失败,达到每分钟 30 次后暂时返回 HTTP 429,带 `Retry-After`。登录/改密最多并行执行 8 次密码校验,超出时提示稍后重试,避免并发爆破耗尽 CPU。成功认证不累计失败;普通业务 API 和已建立的隧道不受该限速影响。 +- Candy WebSocket 每 IP 每分钟最多容许 60 次失败认证;新连接需在 15 秒内完成认证,报文最大 64 KiB。正常转发与成功重连不累计失败次数。客户端与服务器应保持时间同步,签名时间允许前后 5 分钟偏差。 +- 所有私有 API 在服务端校验登录与角色,并校验网络、设备、路由的归属。登录页和注册页可以公开访问,不会因此授予业务权限。 +- Web 会话在服务端 24 小时后失效。升级时已有会话获得一次 24 小时宽限期,无需立即退出;旧密码在下一次成功登录时自动迁移为加盐的 bcrypt 哈希。退出、修改密码、管理员重置密码都会撤销对应旧会话。 +- Cookie 使用 HttpOnly、SameSite=Lax;直接 HTTPS 访问自动加 Secure。API 响应不缓存,并拒绝跨站请求、非 JSON 的非空请求体及超过 1 MiB 的请求。 + +### 反向代理部署 + +**使用反向代理时必须显式设置 `--trusted-proxies` 为实际代理的 IP/CIDR**,并让代理覆盖客户端传来的转发头。默认不信任 `X-Forwarded-For` / `X-Real-IP`,防止攻击者伪造地址绕过限速。未配置时,同一代理后的用户共享来源 IP 的失败额度;不要将全部公网地址设为可信代理。 + +例如,同机 Nginx 终止 HTTPS 时: + +```bash +cacao --listen=127.0.0.1:8080 --storage=/var/lib/cacao --trusted-proxies=127.0.0.1,::1 --secure-cookies=true +``` + +在已有 HTTPS `server` 中保留原域名和客户端路径,并配置: + +```nginx +# Place this map in the http context. +map $http_upgrade $cacao_connection { + default upgrade; + '' close; +} + +# Place this location in the existing HTTPS server context. +location / { + proxy_pass http://127.0.0.1:8080; + proxy_http_version 1.1; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $cacao_connection; + proxy_read_timeout 75s; +} +``` + +`--secure-cookies=true` 仅适用于浏览器确实通过 HTTPS 访问的部署,否则浏览器不会通过 HTTP 发送登录 Cookie。公网应使用 HTTPS/WSS,并在代理或防火墙限制后端端口直连。程序不自动改变已有 HTTP/WS 客户端地址;切换 TLS 前先确认现有客户端配置。时间窗口内的签名重放仍依赖 WSS 防止报文被截获,彻底防重放需要升级客户端协议。 + +### 首次安装 + +只有空数据库首次创建管理员时需要初始化密钥;已有安装不需要设置。启动前设置至少 32 字符的随机密钥,例如: + +```bash +export CACAO_SETUP_TOKEN="$(openssl rand -hex 32)" +cacao --listen=127.0.0.1:8080 --storage=/var/lib/cacao +``` + +通过本机访问或配置好 HTTPS 后,在注册页填写此密钥以创建首个管理员。初始化后可从环境中移除该密钥。普通注册默认关闭,已有管理员设置的开放注册状态会保留。 + +升级前备份存储目录,并在使用相同代理与客户端的测试环境验证。身份认证限速在单进程内生效,重启后计数清空;多实例或大规模流量攻击需同时在入口代理实施防护。开发服务器默认只监听本机,不应作为公网生产入口。 + +安全回归检查:`go test ./...`、`go vet ./...`;前端在 `frontend` 下运行 `npm test`、`npm run build` 和 `npm audit --omit=dev`。 diff --git a/SECURITY_REVIEW.md b/SECURITY_REVIEW.md new file mode 100644 index 0000000..fa765ed --- /dev/null +++ b/SECURITY_REVIEW.md @@ -0,0 +1,38 @@ +# 公网访问安全加固记录 + +检查日期:2026-10-06。范围为本仓库代码与本地回归验证,没有修改线上服务。 + +本次以保留已有账号、网络密码、监听默认值、Candy 报文格式和子网转发行为为约束。登录/注册页可以公开访问,数据权限由服务端判断。成功认证、普通业务 API、已建立隧道不累计认证失败次数;认证失败过多或密码计算并发超过上限时返回可重试的 429。 + +## 已修复的问题 + +| 问题 | 原有风险 | 修复 | +| --- | --- | --- | +| 首次注册自动成为管理员 | 新部署公开后可能被抢先接管 | 空数据库初始化必须提供部署者设置的随机密钥;初始化串行化;已初始化数据库不能重复引导管理员 | +| Candy 认证状态不完整 | 完成 VMAC 后、完成 AUTH 前可以发出 PEER 报文;重复身份报文可能破坏连接状态 | 显式认证状态控制,业务报文必须完成 AUTH,禁止重复身份切换 | +| 无爆破防护、默认信任代理头 | 可以持续猜测凭据,并伪造来源地址绕过按 IP 限制 | HTTP 按 IP/账号累计失败,WebSocket 按 IP 累计失败;限速表有界且不能在满表时绕过;只信任显式配置的代理 | +| 会话无服务端期限、重置密码不撤销令牌 | 被窃取令牌可长期使用,管理员改密后仍有效 | 24 小时会话期限、令牌哈希存储、密码重置撤销会话;旧会话迁移不刷新业务活跃时间 | +| 密码快速确定性哈希、弱随机网络密钥 | 数据库泄漏后的离线猜测成本较低 | 旧密码登录后迁移为 bcrypt;保留长密码兼容;新随机密钥使用密码学随机源 | +| 对象与删除状态检查不足 | 零 ID 查询可能误选记录;越权设备查询暴露在线状态;已删除用户的网络仍可能接入 | 显式 ID 条件、先校验对象归属、过滤软删除用户/网络,并撤销关联连接 | +| 空帧、DHCP 边界、无资源上限 | 异常请求可能触发 panic、耗尽地址池循环、占用内存或连接 | 修复解析边界和有界 DHCP 分配;限制帧/HTTP 请求体/请求头,设置鉴权期限和读写超时 | +| 页面和请求缺少纵深防护 | 点击劫持、跨站请求、缓存敏感响应、前端直接显示管理页 | 安全响应头、同源校验、JSON 请求约束、Cookie 属性、响应禁止缓存、前端会话与角色守卫 | +| 开发代理默认指向第三方服务 | 本地开发登录凭据可能被发送至第三方 | 默认代理到本机,可显式覆盖目标 | + +## 验证结果 + +- `go test ./... -count=1`、`go vet ./...` 通过。 +- Linux amd64、关闭 CGO 的生产程序构建通过。 +- HTTP 回归覆盖全部私有 API 的匿名访问、普通用户访问管理员接口、跨用户对象操作、旧密码/会话迁移、首次初始化、密码重置撤销、失败限速、代理头伪造和 CSRF。 +- Candy 回归覆盖正常认证、子网转发、重连、改密撤销、未认证业务报文、空/超大帧、DHCP 边界、同源限制、限速表饱和,以及用户名 `api` 的原有网络路径。 +- 前端 6 项权限导航测试、构建、修改文件的 ESLint 检查通过;真实 Edge 在严格 CSP 下验证注册页及匿名管理页跳转,未出现 CSP 违规。 +- 更新 Go 依赖后,`govulncheck` 未发现当前程序可达或导入包中的已知漏洞;依赖模块中仍有 18 项未被当前代码调用的告警。 +- `npm audit --omit=dev` 为 0;全量审计仍有 9 项开发工具链告警,需要另行进行大版本迁移。开发服务器不应公开部署。 +- 当前 Windows 环境未启用 CGO 且没有 C 编译器,未执行 Go race 检测;常规测试包含连接替换和撤销回归。 + +## 部署与兼容性 + +构建要求提高到 Go 1.25,以使用网络/文本库的漏洞修复版本。已有密码和会话有迁移兼容,默认监听仍为 `:80` / `:443`。升级前备份数据库,在与生产相同的代理和客户端环境中验证。 + +反向代理必须配置实际的 `--trusted-proxies`,保留 Host 并覆盖客户端来源头,否则代理后的用户共享失败额度。仅在浏览器确实使用 HTTPS 时开启 `--secure-cookies=true`。空数据库首次部署还需 `CACAO_SETUP_TOKEN`。具体配置见 [README](README.md#公网访问加固)。 + +已建立的隧道不受认证限速影响;被猜测的同一账号或同一来源 IP 在失败窗口内可能暂时无法新登录。限速状态仅保存在当前进程;多实例和大规模流量攻击需入口层配合。签名时间校验允许前后 5 分钟;窗口内的截获重放仍需 WSS 防护,完全消除需要升级客户端协议。 diff --git a/api/admin.go b/api/admin.go index 3c1ebaf..69789a3 100644 --- a/api/admin.go +++ b/api/admin.go @@ -6,40 +6,44 @@ 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" + "gorm.io/gorm" ) 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() } } func AdminShowUsers(c *gin.Context) { - users := model.GetUsers() + users, err := model.GetUsersWithStatistics() + if !writeSucceeded(c, err) { + return + } type userinfo struct { UserID uint `json:"userid"` @@ -60,11 +64,11 @@ func AdminShowUsers(c *gin.Context) { Username: u.Name, Role: u.Role, RegTime: u.CreatedAt.Format(time.DateTime), - LastActiveTime: model.GetLastActiveTimeByUserID(u.ID).Format(time.DateTime), - NetNum: uint(len(model.GetNetsByUserID(u.ID))), - DevNum: uint(len(model.GetDevicesByUserID(u.ID))), - RxSum: model.GetRxSumByUserID(u.ID), - TxSum: model.GetTxSumByUserID(u.ID), + LastActiveTime: u.UpdatedAt.Format(time.DateTime), + NetNum: u.NetNum, + DevNum: u.DevNum, + RxSum: u.RxSum, + TxSum: u.TxSum, }) } @@ -91,42 +95,25 @@ func AdminAddUser(c *gin.Context) { return } - db := storage.Get() - if func() bool { - count := int64(0) - db.Model(&model.User{}).Where(&model.User{Name: request.Username}).Count(&count) - return count > 0 - }() { - setErrorCode(c, UsernameAlreadyTaken) - return - } - user := model.User{ Name: request.Username, Password: hashUserPassword(request.Username, request.Password), - Token: uuid.NewString(), Role: "normal", } - if result := db.Create(&user); result.Error != nil { - setUnexpectedMessage(c, result.Error.Error()) - return - } - - setResponseData(c, gin.H{ - "name": user.Name, - "role": user.Role, - }) - netModel := &model.Net{ - UserID: user.ID, Name: "@", Password: randomString(8), DHCP: "192.168.202.0/24", Broadcast: true, } - netModel.Create() - candy.InsertNet(netModel) + if !writeSucceeded(c, createAccount(c, &user, netModel, false, false)) { + return + } + if !writeSucceeded(c, candy.SyncNet(netModel.ID)) { + return + } + setResponseData(c, gin.H{"name": user.Name, "role": user.Role}) } func AdminDeleteUser(c *gin.Context) { @@ -145,13 +132,13 @@ func AdminDeleteUser(c *gin.Context) { return } - nets := model.GetNetsByUserID(request.UserID) - for _, n := range nets { - candy.DeleteNet(n.ID) - model.DeleteDevicesByNetID(n.ID) - model.DeleteNetByNetID(n.ID) + netIDs, err := model.DeleteUserTree(request.UserID) + if !writeSucceeded(c, err) { + return + } + for _, id := range netIDs { + candy.DeleteNet(id) } - model.DeleteUserByUserID(request.UserID) setResponseData(c, nil) } @@ -179,13 +166,25 @@ func AdminUpdateUserPassword(c *gin.Context) { setErrorCode(c, Unexpected) return } - user.Password = hashUserPassword(user.Name, request.Password) - user.Save() + password := hashUserPassword(user.Name, request.Password) + err := storage.WriteContext(c.Request.Context(), func(tx *gorm.DB) error { + result := tx.Model(&model.User{}).Where("id = ?", user.ID).Updates(map[string]interface{}{"password": password, "token": "", "token_expires_at": nil}) + if result.Error != nil { + return result.Error + } + if result.RowsAffected != 1 { + return businessError(UserNotExists) + } + return nil + }) + if !writeSucceeded(c, err) { + return + } setResponseData(c, nil) } func AdminGetOpenRegisterConfig(c *gin.Context) { - openreg := model.GetConfig("openreg", "true") == "true" + openreg := model.GetConfig("openreg", "false") == "true" setResponseData(c, gin.H{ "openreg": openreg, }) @@ -199,10 +198,8 @@ func AdminSetOpenRegisterConfig(c *gin.Context) { setErrorCode(c, InvalidRequest) return } - if request.OpenReg { - model.SetConfig("openreg", "true") - } else { - model.SetConfig("openreg", "false") + if !writeSucceeded(c, model.SetConfig("openreg", strconv.FormatBool(request.OpenReg))) { + return } setResponseData(c, nil) } @@ -227,7 +224,9 @@ func AdminSetRegisterIntervalConfig(c *gin.Context) { return } - model.SetConfig("reginterval", strconv.FormatUint(uint64(request.RegInterval), 10)) + if !writeSucceeded(c, model.SetConfig("reginterval", strconv.FormatUint(uint64(request.RegInterval), 10))) { + return + } setResponseData(c, nil) } @@ -246,10 +245,8 @@ func AdminSetAutoCleanUserConfig(c *gin.Context) { setErrorCode(c, InvalidRequest) return } - if request.AutoCleanInactiveUser { - model.SetConfig("autoCleanUser", "true") - } else { - model.SetConfig("autoCleanUser", "false") + if !writeSucceeded(c, model.SetConfig("autoCleanUser", strconv.FormatBool(request.AutoCleanInactiveUser))) { + return } setResponseData(c, nil) } @@ -278,11 +275,12 @@ func AdminSetInactiveUserThresholdConfig(c *gin.Context) { return } - model.SetConfig("inactiveUserThreshold", strconv.FormatUint(uint64(request.InactiveUserThreshold), 10)) + if !writeSucceeded(c, model.SetConfig("inactiveUserThreshold", strconv.FormatUint(uint64(request.InactiveUserThreshold), 10))) { + return + } setResponseData(c, nil) } func AdminCleanInactiveUser(c *gin.Context) { - candy.CleanInactiveUser() - setResponseData(c, nil) + triggerBackgroundTask(c, "clean-inactive-users") } diff --git a/api/background.go b/api/background.go new file mode 100644 index 0000000..d1933d7 --- /dev/null +++ b/api/background.go @@ -0,0 +1,46 @@ +package api + +import ( + "sync/atomic" + + "github.com/gin-gonic/gin" + "github.com/lanthora/cacao/background" + "github.com/lanthora/cacao/model" + "github.com/lanthora/cacao/storage" +) + +var backgroundTasks atomic.Pointer[background.Manager] + +func SetBackgroundTasks(manager *background.Manager) { backgroundTasks.Store(manager) } + +func AdminBackgroundTasks(c *gin.Context) { + tasks := []background.Status{} + if manager := backgroundTasks.Load(); manager != nil { + tasks = manager.Snapshot() + } + setResponseData(c, gin.H{"tasks": tasks, "storage": storage.Stats(), "pendingDevices": model.PendingDeviceStateCount()}) +} + +func AdminRunBackgroundTask(c *gin.Context) { + var request struct { + Name string `json:"name"` + } + if c.ShouldBindJSON(&request) != nil || request.Name == "" { + setErrorCode(c, InvalidRequest) + return + } + triggerBackgroundTask(c, request.Name) +} + +func triggerBackgroundTask(c *gin.Context, name string) { + manager := backgroundTasks.Load() + if manager == nil { + setErrorCode(c, Unexpected) + return + } + if err := manager.Trigger(name); err != nil { + setResponse(c, InvalidRequest, err.Error(), nil) + return + } + setResponseData(c, gin.H{"accepted": true, "name": name}) +} diff --git a/api/device.go b/api/device.go index be0acac..13b636f 100644 --- a/api/device.go +++ b/api/device.go @@ -1,6 +1,7 @@ package api import ( + "errors" "time" "github.com/gin-gonic/gin" @@ -60,11 +61,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,7 +68,18 @@ func DeviceDelete(c *gin.Context) { setErrorCode(c, DeviceNotExists) return } + if deviceModel.Online { + setErrorCode(c, CannotDeleteOnlineDevice) + return + } - deviceModel.Delete() + if err := deviceModel.Delete(); err != nil { + if errors.Is(err, model.ErrDeviceOnline) { + setErrorCode(c, CannotDeleteOnlineDevice) + } else { + setErrorCode(c, Unexpected) + } + return + } setResponseData(c, nil) } diff --git a/api/net.go b/api/net.go index feaac87..17f1d95 100644 --- a/api/net.go +++ b/api/net.go @@ -1,10 +1,10 @@ package api import ( + "errors" "github.com/gin-gonic/gin" "github.com/lanthora/cacao/candy" "github.com/lanthora/cacao/model" - "github.com/lanthora/cacao/storage" "gorm.io/gorm" ) @@ -74,18 +74,21 @@ func NetInsert(c *gin.Context) { Name: request.Netname, } - db := storage.Get() - result := db.Where(netModel).Take(netModel) - if result.Error != gorm.ErrRecordNotFound { - setErrorCode(c, NetworkAlreadyExists) - return - } - netModel.Password = request.Password netModel.DHCP = request.DHCP netModel.Broadcast = request.Broadcast - netModel.Create() - candy.InsertNet(netModel) + netModel.Lease = request.Lease + if err := netModel.Create(); err != nil { + if errors.Is(err, model.ErrConflict) { + setErrorCode(c, NetworkAlreadyExists) + } else { + setErrorCode(c, Unexpected) + } + return + } + if !writeSucceeded(c, candy.SyncNet(netModel.ID)) { + return + } setResponseData(c, gin.H{ "netid": netModel.ID, @@ -140,8 +143,17 @@ func NetEdit(c *gin.Context) { netModel.DHCP = request.DHCP netModel.Broadcast = request.Broadcast netModel.Lease = request.Lease - netModel.Update() - candy.UpdateNet(&netModel) + if err := netModel.Update(); err != nil { + if errors.Is(err, model.ErrConflict) { + setErrorCode(c, NetworkAlreadyExists) + } else { + setErrorCode(c, Unexpected) + } + return + } + if !writeSucceeded(c, candy.SyncNet(netModel.ID)) { + return + } setResponseData(c, gin.H{ "netid": netModel.ID, @@ -164,21 +176,18 @@ func NetDelete(c *gin.Context) { } user := c.MustGet("user").(*model.User) - netModel := &model.Net{} - netModel.ID = request.ID - db := storage.Get() - result := db.Where(netModel).Take(netModel) - - if result.Error != nil || netModel.UserID != user.ID { - setErrorCode(c, NetworkNotExists) + if err := model.DeleteNetworkTree(request.ID, user.ID); err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + setErrorCode(c, NetworkNotExists) + } else { + setErrorCode(c, Unexpected) + } return } - - netModel.Delete() - candy.DeleteNet(netModel.ID) + candy.DeleteNet(request.ID) setResponseData(c, gin.H{ - "id": netModel.ID, + "id": request.ID, }) } diff --git a/api/persistence.go b/api/persistence.go new file mode 100644 index 0000000..50f2ef4 --- /dev/null +++ b/api/persistence.go @@ -0,0 +1,78 @@ +package api + +import ( + "errors" + "time" + + "github.com/gin-gonic/gin" + "github.com/lanthora/cacao/model" + "github.com/lanthora/cacao/storage" + "gorm.io/gorm" +) + +type businessError int + +func (e businessError) Error() string { return statusMessage[int(e)] } + +func writeSucceeded(c *gin.Context, err error) bool { + if err == nil { + return true + } + var business businessError + if errors.As(err, &business) { + setErrorCode(c, int(business)) + } else { + setErrorCode(c, Unexpected) + } + return false +} + +// Password work and network changes happen outside the transaction. Account, +// initial policy, and default network either commit together or all roll back. +func createAccount(c *gin.Context, user *model.User, network *model.Net, registration, setupAllowed bool) error { + interval := registerInterval() + return storage.WriteContext(c.Request.Context(), func(tx *gorm.DB) error { + var count int64 + if registration { + if err := tx.Unscoped().Model(&model.User{}).Count(&count).Error; err != nil { + return err + } + if count == 0 { + if !setupAllowed { + return businessError(SetupRequired) + } + user.Role = "admin" + } else { + var config model.Config + err := tx.Where("key = ?", "openreg").Take(&config).Error + if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) { + return err + } + if config.Value != "true" { + return businessError(RegistrationDisabled) + } + user.Role = "normal" + } + if err := tx.Model(&model.User{}).Where("ip = ? AND role = ? AND created_at > ?", user.IP, "normal", time.Now().Add(-interval)).Count(&count).Error; err != nil { + return err + } + if count > 0 { + return businessError(RegisterTooOften) + } + } + if err := tx.Model(&model.User{}).Where("name = ?", user.Name).Count(&count).Error; err != nil { + return err + } + if count > 0 { + return businessError(UsernameAlreadyTaken) + } + if err := tx.Create(user).Error; err != nil { + return err + } + if user.Role == "admin" { + return model.SetConfigTx(tx, "openreg", "false") + } + network.UserID = user.ID + return tx.Create(network).Error + }) +} diff --git a/api/persistence_test.go b/api/persistence_test.go new file mode 100644 index 0000000..f28442f --- /dev/null +++ b/api/persistence_test.go @@ -0,0 +1,102 @@ +package api + +import ( + "context" + "fmt" + "strings" + "sync/atomic" + "testing" + "time" + + "github.com/google/uuid" + "github.com/lanthora/cacao/background" + "github.com/lanthora/cacao/candy" + "github.com/lanthora/cacao/model" + "github.com/lanthora/cacao/storage" +) + +func TestAccountCreationRollsBackDefaultNetworkFailure(t *testing.T) { + router := securityRouter() + _, cookies := testUser(t, "admin") + name := "atomic" + strings.ReplaceAll(uuid.NewString(), "-", "")[:16] + db := storage.Get() + trigger := "reject_default_network_test" + if err := db.Exec(fmt.Sprintf(`CREATE TRIGGER %s BEFORE INSERT ON nets WHEN NEW.user_id IN (SELECT id FROM users WHERE name = '%s') BEGIN SELECT RAISE(ABORT, 'simulated network failure'); END`, trigger, name)).Error; err != nil { + t.Fatal(err) + } + t.Cleanup(func() { + db.Exec("DROP TRIGGER IF EXISTS " + trigger) + var user model.User + if db.Where("name = ?", name).Take(&user).Error == nil { + var nets []model.Net + db.Unscoped().Where("user_id = ?", user.ID).Find(&nets) + for _, network := range nets { + candy.DeleteNet(network.ID) + } + db.Unscoped().Where("user_id = ?", user.ID).Delete(&model.Net{}) + db.Unscoped().Delete(&user) + } + }) + body := fmt.Sprintf(`{"username":%q,"password":"test-password"}`, name) + if _, status := securityRequest(t, router, "/api/admin/addUser", body, cookies...); status != Unexpected { + t.Fatalf("failed commit reported success: %d", status) + } + var count int64 + if err := db.Unscoped().Model(&model.User{}).Where("name = ?", name).Count(&count).Error; err != nil || count != 0 { + t.Fatalf("failed default network left account behind: %d %v", count, err) + } + if err := db.Exec("DROP TRIGGER " + trigger).Error; err != nil { + t.Fatal(err) + } + if _, status := securityRequest(t, router, "/api/admin/addUser", body, cookies...); status != Success { + t.Fatalf("retry after rollback failed: %d", status) + } + if _, status := securityRequest(t, router, "/api/admin/addUser", body, cookies...); status != UsernameAlreadyTaken { + t.Fatalf("duplicate account not rejected: %d", status) + } + if err := db.Model(&model.Net{}).Joins("JOIN users ON users.id = nets.user_id").Where("users.name = ?", name).Count(&count).Error; err != nil || count != 1 { + t.Fatalf("retry created duplicate/orphan networks: %d %v", count, err) + } +} + +func TestBackgroundManagementRequiresAdminAndReportsRuns(t *testing.T) { + router := securityRouter() + manager := background.New() + var runs atomic.Int32 + if err := manager.Register(background.Task{Name: "test-maintenance", ManualOnly: true, Run: func(context.Context) (background.Result, error) { + runs.Add(1) + return background.Result{RowsAffected: 3}, nil + }}); err != nil { + t.Fatal(err) + } + if err := manager.Start(context.Background()); err != nil { + t.Fatal(err) + } + previous := backgroundTasks.Load() + SetBackgroundTasks(manager) + t.Cleanup(func() { manager.Stop(context.Background()); SetBackgroundTasks(previous) }) + _, normal := testUser(t, "normal") + _, admin := testUser(t, "admin") + for _, path := range []string{"/api/admin/backgroundTasks", "/api/admin/runBackgroundTask"} { + if _, status := securityRequest(t, router, path, `{"name":"test-maintenance"}`); status != NotLoggedIn { + t.Fatal("anonymous task access") + } + if _, status := securityRequest(t, router, path, `{"name":"test-maintenance"}`, normal...); status != PermissionDenied { + t.Fatal("normal user could operate tasks") + } + } + if _, status := securityRequest(t, router, "/api/admin/runBackgroundTask", `{"name":"test-maintenance"}`, admin...); status != Success { + t.Fatalf("admin trigger failed: %d", status) + } + deadline := time.Now().Add(time.Second) + for time.Now().Before(deadline) { + if manager.Snapshot()[0].Runs == 1 { + break + } + time.Sleep(time.Millisecond) + } + w, status := securityRequest(t, router, "/api/admin/backgroundTasks", "", admin...) + if status != Success || runs.Load() != 1 || !strings.Contains(w.Body.String(), `"lastRowsAffected":3`) || !strings.Contains(w.Body.String(), `"batchesCommitted"`) { + t.Fatalf("task result not observable: %s", w.Body.String()) + } +} diff --git a/api/route.go b/api/route.go index 66aaced..91bcba6 100644 --- a/api/route.go +++ b/api/route.go @@ -84,8 +84,13 @@ func RouteInsert(c *gin.Context) { NextHop: request.NextHop, Priority: request.Priority, } - routeModel.Create() - candy.ReloadNet(netModel.ID) + created, err := routeModel.CreateOnce() + if !writeSucceeded(c, err) { + return + } + if created && !writeSucceeded(c, candy.ReloadNet(netModel.ID)) { + return + } setResponseData(c, gin.H{ "routeid": routeModel.ID, @@ -118,7 +123,11 @@ func RouteDelete(c *gin.Context) { return } - routeModel.Delete() - candy.ReloadNet(netModel.ID) + if !writeSucceeded(c, routeModel.Delete()) { + return + } + if !writeSucceeded(c, candy.ReloadNet(netModel.ID)) { + return + } setResponseData(c, nil) } diff --git a/api/security.go b/api/security.go new file mode 100644 index 0000000..a6be1f8 --- /dev/null +++ b/api/security.go @@ -0,0 +1,191 @@ +package api + +import ( + "crypto/rand" + "crypto/sha256" + "crypto/subtle" + "encoding/base64" + "encoding/hex" + "net/http" + "os" + "strconv" + "strings" + "sync" + "time" + + "github.com/gin-gonic/gin" + "github.com/google/uuid" + "github.com/lanthora/cacao/argp" + "github.com/lanthora/cacao/model" + "golang.org/x/crypto/bcrypt" +) + +const sessionLifetime = 24 * time.Hour + +// 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)) + 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[:]) +} + +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) +} + +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 { + panic("secure random generation failed") + } + 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 new file mode 100644 index 0000000..70cffa6 --- /dev/null +++ b/api/security_test.go @@ -0,0 +1,296 @@ +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("/admin/addUser", AdminAddUser) + protected.POST("/admin/backgroundTasks", AdminBackgroundTasks) + protected.POST("/admin/runBackgroundTask", AdminRunBackgroundTask) + 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 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") + 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 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") + } + 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) { + resetAuthAttempts(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 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") + } + 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) + 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) + } + } +} + +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/api/status.go b/api/status.go index 294a578..75745f6 100644 --- a/api/status.go +++ b/api/status.go @@ -30,6 +30,8 @@ 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" + statusMessage[TooManyRequests] = "too many authentication attempts" } const ( @@ -55,6 +57,8 @@ const ( DeviceNotExists CannotDeleteOnlineDevice InvalidInactiveUserThreshold + SetupRequired + TooManyRequests ) var statusMessage map[int]string @@ -72,7 +76,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/api/user.go b/api/user.go index 78f95cb..8fb124a 100644 --- a/api/user.go +++ b/api/user.go @@ -1,31 +1,19 @@ package api import ( - "crypto/sha256" - "fmt" - "math/rand" "strconv" "strings" "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" + "gorm.io/gorm" ) 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 { @@ -34,7 +22,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 @@ -43,12 +31,35 @@ 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. + var result *gorm.DB + err := storage.WriteContext(c.Request.Context(), func(tx *gorm.DB) error { + result = tx.Model(&model.User{}).Where("id = ? AND token = ?", user.ID, user.Token).UpdateColumn("token", hashSessionToken(token)) + return result.Error + }) + if err != 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() } @@ -65,28 +76,48 @@ func UserInfo(c *gin.Context) { func UserStatistics(c *gin.Context) { user := c.MustGet("user").(*model.User) + statistics, err := model.GetUserStatistics(user.ID) + if !writeSucceeded(c, err) { + return + } setResponseData(c, gin.H{ - "netnum": uint(len(model.GetNetsByUserID(user.ID))), - "devnum": uint(len(model.GetDevicesByUserID(user.ID))), - "rxsum": model.GetRxSumByUserID(user.ID), - "txsum": model.GetTxSumByUserID(user.ID), + "netnum": statistics.NetNum, + "devnum": statistics.DevNum, + "rxsum": statistics.RxSum, + "txsum": statistics.TxSum, }) } 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 } + if !allowAuthentication(c, request.Username) { + return + } + 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) { + recordAuthenticationFailure(c, request.Username) + setErrorCode(c, SetupRequired) + return + } + } else if model.GetConfig("openreg", "false") != "true" { + setErrorCode(c, RegistrationDisabled) + return + } if request.Username == "@" { setErrorCode(c, InvalidUsername) return @@ -99,71 +130,40 @@ func UserRegister(c *gin.Context) { setErrorCode(c, InvalidPassword) 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) - return count > 0 - }() { - setErrorCode(c, RegisterTooOften) + if !acquirePasswordWork(c) { return } + defer func() { <-passwordWork }() - if func() bool { - count := int64(0) - db.Model(&model.User{}).Where(&model.User{Name: request.Username}).Count(&count) - return count > 0 - }() { - setErrorCode(c, UsernameAlreadyTaken) - return + role := "normal" + if initialSetup { + role = "admin" } - role := func() string { - count := int64(0) - db.Model(&model.User{}).Count(&count) - if count == 0 { - return "admin" - } - return "normal" - }() - user := model.User{ Name: request.Username, Password: hashUserPassword(request.Username, request.Password), - Token: uuid.NewString(), Role: role, IP: c.ClientIP(), } - - if result := db.Create(&user); result.Error != nil { - setUnexpectedMessage(c, result.Error.Error()) + token := newSession(&user) + netModel := &model.Net{Name: "@", Password: randomString(8), DHCP: "192.168.202.0/24", Broadcast: true} + if !writeSucceeded(c, createAccount(c, &user, netModel, true, validSetupToken(request.SetupToken))) { return } + if user.Role == "normal" { + if !writeSucceeded(c, candy.SyncNet(netModel.ID)) { + 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, "role": user.Role, }) - if role == "admin" { - model.SetConfig("openreg", "false") - } - - if role == "normal" { - netModel := &model.Net{ - UserID: user.ID, - Name: "@", - Password: randomString(8), - DHCP: "192.168.202.0/24", - Broadcast: true, - } - netModel.Create() - candy.InsertNet(netModel) - } } func UserLogin(c *gin.Context) { @@ -176,14 +176,24 @@ func UserLogin(c *gin.Context) { return } - user := model.User{ - Name: request.Username, - Password: hashUserPassword(request.Username, request.Password), + 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(user).Take(&user); result.Error != nil { + if result := db.Where("name = ?", request.Username).Take(&user); result.Error != nil || !verifyUserPassword(&user, request.Password) { + recordAuthenticationFailure(c, request.Username) setErrorCode(c, IncorrectUsernameOrPassword) return } @@ -192,11 +202,26 @@ 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 + if !strings.HasPrefix(user.Password, "bcrypt-sha256:") { + user.Password = hashUserPassword(user.Name, request.Password) + } + token := newSession(&user) + var result *gorm.DB + err := storage.WriteContext(c.Request.Context(), func(tx *gorm.DB) error { + result = tx.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, + }) + return result.Error + }) + if !writeSucceeded(c, err) { + return + } + if result.RowsAffected != 1 { + setErrorCode(c, IncorrectUsernameOrPassword) + return + } + setSessionCookies(c, user.ID, token, int(sessionLifetime.Seconds())) setResponseData(c, gin.H{ "name": user.Name, @@ -206,11 +231,13 @@ 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) + err := storage.WriteContext(c.Request.Context(), func(tx *gorm.DB) error { + return tx.Model(&model.User{}).Where("id = ? AND token = ?", user.ID, user.Token).Updates(map[string]interface{}{"token": "", "token_expires_at": nil}).Error + }) + if !writeSucceeded(c, err) { + return + } + setSessionCookies(c, 0, "", -1) setResponseData(c, nil) } @@ -227,8 +254,15 @@ func ChangePassword(c *gin.Context) { } user := c.MustGet("user").(*model.User) - - if user.Password != hashUserPassword(user.Name, request.OldPassword) { + 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 } @@ -237,12 +271,24 @@ 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) + var result *gorm.DB + err := storage.WriteContext(c.Request.Context(), func(tx *gorm.DB) error { + result = tx.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, + }) + return result.Error + }) + if !writeSucceeded(c, err) { + return + } + if result.RowsAffected != 1 { + setErrorCode(c, NotLoggedIn) + return + } + setSessionCookies(c, user.ID, token, int(sessionLifetime.Seconds())) setResponseData(c, nil) } @@ -255,18 +301,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) -} diff --git a/background/manager.go b/background/manager.go new file mode 100644 index 0000000..66bd33d --- /dev/null +++ b/background/manager.go @@ -0,0 +1,263 @@ +// Package background owns the lifecycle and observable state of recurring work. +package background + +import ( + "context" + "errors" + "fmt" + "sort" + "sync" + "time" +) + +var ( + ErrNotRunning = errors.New("background manager is not running") + ErrTaskRunning = errors.New("background task is already running") + ErrUnknownTask = errors.New("unknown background task") +) + +type Result struct { + RowsAffected int64 `json:"rowsAffected"` + Details map[string]int64 `json:"details,omitempty"` +} + +type Task struct { + Name string + Interval time.Duration + RunOnStart bool + ManualOnly bool + Run func(context.Context) (Result, error) +} + +type Status struct { + Name string `json:"name"` + IntervalSeconds int64 `json:"intervalSeconds"` + ManualOnly bool `json:"manualOnly"` + Running bool `json:"running"` + LastStartedAt *time.Time `json:"lastStartedAt"` + LastFinishedAt *time.Time `json:"lastFinishedAt"` + LastSuccessAt *time.Time `json:"lastSuccessAt"` + NextRunAt *time.Time `json:"nextRunAt"` + LastError string `json:"lastError"` + LastDurationMs int64 `json:"lastDurationMs"` + LastRowsAffected int64 `json:"lastRowsAffected"` + TotalRowsAffected int64 `json:"totalRowsAffected"` + Runs uint64 `json:"runs"` + Failures uint64 `json:"failures"` + Details map[string]int64 `json:"details,omitempty"` +} + +type entry struct { + task Task + state Status + wake chan struct{} +} + +type Manager struct { + mu sync.Mutex + tasks map[string]*entry + ctx context.Context + cancel context.CancelFunc + started bool + stopping bool + wg sync.WaitGroup +} + +func New() *Manager { return &Manager{tasks: make(map[string]*entry)} } + +// Register must be called before Start. Names also identify manual triggers. +func (m *Manager) Register(task Task) error { + m.mu.Lock() + defer m.mu.Unlock() + if m.started { + return errors.New("cannot register after background manager start") + } + if task.Name == "" || task.Run == nil || task.Interval < 0 || (!task.ManualOnly && task.Interval == 0) || (task.ManualOnly && task.RunOnStart) { + return errors.New("invalid background task") + } + if _, ok := m.tasks[task.Name]; ok { + return fmt.Errorf("duplicate background task: %s", task.Name) + } + m.tasks[task.Name] = &entry{task: task, state: Status{Name: task.Name, IntervalSeconds: int64(task.Interval / time.Second), ManualOnly: task.ManualOnly}, wake: make(chan struct{}, 1)} + return nil +} + +func (m *Manager) Start(ctx context.Context) error { + m.mu.Lock() + defer m.mu.Unlock() + if m.started { + return errors.New("background manager already started") + } + if err := ctx.Err(); err != nil { + return err + } + m.ctx, m.cancel = context.WithCancel(ctx) + m.started = true + for _, task := range m.tasks { + if !task.task.ManualOnly { + next := time.Now().Add(task.task.Interval) + if task.task.RunOnStart { + next = time.Now() + } + task.state.NextRunAt = &next + } + m.wg.Add(1) + go m.loop(task) + } + return nil +} + +// Stop cancels all tasks and waits for in-flight work up to the caller's deadline. +func (m *Manager) Stop(ctx context.Context) error { + m.mu.Lock() + if !m.started { + m.mu.Unlock() + return nil + } + m.stopping = true + m.cancel() + m.mu.Unlock() + done := make(chan struct{}) + go func() { m.wg.Wait(); close(done) }() + select { + case <-done: + return nil + case <-ctx.Done(): + return ctx.Err() + } +} + +// Trigger schedules one run without blocking an HTTP request. Concurrent manual +// and scheduled triggers are coalesced; each task has exactly one worker. +func (m *Manager) Trigger(name string) error { + m.mu.Lock() + defer m.mu.Unlock() + if !m.started || m.stopping || m.ctx.Err() != nil { + return ErrNotRunning + } + task, ok := m.tasks[name] + if !ok { + return ErrUnknownTask + } + if task.state.Running || len(task.wake) > 0 { + return ErrTaskRunning + } + task.wake <- struct{}{} + return nil +} + +func (m *Manager) Snapshot() []Status { + m.mu.Lock() + defer m.mu.Unlock() + result := make([]Status, 0, len(m.tasks)) + for _, task := range m.tasks { + state := task.state + state.Details = copyDetails(state.Details) + state.LastStartedAt = copyTime(state.LastStartedAt) + state.LastFinishedAt = copyTime(state.LastFinishedAt) + state.LastSuccessAt = copyTime(state.LastSuccessAt) + state.NextRunAt = copyTime(state.NextRunAt) + result = append(result, state) + } + sort.Slice(result, func(i, j int) bool { return result[i].Name < result[j].Name }) + return result +} + +func (m *Manager) loop(task *entry) { + defer m.wg.Done() + defer func() { m.mu.Lock(); task.state.NextRunAt = nil; m.mu.Unlock() }() + delay := task.task.Interval + if task.task.RunOnStart { + delay = 0 + } + var timer *time.Timer + var timerC <-chan time.Time + if !task.task.ManualOnly { + timer = time.NewTimer(delay) + timerC = timer.C + defer timer.Stop() + } + for { + select { + case <-m.ctx.Done(): + return + case <-timerC: + case <-task.wake: + } + m.mu.Lock() + if m.ctx.Err() != nil { + m.mu.Unlock() + return + } + // Drain a simultaneous manual trigger so a scheduled run satisfies it. + select { + case <-task.wake: + default: + } + task.state.Running = true + task.state.NextRunAt = nil + started := time.Now() + task.state.LastStartedAt = &started + m.mu.Unlock() + result, err := run(m.ctx, task.task.Run) + finished := time.Now() + m.mu.Lock() + task.state.Running = false + task.state.Runs++ + task.state.LastFinishedAt = &finished + task.state.LastDurationMs = finished.Sub(started).Milliseconds() + task.state.LastRowsAffected = result.RowsAffected + task.state.TotalRowsAffected += result.RowsAffected + task.state.Details = copyDetails(result.Details) + task.state.LastError = "" + if err != nil { + task.state.Failures++ + task.state.LastError = err.Error() + } else { + task.state.LastSuccessAt = &finished + } + if !task.task.ManualOnly { + next := finished.Add(task.task.Interval) + task.state.NextRunAt = &next + } + m.mu.Unlock() + // Reset from completion; slow tasks cannot create an overdue-run storm. + if timer != nil { + if !timer.Stop() { + select { + case <-timer.C: + default: + } + } + timer.Reset(task.task.Interval) + } + } +} + +func run(ctx context.Context, fn func(context.Context) (Result, error)) (result Result, err error) { + defer func() { + if v := recover(); v != nil { + err = fmt.Errorf("background task panic: %v", v) + } + }() + return fn(ctx) +} + +func copyDetails(source map[string]int64) map[string]int64 { + if source == nil { + return nil + } + result := make(map[string]int64, len(source)) + for key, value := range source { + result[key] = value + } + return result +} + +func copyTime(value *time.Time) *time.Time { + if value == nil { + return nil + } + copy := *value + return © +} diff --git a/background/manager_test.go b/background/manager_test.go new file mode 100644 index 0000000..fb9bb2c --- /dev/null +++ b/background/manager_test.go @@ -0,0 +1,148 @@ +package background + +import ( + "context" + "errors" + "sync/atomic" + "testing" + "time" +) + +func TestTaskDoesNotOverlapAndStopCancels(t *testing.T) { + m := New() + started := make(chan struct{}) + var calls atomic.Int32 + if err := m.Register(Task{Name: "slow", Interval: time.Millisecond, RunOnStart: true, Run: func(ctx context.Context) (Result, error) { + if calls.Add(1) == 1 { + close(started) + } + <-ctx.Done() + return Result{}, ctx.Err() + }}); err != nil { + t.Fatal(err) + } + if err := m.Start(context.Background()); err != nil { + t.Fatal(err) + } + select { + case <-started: + case <-time.After(time.Second): + t.Fatal("task did not start") + } + for i := 0; i < 20; i++ { + if err := m.Trigger("slow"); !errors.Is(err, ErrTaskRunning) { + t.Fatalf("overlap trigger = %v", err) + } + } + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() + if err := m.Stop(ctx); err != nil { + t.Fatal(err) + } + if calls.Load() != 1 { + t.Fatalf("overlapping runs: %d", calls.Load()) + } + state := m.Snapshot()[0] + if state.Running || state.NextRunAt != nil || state.Runs != 1 || state.Failures != 1 || state.LastError == "" { + t.Fatalf("unexpected stopped state: %+v", state) + } + if err := m.Trigger("slow"); !errors.Is(err, ErrNotRunning) { + t.Fatalf("trigger after stop = %v", err) + } +} + +func TestPanicIsObservableAndTaskCanRunAgain(t *testing.T) { + m := New() + var calls atomic.Int32 + if err := m.Register(Task{Name: "recover", Interval: time.Hour, Run: func(context.Context) (Result, error) { + if calls.Add(1) == 1 { + panic("test failure") + } + return Result{RowsAffected: 3, Details: map[string]int64{"deleted": 3}}, nil + }}); err != nil { + t.Fatal(err) + } + if err := m.Start(context.Background()); err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = m.Stop(context.Background()) }) + if err := m.Trigger("recover"); err != nil { + t.Fatal(err) + } + waitRuns(t, m, 1) + state := m.Snapshot()[0] + if state.Failures != 1 || state.LastError == "" || state.LastSuccessAt != nil { + t.Fatalf("panic not observable: %+v", state) + } + if err := m.Trigger("recover"); err != nil { + t.Fatal(err) + } + waitRuns(t, m, 2) + state = m.Snapshot()[0] + if state.Failures != 1 || state.LastError != "" || state.LastSuccessAt == nil || state.TotalRowsAffected != 3 { + t.Fatalf("recovery not observable: %+v", state) + } + state.Details["deleted"] = 99 + *state.NextRunAt = time.Time{} + if next := m.Snapshot()[0]; next.Details["deleted"] != 3 || next.NextRunAt.IsZero() { + t.Fatal("snapshot aliases internal state") + } +} + +func waitRuns(t *testing.T, manager *Manager, count uint64) { + t.Helper() + deadline := time.After(time.Second) + ticker := time.NewTicker(time.Millisecond) + defer ticker.Stop() + for { + if manager.Snapshot()[0].Runs >= count { + return + } + select { + case <-deadline: + t.Fatal("task did not finish") + case <-ticker.C: + } + } +} + +func TestManualOnlyTaskNeverRunsAutomatically(t *testing.T) { + m := New() + ran := make(chan struct{}, 4) + if err := m.Register(Task{Name: "manual", ManualOnly: true, Run: func(context.Context) (Result, error) { + ran <- struct{}{} + return Result{RowsAffected: 1}, nil + }}); err != nil { + t.Fatal(err) + } + if err := m.Start(context.Background()); err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = m.Stop(context.Background()) }) + select { + case <-ran: + t.Fatal("manual-only task ran on start") + case <-time.After(20 * time.Millisecond): + } + state := m.Snapshot()[0] + if !state.ManualOnly || state.NextRunAt != nil || state.Runs != 0 { + t.Fatalf("unexpected manual schedule: %+v", state) + } + if err := m.Trigger("manual"); err != nil { + t.Fatal(err) + } + waitRuns(t, m, 1) + <-ran + select { + case <-ran: + t.Fatal("manual-only task repeated automatically") + case <-time.After(20 * time.Millisecond): + } + if state := m.Snapshot()[0]; state.NextRunAt != nil || state.Runs != 1 { + t.Fatalf("manual task scheduled itself: %+v", state) + } + if err := m.Trigger("manual"); err != nil { + t.Fatal(err) + } + waitRuns(t, m, 2) +} diff --git a/background_tasks.go b/background_tasks.go new file mode 100644 index 0000000..43ff79d --- /dev/null +++ b/background_tasks.go @@ -0,0 +1,55 @@ +package main + +import ( + "context" + "time" + + "github.com/lanthora/cacao/background" + "github.com/lanthora/cacao/candy" + "github.com/lanthora/cacao/logger" + "github.com/lanthora/cacao/model" +) + +func newBackgroundTasks() (*background.Manager, error) { + manager := background.New() + maintenance := func(force bool) func(context.Context) (background.Result, error) { + return func(ctx context.Context) (background.Result, error) { + if _, err := candy.FlushDeviceState(ctx); err != nil { + return background.Result{}, err + } + result, err := model.CleanMaintenance(ctx, model.MaintenanceOptions{Now: time.Now(), BatchSize: 250, CleanInactiveUsers: true, ForceInactiveUsers: force}) + if err == nil { + for _, id := range result.DeletedNetIDs { + candy.DeleteNet(id) + } + } + return background.Result{RowsAffected: result.RowsAffected, Details: result.Details}, err + } + } + tasks := []background.Task{ + {Name: "device-flush", Interval: 5 * time.Second, Run: func(ctx context.Context) (background.Result, error) { + count, err := candy.FlushDeviceState(ctx) + return background.Result{RowsAffected: int64(count), Details: map[string]int64{"pendingDevices": int64(model.PendingDeviceStateCount())}}, err + }}, + {Name: "maintenance", Interval: time.Minute, RunOnStart: true, Run: maintenance(false)}, + {Name: "clean-inactive-users", ManualOnly: true, Run: maintenance(true)}, + {Name: "integrity-audit", Interval: 5 * time.Minute, RunOnStart: true, Run: func(ctx context.Context) (background.Result, error) { + counts, err := model.AuditIntegrity(ctx) + return background.Result{Details: counts}, err + }}, + } + for _, task := range tasks { + name, run := task.Name, task.Run + task.Run = func(ctx context.Context) (background.Result, error) { + result, err := run(ctx) + if err != nil { + logger.Info("background task %s failed: %v", name, err) + } + return result, err + } + if err := manager.Register(task); err != nil { + return nil, err + } + } + return manager, nil +} diff --git a/candy/device.go b/candy/device.go index 9e90072..d7343e1 100644 --- a/candy/device.go +++ b/candy/device.go @@ -1,31 +1,14 @@ package candy import ( - "time" + "sync" "github.com/lanthora/cacao/model" ) -func init() { - go autoCleanInactiveDevice() -} - -func autoCleanInactiveDevice() { - nets := model.GetNets() - for _, n := range nets { - if n.Lease > 0 { - devices := model.GetDevicesByNetID(n.ID) - for _, d := range devices { - if d.UpdatedAt.AddDate(0, 0, int(n.Lease)).Before(time.Now()) { - d.Delete() - } - } - } - } - time.AfterFunc(time.Hour, autoCleanInactiveDevice) -} - type Device struct { - model *model.Device - ip uint32 + mutex sync.Mutex + model *model.Device + ip uint32 + generation uint64 } diff --git a/candy/device_batch_test.go b/candy/device_batch_test.go new file mode 100644 index 0000000..2a3aaae --- /dev/null +++ b/candy/device_batch_test.go @@ -0,0 +1,79 @@ +package candy + +import ( + "context" + "testing" + "time" + + "github.com/gorilla/websocket" + "github.com/lanthora/cacao/model" + "github.com/lanthora/cacao/storage" +) + +func TestAuthenticatedPingBatchesMetadata(t *testing.T) { + n, url := newTestWebsocketNetwork(t, "10.20.0.0/24") + conn := dialTestWebsocket(t, url) + authenticateTestWebsocket(t, conn, n, "1000000000000001", 0x0a140001) + n.ipWsMapMutex.RLock() + ws := n.ipWsMap[0x0a140001] + n.ipWsMapMutex.RUnlock() + if err := ws.handlePingMessage("candy::linux::v2::batch-host"); err != nil { + t.Fatal(err) + } + var persisted model.Device + if err := storage.Get().First(&persisted, ws.dev.model.ID).Error; err != nil { + t.Fatal(err) + } + if persisted.Hostname != "" { + t.Fatal("ping wrote metadata before the shared flush") + } + if current := model.GetDeviceByDevID(persisted.ID); current.Hostname != "batch-host" || current.Version != "v2" { + t.Fatalf("API did not see queued ping metadata: %+v", current) + } + if _, err := FlushDeviceState(context.Background()); err != nil { + t.Fatal(err) + } + if err := storage.Get().First(&persisted, persisted.ID).Error; err != nil { + t.Fatal(err) + } + if persisted.Hostname != "batch-host" || persisted.OS != "linux" { + t.Fatal("shared flush did not persist metadata") + } +} + +func TestShutdownWaitsForSocketsAndFlushesDisconnects(t *testing.T) { + n, url := newTestWebsocketNetwork(t, "10.20.0.0/24") + online := dialTestWebsocket(t, url) + authenticateTestWebsocket(t, online, n, "1000000000000012", 0x0a140001) + pending := dialTestWebsocket(t, url) + sendVMac(t, pending, n, "1000000000000013") + t.Cleanup(func() { + // Production shutdown is terminal. Restore admission only for tests. + websocketLifecycle.Lock() + websocketLifecycle.stopping = false + websocketLifecycle.Unlock() + }) + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) + defer cancel() + if err := ShutdownConnections(ctx); err != nil { + t.Fatal(err) + } + for _, conn := range []*websocket.Conn{online, pending} { + if _, _, err := conn.ReadMessage(); err == nil { + t.Fatal("websocket survived shutdown") + } + } + n.ipWsMapMutex.RLock() + remaining := len(n.connections) + n.ipWsMapMutex.RUnlock() + if remaining != 0 { + t.Fatalf("shutdown left %d connection callbacks running", remaining) + } + var persisted model.Device + if err := storage.Get().Where("net_id = ? AND vmac = ?", n.model.ID, "1000000000000012").First(&persisted).Error; err != nil { + t.Fatal(err) + } + if persisted.Online || persisted.RX == 0 { + t.Fatalf("shutdown did not persist final telemetry: %+v", persisted) + } +} 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 } diff --git a/candy/net.go b/candy/net.go index c38d7c4..9403468 100644 --- a/candy/net.go +++ b/candy/net.go @@ -1,7 +1,9 @@ package candy import ( + "context" "crypto/sha256" + "crypto/subtle" "encoding/binary" "fmt" "math/rand/v2" @@ -11,7 +13,6 @@ import ( "sync" "time" - mapset "github.com/deckarep/golang-set/v2" "github.com/lanthora/cacao/logger" "github.com/lanthora/cacao/model" "github.com/lanthora/cacao/storage" @@ -24,14 +25,15 @@ func init() { for _, netModel := range model.GetNets() { InsertNet(&netModel) } - - go autoFlush() } type Net struct { model *model.Net ipWsMap map[uint32]*candysocket ipWsMapMutex sync.RWMutex + connections map[*candysocket]struct{} + closed bool + dhcpMutex sync.Mutex net uint32 host uint32 @@ -41,33 +43,23 @@ type Net struct { var idNetMap map[uint]*Net var idNetMapMutex sync.RWMutex -func flush() { +// FlushDeviceState is driven by the shared background task scheduler. Idle +// online devices still refresh activity; individual packets never write SQL. +func FlushDeviceState(ctx context.Context) (int, error) { idNetMapMutex.RLock() - defer idNetMapMutex.RUnlock() - - refreshedUsers := mapset.NewSet[uint]() - 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() + model.QueueDeviceState(*ws.dev.model, ws.dev.generation) } + ws.dev.mutex.Unlock() } - if hasDeviceOnline && !refreshedUsers.ContainsOne(n.model.UserID) { - model.RefreshUserLastActiveTimeByUserID(n.model.UserID) - refreshedUsers.Add(n.model.UserID) - } + n.ipWsMapMutex.RUnlock() } - refreshedUsers.Clear() -} - -func autoFlush() { - flush() - time.AfterFunc(time.Duration(1)*time.Minute, autoFlush) + idNetMapMutex.RUnlock() + return model.FlushDeviceStates(ctx) } func (n *Net) ipConflict(ip, vmac string) bool { @@ -85,6 +77,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 +87,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 +126,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 @@ -136,19 +140,38 @@ 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 + model.QueueDeviceState(*ws.dev.model, ws.dev.generation) + ws.dev.mutex.Unlock() delete(n.ipWsMap, ip) } } 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) @@ -158,7 +181,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 @@ -170,19 +196,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) { @@ -196,13 +227,8 @@ func DeleteNet(netid uint) { delete(idNetMap, netid) } -func ReloadNet(netid uint) { - idNetMapMutex.Lock() - defer idNetMapMutex.Unlock() - - if net, ok := idNetMap[netid]; ok { - net.close() - } +func ReloadNet(netid uint) error { + return syncNet(netid, true) } func getNetById(netid uint) *Net { @@ -220,7 +246,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/persistence.go b/candy/persistence.go new file mode 100644 index 0000000..bdca375 --- /dev/null +++ b/candy/persistence.go @@ -0,0 +1,42 @@ +package candy + +import ( + "errors" + + "github.com/lanthora/cacao/model" + "github.com/lanthora/cacao/storage" + "gorm.io/gorm" +) + +// SyncNet reads committed state under the cache lock. Concurrent API responses +// cannot publish an older network configuration after a newer one. +func SyncNet(netID uint) error { return syncNet(netID, false) } + +func syncNet(netID uint, force bool) error { + idNetMapMutex.Lock() + defer idNetMapMutex.Unlock() + var current model.Net + err := storage.Get().Model(&model.Net{}).Joins("JOIN users ON users.id = nets.user_id AND users.deleted_at IS NULL").Where("nets.id = ?", netID).Take(¤t).Error + if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) { + return err + } + existing := idNetMap[netID] + if errors.Is(err, gorm.ErrRecordNotFound) { + if existing != nil { + existing.close() + delete(idNetMap, netID) + } + return nil + } + if existing != nil && !force { + old := existing.model + if old.Name == current.Name && old.Password == current.Password && old.DHCP == current.DHCP && old.Broadcast == current.Broadcast && old.Lease == current.Lease { + return nil + } + } + if existing != nil { + existing.close() + } + insertNetLocked(¤t) + return nil +} 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 new file mode 100644 index 0000000..b88a85d --- /dev/null +++ b/candy/security_test.go @@ -0,0 +1,421 @@ +package candy + +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" +) + +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 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) + 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) + }) + 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} { + 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") + } + }) + } +} + +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"} { + 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) + } +} + +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 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) + 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 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) { + 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") + } +} + +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) { + 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/shutdown.go b/candy/shutdown.go new file mode 100644 index 0000000..812791e --- /dev/null +++ b/candy/shutdown.go @@ -0,0 +1,67 @@ +package candy + +import ( + "context" + "sync" +) + +var websocketLifecycle = struct { + sync.Mutex + stopping bool + connections map[*candysocket]struct{} +}{connections: make(map[*candysocket]struct{})} +var websocketHandlers sync.WaitGroup + +func beginWebsocketHandler() bool { + websocketLifecycle.Lock() + defer websocketLifecycle.Unlock() + if websocketLifecycle.stopping { + return false + } + websocketHandlers.Add(1) + return true +} + +func endWebsocketHandler() { websocketHandlers.Done() } + +func trackWebsocket(ws *candysocket) bool { + websocketLifecycle.Lock() + defer websocketLifecycle.Unlock() + if websocketLifecycle.stopping { + return false + } + websocketLifecycle.connections[ws] = struct{}{} + return true +} + +func untrackWebsocket(ws *candysocket) { + websocketLifecycle.Lock() + delete(websocketLifecycle.connections, ws) + websocketLifecycle.Unlock() +} + +// ShutdownConnections stops websocket admission, closes even connections from +// retired networks, waits for disconnect callbacks, then persists final state. +// Stop the HTTP server and background producers before calling this function. +func ShutdownConnections(ctx context.Context) error { + websocketLifecycle.Lock() + websocketLifecycle.stopping = true + connections := make([]*candysocket, 0, len(websocketLifecycle.connections)) + for ws := range websocketLifecycle.connections { + connections = append(connections, ws) + } + websocketLifecycle.Unlock() + for _, ws := range connections { + ws.authenticated.Store(false) + _ = ws.conn.Close() + } + done := make(chan struct{}) + go func() { websocketHandlers.Wait(); close(done) }() + select { + case <-ctx.Done(): + return ctx.Err() + case <-done: + _, err := FlushDeviceState(ctx) + return err + } +} diff --git a/candy/user.go b/candy/user.go deleted file mode 100644 index 40baf9f..0000000 --- a/candy/user.go +++ /dev/null @@ -1,36 +0,0 @@ -package candy - -import ( - "strconv" - "time" - - "github.com/lanthora/cacao/model" -) - -func init() { - go autoCleanInactiveUser() -} - -func CleanInactiveUser() { - threshold := func() int { - str := model.GetConfig("inactiveUserThreshold", "7") - if val, err := strconv.Atoi(str); err == nil && val > 0 { - return val - } - return 7 - }() - - users := model.GetUsers() - for _, u := range users { - if u.Role == "normal" && model.GetLastActiveTimeByUserID(u.ID).AddDate(0, 0, threshold).Before(time.Now()) { - u.Delete() - } - } -} - -func autoCleanInactiveUser() { - if model.GetConfig("autoCleanUser", "false") == "true" { - CleanInactiveUser() - } - time.AfterFunc(time.Hour, autoCleanInactiveUser) -} diff --git a/candy/websocket.go b/candy/websocket.go index 40c4627..4177526 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" @@ -16,12 +17,23 @@ import ( "github.com/lanthora/cacao/model" "github.com/lanthora/cacao/storage" "github.com/lunixbochs/struc" - "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,23 @@ func WebsocketMiddleware() gin.HandlerFunc { } func handleWebsocket(c *gin.Context) { + if !beginWebsocketHandler() { + c.Status(http.StatusServiceUnavailable) + return + } + defer endWebsocketHandler() + net := getNetByPath(c.Request.URL.Path) + if net == nil { + c.Status(http.StatusNotFound) + return + } + if !websocketFailures.allow(c.ClientIP()) { + c.Header("Retry-After", "60") + c.Status(http.StatusTooManyRequests) + 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,92 +67,130 @@ 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) + conn.SetReadLimit(maxWebsocketMessageSize) + ws := &candysocket{ctx: c, conn: conn, net: net, authDeadline: time.Now().Add(websocketAuthTimeout)} + if !trackWebsocket(ws) { + return + } + defer untrackWebsocket(ws) + net.ipWsMapMutex.Lock() + if net.closed { + net.ipWsMapMutex.Unlock() return } - ws := &candysocket{ctx: c, conn: conn, net: net} + net.connections[ws] = struct{}{} + net.ipWsMapMutex.Unlock() + defer ws.disconnect() 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 { + if !ws.authenticated.Load() { + websocketFailures.record(c.ClientIP()) + } logger.Debug("handle client message failed: %v", err) break } } - if ws.dev != nil && ws.dev.model.Online { - 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 + 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 + model.QueueDeviceState(*ws.dev.model, ws.dev.generation) } } -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 } @@ -136,6 +201,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] @@ -144,14 +211,16 @@ func (ws *candysocket) handlePingMessage(buffer string) error { } if ws.dev.model.Online { - ws.dev.model.SaveOsVersionHostname() + model.QueueDeviceState(*ws.dev.model, ws.dev.generation) } - 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 { @@ -162,67 +231,65 @@ 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") } - 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 { + if ws.net.closed { + return fmt.Errorf("auth failed: network has been revoked") + } + country, region := GetLocation(net.ParseIP(ws.ctx.ClientIP())) + device, generation, err := model.AuthenticateDevice(ws.ctx.Request.Context(), ws.net.model.ID, ws.net.model.Password, ws.dev.model.VMac, uint32ToStrIp(message.IP), country, region) + if err != nil { + ws.writeCloseMessage("device registration failed") + return fmt.Errorf("auth failed: %w", err) + } + // Retire the same identity even if it reconnects at a different IP. A failed + // durable registration leaves the existing connection untouched. + for ip, oldws := range ws.net.ipWsMap { + if oldws.dev.model.ID != device.ID { + continue + } + 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() + delete(ws.net.ipWsMap, ip) } - - ws.dev.ip = message.IP + ws.dev.model, ws.dev.generation, ws.dev.ip = &device, generation, message.IP ws.net.ipWsMap[message.IP] = ws - - db := storage.Get() - db.Where(ws.dev.model).First(ws.dev.model) - ws.dev.model.IP = uint32ToStrIp(message.IP) - 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 { @@ -243,9 +310,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)) } } } @@ -254,6 +321,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 { @@ -264,11 +334,9 @@ 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() + ws.net.dhcpMutex.Lock() + defer ws.net.dhcpMutex.Unlock() // 检查能否使用数据库中地址, 地址可用时更新响应结果 canUseLatestAddress := func() bool { @@ -304,19 +372,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 { @@ -332,30 +407,44 @@ 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 { - if ws.dev == nil { + if !ws.authenticated.Load() { return fmt.Errorf("peer conn failed: conn is not logged in") } @@ -371,6 +460,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) @@ -378,13 +470,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) - ws.dev.model.Save() + country, region := GetLocation(ip) + ws.dev.mutex.Lock() + defer ws.dev.mutex.Unlock() + ws.dev.model.Country, ws.dev.model.Region = country, region + model.QueueDeviceState(*ws.dev.model, ws.dev.generation) 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 { @@ -399,8 +497,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) @@ -413,21 +511,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)) } } } @@ -436,8 +537,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) @@ -450,21 +551,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)) } } } @@ -480,6 +584,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 +605,17 @@ func (ws *candysocket) updateSystemRoute() { ws.writeMessage(append(headerBuffer.Bytes(), bodyBuffer.Bytes()...)) } } + +func (ws *candysocket) addTX(size int) { + ws.dev.mutex.Lock() + defer ws.dev.mutex.Unlock() + ws.dev.model.TX += uint64(size) + model.QueueDeviceState(*ws.dev.model, ws.dev.generation) +} + +func (ws *candysocket) addRX(size int) { + ws.dev.mutex.Lock() + defer ws.dev.mutex.Unlock() + ws.dev.model.RX += uint64(size) + model.QueueDeviceState(*ws.dev.model, ws.dev.generation) +} 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/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..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/" @@ -13,9 +14,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 +28,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" } } diff --git a/frontend/src/App.vue b/frontend/src/App.vue index d6a261e..68cd29a 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) => { @@ -34,17 +34,26 @@ 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) { + router.replace('/login') + } else if (status === 403 && !router.currentRoute.value.meta.public) { + router.replace('/') + } return Promise.reject(error) } ) diff --git a/frontend/src/components/AdminSider.vue b/frontend/src/components/AdminSider.vue index fdb5ace..48db522 100644 --- a/frontend/src/components/AdminSider.vue +++ b/frontend/src/components/AdminSider.vue @@ -10,6 +10,10 @@ {{ $t('components.sider.user') }} + + + {{ $t('adminTasks.title') }} + {{ $t('components.sider.license') }} diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 68e60f6..7488f37 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -1,184 +1,252 @@ export default { - login: { - username: 'Username', - password: 'Password', - login: 'Log in', - register: 'Register', - registerNow: 'register now', - inputUsername: 'Please input your username', - inputPassword: 'Please input your password', - or: 'Or' + login: { + username: 'Username', + password: 'Password', + login: 'Log in', + register: 'Register', + registerNow: 'register now', + inputUsername: 'Please input your username', + inputPassword: 'Please input your password', + 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', + inputUsername: 'Please input your username', + inputPassword: 'Please input your password' + }, + loading: { + title: 'Loading' + }, + security: { + requestFailed: 'Request failed. Please try again later.' + }, + user: { + title: 'User', + subtitle: 'user information', + username: 'User Name', + changePassword: 'Change Password', + oldPassword: 'Old Password', + newPassword: 'New Password', + update: 'Update', + inputOldPassword: 'Please input old password', + inputNewPassword: 'Please input new password' + }, + network: { + title: 'Network', + subtitle: 'create and manage private networks', + add: 'Add', + edit: 'Edit', + delete: 'Delete', + netName: 'Net Name', + password: 'Password', + dhcp: 'DHCP', + broadcast: 'Broadcast', + lease: 'Lease', + action: 'Action', + enable: 'Enable', + disable: 'Disable', + modalTitle: 'Network', + inputNetname: 'Please input network name', + inputPassword: 'Please input password', + inputDhcp: 'Please input DHCP configuration', + inputLease: 'Please input lease time' + }, + device: { + title: 'Device', + subtitle: 'view and manage devices', + delete: 'Delete', + confirmDelete: 'Are you sure delete this device?', + yes: 'Yes', + no: 'No', + columns: { + hostname: 'Host Name', + network: 'Network', + ip: 'IP', + country: 'Country', + region: 'Region', + rx: 'RX', + tx: 'TX', + online: 'Online', + os: 'OS', + version: 'Version', + lastActiveTime: 'Last Active At', + action: 'Action' }, - register: { - username: 'Username', - password: 'Password', - register: 'Register', - inputUsername: 'Please input your username', - inputPassword: 'Please input your password' - }, - loading: { - title: 'Loading' - }, - user: { - title: 'User', - subtitle: 'user information', - username: 'User Name', - changePassword: 'Change Password', - oldPassword: 'Old Password', - newPassword: 'New Password', - update: 'Update', - inputOldPassword: 'Please input old password', - inputNewPassword: 'Please input new password' - }, - network: { - title: 'Network', - subtitle: 'create and manage private networks', - add: 'Add', - edit: 'Edit', - delete: 'Delete', - netName: 'Net Name', - password: 'Password', - dhcp: 'DHCP', - broadcast: 'Broadcast', - lease: 'Lease', - action: 'Action', - enable: 'Enable', - disable: 'Disable', - modalTitle: 'Network', - inputNetname: 'Please input network name', - inputPassword: 'Please input password', - inputDhcp: 'Please input DHCP configuration', - inputLease: 'Please input lease time' - }, - device: { - title: 'Device', - subtitle: 'view and manage devices', - delete: 'Delete', - confirmDelete: 'Are you sure delete this device?', - yes: 'Yes', - no: 'No', - columns: { - hostname: 'Host Name', - network: 'Network', - ip: 'IP', - country: 'Country', - region: 'Region', - rx: 'RX', - tx: 'TX', - online: 'Online', - os: 'OS', - version: 'Version', - lastActiveTime: 'Last Active At', - action: 'Action' - }, - status: { - online: 'true', - offline: 'false' - } + status: { + online: 'true', + offline: 'false' + } + }, + route: { + title: 'Route', + subtitle: 'multiple local area network networking', + add: 'Add', + delete: 'Delete', + modalTitle: 'Route', + columns: { + network: 'Network', + devAddr: 'Device Address', + devMask: 'Device Mask', + dstAddr: 'Destination Address', + dstMask: 'Destination Mask', + nextHop: 'Next Hop', + priority: 'Priority', + action: 'Action' }, - route: { - title: 'Route', - subtitle: 'multiple local area network networking', - add: 'Add', - delete: 'Delete', - modalTitle: 'Route', - columns: { - network: 'Network', - devAddr: 'Device Address', - devMask: 'Device Mask', - dstAddr: 'Destination Address', - dstMask: 'Destination Mask', - nextHop: 'Next Hop', - priority: 'Priority', - action: 'Action' - }, - placeholder: { - network: 'Network', - devAddr: 'Device Address', - devMask: 'Device Mask', - dstAddr: 'Destination Address', - dstMask: 'Destination Mask', - nextHop: 'Next Hop', - priority: 'Priority' - } + placeholder: { + network: 'Network', + devAddr: 'Device Address', + devMask: 'Device Mask', + dstAddr: 'Destination Address', + dstMask: 'Destination Mask', + nextHop: 'Next Hop', + priority: 'Priority' + } + }, + statistics: { + title: 'Statistics', + subtitle: 'user statistics', + columns: { + net: 'Net', + device: 'Device', + rx: 'RX', + tx: 'TX' + } + }, + adminUser: { + title: 'User', + subtitle: 'user management', + create: 'Create', + update: 'Update', + delete: 'Delete', + confirmDelete: 'Are you sure delete this user?', + yes: 'Yes', + no: 'No', + columns: { + username: 'Username', + role: 'Role', + network: 'Network', + device: 'Device', + rx: 'RX', + tx: 'TX', + lastActiveTime: 'Last Active At', + action: 'Action' }, - statistics: { - title: 'Statistics', - subtitle: 'user statistics', - columns: { - net: 'Net', - device: 'Device', - rx: 'RX', - tx: 'TX' - } + placeholder: { + username: 'Username', + password: 'Password' + } + }, + adminSetting: { + title: 'Setting', + subtitle: 'system configuration', + register: { + title: 'Registration Allowed', + allowed: 'Registration Allowed', + interval: 'Registration Interval', + intervalUnit: 'mins' }, - adminUser: { - title: 'User', - subtitle: 'user management', - create: 'Create', - update: 'Update', - delete: 'Delete', - confirmDelete: 'Are you sure delete this user?', - yes: 'Yes', - no: 'No', - columns: { - username: 'Username', - role: 'Role', - network: 'Network', - device: 'Device', - rx: 'RX', - tx: 'TX', - lastActiveTime: 'Last Active At', - action: 'Action' - }, - placeholder: { - username: 'Username', - password: 'Password' - } + userClean: { + title: 'Auto Clean User', + auto: 'Auto Clean User', + threshold: 'Inactive User Threshold', + thresholdUnit: 'days', + manual: 'Manual Clean', + clean: 'Clean', + success: 'success' + } + }, + adminTasks: { + title: 'Background tasks', + subtitle: 'Automatic maintenance and execution status', + retention: + 'Cleanup runs in bounded batches. Inactive users follow the existing switch and threshold; device expiry applies only to offline devices. Historical traffic is retained. Counters reset when the service restarts.', + refresh: 'Refresh', + autoRefresh: 'Refreshes every 5 seconds', + name: 'Task', + every: 'Every {seconds} seconds', + manualOnly: 'Manual only', + storage: 'Database write batches', + pendingDevices: 'Devices awaiting persistence', + storageLabels: { + queueDepth: 'Queued operations', + batchesCommitted: 'Committed batches', + jobsCommitted: 'Committed operations', + jobsFailed: 'Failed operations', + lastBatchSize: 'Last batch size' }, - adminSetting: { - title: 'Setting', - subtitle: 'system configuration', - register: { - title: 'Registration Allowed', - allowed: 'Registration Allowed', - interval: 'Registration Interval', - intervalUnit: 'mins' - }, - userClean: { - title: 'Auto Clean User', - auto: 'Auto Clean User', - threshold: 'Inactive User Threshold', - thresholdUnit: 'days', - manual: 'Manual Clean', - clean: 'Clean', - success: 'success' - } + state: 'Status', + running: 'Running', + failed: 'Failed', + ready: 'Succeeded', + pending: 'Pending', + lastStartedAt: 'Last started', + lastSuccessAt: 'Last success', + nextRunAt: 'Next run', + duration: 'Last duration', + rows: 'Rows: last / total', + runs: 'Runs / failures', + error: 'Last error', + action: 'Action', + run: 'Run now', + confirmRun: 'Run this task now using its configured cleanup policy?', + confirmInactive: + 'Clean inactive users now using the configured threshold, even if automatic user cleanup is disabled?', + queued: 'Task scheduled', + details: 'Last execution details', + names: { + maintenance: 'Business data cleanup', + 'device-flush': 'Device state persistence', + 'integrity-audit': 'Data integrity audit', + 'clean-inactive-users': 'Inactive user cleanup' }, - adminLicense: { - title: 'License', - subtitle: 'license information', - renew: 'Renew', - columns: { - licenseId: 'License ID', - description: 'Description', - expire: 'Expire', - action: 'Action' - } + detailLabels: { + devices: 'Devices removed', + routes: 'Routes removed', + nets: 'Networks removed', + users: 'Users removed', + expiredSessions: 'Expired sessions cleared', + duplicateUsers: 'Duplicate username groups', + duplicateNets: 'Duplicate network identity groups', + duplicateDevices: 'Duplicate device identity groups', + duplicateConfigs: 'Duplicate configuration key groups', + duplicateDeviceIPs: 'Duplicate device IP groups', + duplicateRoutes: 'Duplicate route groups', + orphanNets: 'Remaining orphan networks', + orphanDevices: 'Remaining orphan devices', + orphanRoutes: 'Remaining orphan routes' + } + }, + adminLicense: { + title: 'License', + subtitle: 'license information', + renew: 'Renew', + columns: { + licenseId: 'License ID', + description: 'Description', + expire: 'Expire', + action: 'Action' + } + }, + components: { + sider: { + statistics: 'Statistics', + network: 'Network', + device: 'Device', + route: 'Route', + user: 'User', + setting: 'Setting', + license: 'License', + logout: 'Logout' }, - components: { - sider: { - statistics: 'Statistics', - network: 'Network', - device: 'Device', - route: 'Route', - user: 'User', - setting: 'Setting', - license: 'License', - logout: 'Logout' - }, - footer: { - copyright: 'Cacao © 2024' - } + footer: { + copyright: 'Cacao © 2024' } -} + } +} diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 84f9740..5057f7b 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -1,184 +1,250 @@ export default { - login: { - username: '用户名', - password: '密码', - login: '登录', - register: '注册', - registerNow: '现在注册', - inputUsername: '请输入用户名', - inputPassword: '请输入密码', - or: '或者' + login: { + username: '用户名', + password: '密码', + login: '登录', + register: '注册', + registerNow: '现在注册', + inputUsername: '请输入用户名', + inputPassword: '请输入密码', + or: '或者' + }, + register: { + setupToken: '首次部署初始化密钥(可选)', + setupTokenPlaceholder: '首次创建管理员时填写', + setupTokenHelp: '仅创建首个管理员时需要,由部署者提供。已有站点的普通用户注册请留空。', + username: '用户名', + password: '密码', + register: '注册', + inputUsername: '请输入用户名', + inputPassword: '请输入密码' + }, + loading: { + title: '加载中' + }, + security: { + requestFailed: '请求失败,请稍后重试' + }, + user: { + title: '用户', + subtitle: '用户信息', + username: '用户名', + changePassword: '修改密码', + oldPassword: '旧密码', + newPassword: '新密码', + update: '更新', + inputOldPassword: '请输入旧密码', + inputNewPassword: '请输入新密码' + }, + network: { + title: '网络', + subtitle: '创建和管理私有网络', + add: '添加', + edit: '编辑', + delete: '删除', + netName: '网络名称', + password: '密码', + dhcp: 'DHCP', + broadcast: '广播', + lease: '租期', + action: '操作', + enable: '启用', + disable: '禁用', + modalTitle: '网络配置', + inputNetname: '请输入网络名称', + inputPassword: '请输入密码', + inputDhcp: '请输入DHCP配置', + inputLease: '请输入租期' + }, + device: { + title: '设备', + subtitle: '查看和管理设备', + delete: '删除', + confirmDelete: '确定要删除这个设备吗?', + yes: '是', + no: '否', + columns: { + hostname: '主机名', + network: '网络', + ip: 'IP地址', + country: '国家', + region: '地区', + rx: '接收', + tx: '发送', + online: '在线', + os: '操作系统', + version: '版本', + lastActiveTime: '最后活跃时间', + action: '操作' }, - register: { - username: '用户名', - password: '密码', - register: '注册', - inputUsername: '请输入用户名', - inputPassword: '请输入密码' - }, - loading: { - title: '加载中' - }, - user: { - title: '用户', - subtitle: '用户信息', - username: '用户名', - changePassword: '修改密码', - oldPassword: '旧密码', - newPassword: '新密码', - update: '更新', - inputOldPassword: '请输入旧密码', - inputNewPassword: '请输入新密码' - }, - network: { - title: '网络', - subtitle: '创建和管理私有网络', - add: '添加', - edit: '编辑', - delete: '删除', - netName: '网络名称', - password: '密码', - dhcp: 'DHCP', - broadcast: '广播', - lease: '租期', - action: '操作', - enable: '启用', - disable: '禁用', - modalTitle: '网络配置', - inputNetname: '请输入网络名称', - inputPassword: '请输入密码', - inputDhcp: '请输入DHCP配置', - inputLease: '请输入租期' - }, - device: { - title: '设备', - subtitle: '查看和管理设备', - delete: '删除', - confirmDelete: '确定要删除这个设备吗?', - yes: '是', - no: '否', - columns: { - hostname: '主机名', - network: '网络', - ip: 'IP地址', - country: '国家', - region: '地区', - rx: '接收', - tx: '发送', - online: '在线', - os: '操作系统', - version: '版本', - lastActiveTime: '最后活跃时间', - action: '操作' - }, - status: { - online: '在线', - offline: '离线' - } + status: { + online: '在线', + offline: '离线' + } + }, + route: { + title: '路由', + subtitle: '多局域网络互联', + add: '添加', + delete: '删除', + modalTitle: '路由配置', + columns: { + network: '网络', + devAddr: '设备地址', + devMask: '设备掩码', + dstAddr: '目标地址', + dstMask: '目标掩码', + nextHop: '下一跳', + priority: '优先级', + action: '操作' }, - route: { - title: '路由', - subtitle: '多局域网络互联', - add: '添加', - delete: '删除', - modalTitle: '路由配置', - columns: { - network: '网络', - devAddr: '设备地址', - devMask: '设备掩码', - dstAddr: '目标地址', - dstMask: '目标掩码', - nextHop: '下一跳', - priority: '优先级', - action: '操作' - }, - placeholder: { - network: '选择网络', - devAddr: '请输入设备地址', - devMask: '请输入设备掩码', - dstAddr: '请输入目标地址', - dstMask: '请输入目标掩码', - nextHop: '请输入下一跳', - priority: '请输入优先级' - } + placeholder: { + network: '选择网络', + devAddr: '请输入设备地址', + devMask: '请输入设备掩码', + dstAddr: '请输入目标地址', + dstMask: '请输入目标掩码', + nextHop: '请输入下一跳', + priority: '请输入优先级' + } + }, + statistics: { + title: '统计', + subtitle: '用户统计', + columns: { + net: '网络数', + device: '设备数', + rx: '接收流量', + tx: '发送流量' + } + }, + adminUser: { + title: '用户', + subtitle: '用户管理', + create: '创建', + update: '更新', + delete: '删除', + confirmDelete: '确定要删除这个用户吗?', + yes: '是', + no: '否', + columns: { + username: '用户名', + role: '角色', + network: '网络数', + device: '设备数', + rx: '接收流量', + tx: '发送流量', + lastActiveTime: '最后活跃时间', + action: '操作' }, - statistics: { - title: '统计', - subtitle: '用户统计', - columns: { - net: '网络数', - device: '设备数', - rx: '接收流量', - tx: '发送流量' - } + placeholder: { + username: '用户名', + password: '密码' + } + }, + adminSetting: { + title: '设置', + subtitle: '系统配置', + register: { + title: '注册设置', + allowed: '允许注册', + interval: '注册间隔', + intervalUnit: '分钟' }, - adminUser: { - title: '用户', - subtitle: '用户管理', - create: '创建', - update: '更新', - delete: '删除', - confirmDelete: '确定要删除这个用户吗?', - yes: '是', - no: '否', - columns: { - username: '用户名', - role: '角色', - network: '网络数', - device: '设备数', - rx: '接收流量', - tx: '发送流量', - lastActiveTime: '最后活跃时间', - action: '操作' - }, - placeholder: { - username: '用户名', - password: '密码' - } + userClean: { + title: '用户清理', + auto: '自动清理用户', + threshold: '不活跃用户阈值', + thresholdUnit: '天', + manual: '手动清理', + clean: '清理', + success: '清理成功' + } + }, + adminTasks: { + title: '后台任务', + subtitle: '自动维护与执行状态', + retention: + '清理按有界批次执行。不活跃用户遵循原有开关与阈值,设备租期仅清理离线设备;保留历史流量。累计指标在服务重启后重新计数。', + refresh: '刷新', + autoRefresh: '每 5 秒自动刷新', + name: '任务', + every: '每 {seconds} 秒', + manualOnly: '仅手动执行', + storage: '数据库批量写入', + pendingDevices: '待落库设备数', + storageLabels: { + queueDepth: '排队操作数', + batchesCommitted: '已提交批次数', + jobsCommitted: '已提交操作数', + jobsFailed: '失败操作数', + lastBatchSize: '最近一批操作数' }, - adminSetting: { - title: '设置', - subtitle: '系统配置', - register: { - title: '注册设置', - allowed: '允许注册', - interval: '注册间隔', - intervalUnit: '分钟' - }, - userClean: { - title: '用户清理', - auto: '自动清理用户', - threshold: '不活跃用户阈值', - thresholdUnit: '天', - manual: '手动清理', - clean: '清理', - success: '清理成功' - } + state: '状态', + running: '运行中', + failed: '失败', + ready: '成功', + pending: '待运行', + lastStartedAt: '最近开始', + lastSuccessAt: '最近成功', + nextRunAt: '下次计划', + duration: '最近耗时', + rows: '影响行数:最近 / 累计', + runs: '执行次数 / 失败次数', + error: '最近错误', + action: '操作', + run: '立即运行', + confirmRun: '按此任务配置的清理策略立即执行?', + confirmInactive: '按已配置的不活跃天数立即清理用户?此次手动清理不受自动清理开关限制。', + queued: '任务已调度', + details: '最近执行明细', + names: { + maintenance: '业务数据清理', + 'device-flush': '设备状态落库', + 'integrity-audit': '数据完整性巡检', + 'clean-inactive-users': '不活跃用户清理' }, - adminLicense: { - title: '许可证', - subtitle: '许可证信息', - renew: '续期', - columns: { - licenseId: '许可证ID', - description: '描述', - expire: '过期时间', - action: '操作' - } + detailLabels: { + devices: '清理设备数', + routes: '清理路由数', + nets: '清理网络数', + users: '清理用户数', + expiredSessions: '清理过期会话数', + duplicateUsers: '用户名重复组数', + duplicateNets: '网络标识重复组数', + duplicateDevices: '设备标识重复组数', + duplicateConfigs: '配置键重复组数', + duplicateDeviceIPs: '设备 IP 重复组数', + duplicateRoutes: '路由重复组数', + orphanNets: '剩余孤儿网络数', + orphanDevices: '剩余孤儿设备数', + orphanRoutes: '剩余孤儿路由数' + } + }, + adminLicense: { + title: '许可证', + subtitle: '许可证信息', + renew: '续期', + columns: { + licenseId: '许可证ID', + description: '描述', + expire: '过期时间', + action: '操作' + } + }, + components: { + sider: { + statistics: '统计', + network: '网络', + device: '设备', + route: '路由', + user: '用户', + setting: '设置', + license: '许可证', + logout: '退出' }, - components: { - sider: { - statistics: '统计', - network: '网络', - device: '设备', - route: '路由', - user: '用户', - setting: '设置', - license: '许可证', - logout: '退出' - }, - footer: { - copyright: 'Cacao © 2024' - } + footer: { + copyright: 'Cacao © 2024' } -} + } +} diff --git a/frontend/src/main.js b/frontend/src/main.js index 77962be..19abb69 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -2,11 +2,13 @@ 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' import AdminUser from './views/AdminUser.vue' import AdminSetting from './views/AdminSetting.vue' +import AdminTasks from './views/AdminTasks.vue' import AdminLicense from './views/AdminLicense.vue' import LoadingView from './views/LoadingView.vue' import RouteView from './views/RouteView.vue' @@ -17,16 +19,17 @@ 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: '/admin/tasks', component: AdminTasks, meta: { role: 'admin' } }, { path: '/:pathMatch(.*)', redirect: '/' } ] @@ -35,6 +38,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/AdminSetting.vue b/frontend/src/views/AdminSetting.vue index 92b81fd..b85546a 100644 --- a/frontend/src/views/AdminSetting.vue +++ b/frontend/src/views/AdminSetting.vue @@ -147,7 +147,7 @@ const cleanInactiveUser = async () => { const response = await axios.post('/api/admin/cleanInactiveUser') const status = response.data.status if (status == 0) { - message.success(t('adminSetting.userClean.success')) + message.success(t('adminTasks.queued')) } } diff --git a/frontend/src/views/AdminTasks.vue b/frontend/src/views/AdminTasks.vue new file mode 100644 index 0000000..4e55f60 --- /dev/null +++ b/frontend/src/views/AdminTasks.vue @@ -0,0 +1,212 @@ + + + + + + + + + + + + {{ storage[key] ?? '—' }} + {{ + pendingDevices + }} + + + {{ $t('adminTasks.refresh') }} + {{ $t('adminTasks.autoRefresh') }} + + + + + + {{ taskName(record.name) }} + + {{ + record.manualOnly + ? $t('adminTasks.manualOnly') + : $t('adminTasks.every', { seconds: record.intervalSeconds }) + }} + + + + + {{ + $t( + `adminTasks.${record.running ? 'running' : record.lastError ? 'failed' : record.runs ? 'ready' : 'pending'}` + ) + }} + + + + + + {{ $t('adminTasks.run') }} + + + + {{ record.runs }} / {{ record.failures }} + {{ record.lastRowsAffected }} / {{ record.totalRowsAffected }} + {{ record.lastDurationMs }} ms + {{ record.lastError || '—' }} + {{ formatTime(record[column.key]) }} + + + + {{ value }} + + + + + + + + + + + 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 @@ - - 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 } }) 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= diff --git a/main.go b/main.go index 3497f99..7da6a7b 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,20 @@ package main import ( + "bytes" + "context" + "crypto/tls" + "errors" + "io" + "mime" + "net/http" + "net/url" + "os" + "os/signal" "path" + "strings" + "syscall" + "time" "github.com/gin-gonic/gin" "github.com/lanthora/cacao/api" @@ -9,6 +22,8 @@ import ( "github.com/lanthora/cacao/candy" "github.com/lanthora/cacao/frontend" "github.com/lanthora/cacao/logger" + "github.com/lanthora/cacao/model" + "github.com/lanthora/cacao/storage" "github.com/lanthora/cacao/util" ) @@ -17,10 +32,98 @@ func init() { } func main() { + if err := run(); err != nil { + logger.Fatal("service failed: %v", err) + } +} + +func run() (result error) { + ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM) + defer stop() + if err := model.EnsureIntegrity(); err != nil { + return err + } + tasks, err := newBackgroundTasks() + if err != nil { + return err + } + if err := tasks.Start(ctx); err != nil { + return err + } + api.SetBackgroundTasks(tasks) + defer func() { + shutdownCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + defer cancel() + result = errors.Join(result, tasks.Stop(shutdownCtx)) + result = errors.Join(result, candy.ShutdownConnections(shutdownCtx)) + result = errors.Join(result, storage.Shutdown(shutdownCtx)) + }() + r, err := newRouter(argp.Get("trusted-proxies", "")) + if err != nil { + return 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) + return serve(ctx, newHTTPServer(addr, r), path.Join(storageDir, crtFilename), path.Join(storageDir, keyFilename)) + } else { + addr := argp.Get("listen", ":80") + logger.Info("listen=[%v]", addr) + return serve(ctx, newHTTPServer(addr, r), "", "") + } +} + +func serve(ctx context.Context, server *http.Server, cert, key string) error { + done := make(chan error, 1) + go func() { + if cert != "" { + done <- server.ListenAndServeTLS(cert, key) + } else { + done <- server.ListenAndServe() + } + }() + select { + case err := <-done: + if errors.Is(err, http.ErrServerClosed) { + return nil + } + return err + case <-ctx.Done(): + shutdownCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + defer cancel() + return server.Shutdown(shutdownCtx) + } +} + +func newRouter(trustedProxies string) (*gin.Engine, error) { r := gin.New() - r.Use(candy.WebsocketMiddleware(), api.LoginMiddleware(), api.AdminMiddleware()) + 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()) + c.AbortWithStatus(http.StatusInternalServerError) + }) + r.Use(recovery, securityHeaders(), candy.WebsocketMiddleware()) + + public := r.Group("/api", apiRequestSecurity()) + 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) @@ -34,46 +137,123 @@ func main() { admin.POST("/getInactiveUserThresholdConfig", api.AdminGetInactiveUserThresholdConfig) admin.POST("/setInactiveUserThresholdConfig", api.AdminSetInactiveUserThresholdConfig) admin.POST("/cleanInactiveUser", api.AdminCleanInactiveUser) + admin.POST("/backgroundTasks", api.AdminBackgroundTasks) + admin.POST("/runBackgroundTask", api.AdminRunBackgroundTask) - 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) + r.NoRoute(func(c *gin.Context) { + if c.Request.URL.Path == "/api" || strings.HasPrefix(c.Request.URL.Path, "/api/") { + c.AbortWithStatus(http.StatusNotFound) + return + } + frontend.Static(c) + }) + return r, nil +} - 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) +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") + 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") } - } 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) + 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 new file mode 100644 index 0000000..ba3e31e --- /dev/null +++ b/main_test.go @@ -0,0 +1,207 @@ +package main + +import ( + "crypto/tls" + "encoding/json" + "io" + "net/http" + "net/http/httptest" + "strings" + "testing" + + "github.com/gin-gonic/gin" +) + +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") + } +} + +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 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(), " ?", netID, ip, device.ID).Count(&conflicts).Error; err != nil { + return err + } + if conflicts > 0 { + return fmt.Errorf("device IP address is already reserved") + } + if hasBuffered && buffered.device.ID == device.ID { + copyDeviceTelemetry(&device, buffered.device) + } + device.NetID, device.VMac, device.IP = netID, vmac, ip + device.Online, device.Country, device.Region = true, country, region + if device.ID == 0 { + if err := tx.Create(&device).Error; err != nil { + return err + } + } else { + if err := tx.Model(&device).Select("ip", "online", "rx", "tx", "os", "version", "hostname", "country", "region").Updates(&device).Error; err != nil { + return err + } + } + return tx.Model(&User{}).Where("id = ?", ownerID).UpdateColumn("updated_at", device.UpdatedAt).Error + }) + if err != nil { + return Device{}, 0, err + } + persistedRX, persistedTX := device.RX, device.TX + dirty := false + deviceStates.Lock() + defer deviceStates.Unlock() + if latest, ok := deviceStates.entries[device.ID]; hasBuffered && ok && latest.generation == buffered.generation && latest.version != buffered.version { + // Packets and pings keep advancing while SQLite commits. Transfer the + // latest telemetry to the new session, retaining the actual committed + // counters as its baseline so the next flush writes only pending state. + online, authCountry, authRegion, committedAt := device.Online, device.Country, device.Region, device.UpdatedAt + copyDeviceTelemetry(&device, latest.device) + device.Online, device.Country, device.Region = online, authCountry, authRegion + if device.UpdatedAt.Before(committedAt) { + device.UpdatedAt = committedAt + } + dirty = true + } + deviceStates.sequence++ + generation := deviceStates.sequence + deviceStates.entries[device.ID] = deviceStateEntry{device: device, userID: ownerID, generation: generation, version: generation, dirty: dirty, persistedRX: persistedRX, persistedTX: persistedTX} + deviceStates.identities[identity] = device.ID + return device, generation, nil +} + +// QueueDeviceState never creates a database row. The generation rejects late +// callbacks from a retired socket after reconnect, deletion or password change. +func QueueDeviceState(device Device, generation uint64) { + if device.ID == 0 || generation == 0 { + return + } + deviceStates.Lock() + defer deviceStates.Unlock() + entry, exists := deviceStates.entries[device.ID] + if !exists || entry.generation != generation { + return + } + deviceStates.sequence++ + entry.version, entry.dirty = deviceStates.sequence, true + copyDeviceTelemetry(&entry.device, device) + entry.device.UpdatedAt = time.Now() + deviceStates.entries[device.ID] = entry +} + +func copyDeviceTelemetry(dst *Device, src Device) { + dst.Online, dst.RX, dst.TX = src.Online, src.RX, src.TX + dst.OS, dst.Version, dst.Hostname = src.OS, src.Version, src.Hostname + dst.Country, dst.Region = src.Country, src.Region + dst.UpdatedAt = src.UpdatedAt +} + +func OverlayDeviceState(device *Device) { + deviceStates.Lock() + defer deviceStates.Unlock() + if entry, ok := deviceStates.entries[device.ID]; ok { + copyDeviceTelemetry(device, entry.device) + } +} + +// Only rows already returned by the database receive an overlay. Deleted rows +// are never reintroduced into API results by queued telemetry. +func OverlayDeviceStates(devices []Device) { + deviceStates.Lock() + defer deviceStates.Unlock() + for i := range devices { + if entry, ok := deviceStates.entries[devices[i].ID]; ok { + copyDeviceTelemetry(&devices[i], entry.device) + } + } +} + +func writeDeviceSnapshotsTx(tx *gorm.DB, pending []deviceStateEntry, applied map[uint]struct{}) error { + for start := 0; start < len(pending); start += 48 { + end := start + 48 + if end > len(pending) { + end = len(pending) + } + batch := pending[start:end] + var query strings.Builder + args := make([]interface{}, 0, len(batch)*19) + query.WriteString("UPDATE devices SET ") + columns := []string{"online", "rx", "tx", "os", "version", "hostname", "country", "region", "updated_at"} + for colIndex, col := range columns { + if colIndex > 0 { + query.WriteString(", ") + } + query.WriteString(col + " = CASE id") + for _, entry := range batch { + d := entry.device + values := []interface{}{d.Online, d.RX, d.TX, d.OS, d.Version, d.Hostname, d.Country, d.Region, d.UpdatedAt} + query.WriteString(" WHEN ? THEN ?") + args = append(args, d.ID, values[colIndex]) + } + query.WriteString(" END") + } + ids := make([]uint, 0, len(batch)) + for _, entry := range batch { + ids = append(ids, entry.device.ID) + } + query.WriteString(" WHERE id IN ? AND deleted_at IS NULL AND EXISTS (SELECT 1 FROM nets JOIN users ON users.id = nets.user_id AND users.deleted_at IS NULL WHERE nets.id = devices.net_id AND nets.deleted_at IS NULL) RETURNING id") + args = append(args, ids) + var updatedIDs []uint + if err := tx.Raw(query.String(), args...).Scan(&updatedIDs).Error; err != nil { + return err + } + for _, id := range updatedIDs { + applied[id] = struct{}{} + } + if len(updatedIDs) > 0 { + now := time.Now() + if err := tx.Exec("UPDATE users SET updated_at = CASE WHEN updated_at < ? THEN ? ELSE updated_at END WHERE deleted_at IS NULL AND id IN (SELECT nets.user_id FROM nets JOIN devices ON devices.net_id = nets.id WHERE devices.id IN ? AND nets.deleted_at IS NULL AND devices.deleted_at IS NULL)", now, now, updatedIDs).Error; err != nil { + return err + } + } + } + return nil +} + +// FlushDeviceStates writes all captured telemetry in one logical transaction, +// with at most 48 devices per statement to stay below SQLite's parameter limit. +func FlushDeviceStates(ctx context.Context) (int, error) { + devicePersistenceMutex.Lock() + defer devicePersistenceMutex.Unlock() + deviceStates.Lock() + pending := make([]deviceStateEntry, 0, len(deviceStates.entries)) + for _, entry := range deviceStates.entries { + if entry.dirty { + pending = append(pending, entry) + } + } + deviceStates.Unlock() + if len(pending) == 0 { + return 0, nil + } + applied := make(map[uint]struct{}, len(pending)) + err := storage.WriteContext(ctx, func(tx *gorm.DB) error { + return writeDeviceSnapshotsTx(tx, pending, applied) + }) + if err != nil { + return 0, err + } + deviceStates.Lock() + defer deviceStates.Unlock() + for _, captured := range pending { + entry, ok := deviceStates.entries[captured.device.ID] + if !ok || entry.generation != captured.generation { + continue + } + if _, exists := applied[captured.device.ID]; !exists { + removeDeviceStateLocked(captured.device.ID) + continue + } + entry.persistedRX, entry.persistedTX = captured.device.RX, captured.device.TX + if entry.version == captured.version { + if !entry.device.Online { + removeDeviceStateLocked(captured.device.ID) + continue + } + entry.dirty = false + } + deviceStates.entries[captured.device.ID] = entry + } + return len(applied), nil +} + +// WriteDeletingDevices saves the currently buffered telemetry and deletes a +// business tree in one logical transaction. Capturing is the counter cutoff: +// packets already being handled may arrive later, but cannot revive the rows. +// The mutation callback must only use tx and must not acquire application locks. +// A nonzero netID restricts the scope to that network; userID can further limit +// its owner. Without netID, userID selects all of that user's tracked devices. +func WriteDeletingDevices(ctx context.Context, userID, netID uint, mutation func(*gorm.DB) error) error { + if (userID == 0 && netID == 0) || mutation == nil { + return fmt.Errorf("invalid device tree deletion scope") + } + devicePersistenceMutex.Lock() + defer devicePersistenceMutex.Unlock() + deviceStates.Lock() + captured := make([]deviceStateEntry, 0) + pending := make([]deviceStateEntry, 0) + for _, entry := range deviceStates.entries { + if netID != 0 && entry.device.NetID != netID { + continue + } + if userID != 0 && entry.userID != userID { + continue + } + captured = append(captured, entry) + if entry.dirty { + pending = append(pending, entry) + } + } + deviceStates.Unlock() + if err := storage.WriteContext(ctx, func(tx *gorm.DB) error { + if err := writeDeviceSnapshotsTx(tx, pending, make(map[uint]struct{}, len(pending))); err != nil { + return err + } + return mutation(tx) + }); err != nil { + return err + } + deviceStates.Lock() + for _, snapshot := range captured { + if latest, ok := deviceStates.entries[snapshot.device.ID]; ok && latest.generation == snapshot.generation { + removeDeviceStateLocked(snapshot.device.ID) + } + } + deviceStates.Unlock() + return nil +} + +type DeviceTraffic struct { + RX uint64 + TX uint64 +} + +// GetUserTrafficTotals combines one grouped query with unflushed deltas. Taking +// the persistence lock avoids double-counting a flush between those two steps. +func GetUserTrafficTotals(userIDs []uint) (map[uint]DeviceTraffic, error) { + devicePersistenceMutex.Lock() + defer devicePersistenceMutex.Unlock() + var rows []struct { + UserID uint + RX uint64 + TX uint64 + } + query := storage.Get().Unscoped().Model(&Device{}).Select("nets.user_id, COALESCE(SUM(devices.rx), 0) AS rx, COALESCE(SUM(devices.tx), 0) AS tx").Joins("JOIN nets ON devices.net_id = nets.id").Group("nets.user_id") + if len(userIDs) > 0 { + query = query.Where("nets.user_id IN ?", userIDs) + } + if err := query.Scan(&rows).Error; err != nil { + return nil, err + } + totals := make(map[uint]DeviceTraffic, len(rows)) + for _, row := range rows { + totals[row.UserID] = DeviceTraffic{RX: row.RX, TX: row.TX} + } + selected := make(map[uint]struct{}, len(userIDs)) + for _, id := range userIDs { + selected[id] = struct{}{} + } + deviceStates.Lock() + defer deviceStates.Unlock() + for _, entry := range deviceStates.entries { + if len(selected) > 0 { + if _, ok := selected[entry.userID]; !ok { + continue + } + } + total := totals[entry.userID] + if entry.device.RX >= entry.persistedRX { + total.RX += entry.device.RX - entry.persistedRX + } + if entry.device.TX >= entry.persistedTX { + total.TX += entry.device.TX - entry.persistedTX + } + totals[entry.userID] = total + } + return totals, nil +} diff --git a/model/device_batch_test.go b/model/device_batch_test.go new file mode 100644 index 0000000..c265f8d --- /dev/null +++ b/model/device_batch_test.go @@ -0,0 +1,531 @@ +package model + +import ( + "context" + "errors" + "fmt" + "sync" + "testing" + "time" + + "github.com/lanthora/cacao/storage" + "gorm.io/gorm" +) + +func newBatchTestNetwork(t *testing.T) (User, Net) { + t.Helper() + user := User{Name: fmt.Sprintf("batch-%d", time.Now().UnixNano()), Role: "normal"} + network := Net{Name: "batch", Password: "secret", DHCP: "10.30.0.0/16"} + if err := storage.Write(func(tx *gorm.DB) error { + if err := tx.Create(&user).Error; err != nil { + return err + } + network.UserID = user.ID + return tx.Create(&network).Error + }); err != nil { + t.Fatal(err) + } + t.Cleanup(func() { + devicePersistenceMutex.Lock() + defer devicePersistenceMutex.Unlock() + deviceStates.Lock() + for id, entry := range deviceStates.entries { + if entry.device.NetID == network.ID { + removeDeviceStateLocked(id) + } + } + deviceStates.Unlock() + if err := storage.Write(func(tx *gorm.DB) error { + if err := tx.Unscoped().Where("net_id = ?", network.ID).Delete(&Device{}).Error; err != nil { + return err + } + if err := tx.Unscoped().Delete(&network).Error; err != nil { + return err + } + return tx.Unscoped().Delete(&user).Error + }); err != nil { + t.Error(err) + } + }) + return user, network +} + +func authenticateBatchDevice(t *testing.T, network Net, vmac, ip string) (Device, uint64) { + t.Helper() + device, generation, err := AuthenticateDevice(context.Background(), network.ID, network.Password, vmac, ip, "", "") + if err != nil { + t.Fatal(err) + } + return device, generation +} + +func TestDeviceTelemetryCoalescesAndOverlaysReads(t *testing.T) { + user, network := newBatchTestNetwork(t) + device, generation := authenticateBatchDevice(t, network, "1000000000000001", "10.30.0.1") + for i := 1; i <= 100; i++ { + device.RX, device.TX = uint64(i), uint64(i*2) + device.Hostname = fmt.Sprintf("host-%d", i) + QueueDeviceState(device, generation) + } + var persisted Device + if err := storage.Get().First(&persisted, device.ID).Error; err != nil { + t.Fatal(err) + } + if persisted.RX != 0 || persisted.Hostname != "" { + t.Fatal("telemetry wrote through before batch flush") + } + if current := GetDeviceByDevID(device.ID); current.RX != 100 || current.Hostname != "host-100" { + t.Fatalf("missing live overlay: %+v", current) + } + totals, err := GetUserTrafficTotals([]uint{user.ID}) + if err != nil || totals[user.ID].TX != 200 { + t.Fatalf("pending traffic missing: %+v %v", totals, err) + } + if count, err := FlushDeviceStates(context.Background()); err != nil || count != 1 { + t.Fatalf("flush = %d, %v", count, err) + } + if err := storage.Get().First(&persisted, device.ID).Error; err != nil { + t.Fatal(err) + } + if persisted.RX != 100 || persisted.TX != 200 || persisted.Hostname != "host-100" { + t.Fatalf("incomplete batched telemetry: %+v", persisted) + } + if count, err := FlushDeviceStates(context.Background()); err != nil || count != 0 { + t.Fatalf("unchanged batch repeated writes: %d %v", count, err) + } + totals, err = GetUserTrafficTotals([]uint{user.ID}) + if err != nil || totals[user.ID].TX != 200 { + t.Fatalf("flushed traffic double counted: %+v %v", totals, err) + } +} + +func TestDeviceBatchFailureRetainsLatestState(t *testing.T) { + _, network := newBatchTestNetwork(t) + device, generation := authenticateBatchDevice(t, network, "1000000000000002", "10.30.0.2") + device.RX = 20 + QueueDeviceState(device, generation) + trigger := fmt.Sprintf("batch_test_failure_%d", device.ID) + if err := storage.Write(func(tx *gorm.DB) error { + return tx.Exec(fmt.Sprintf("CREATE TRIGGER %s BEFORE UPDATE ON devices WHEN NEW.id = %d BEGIN SELECT RAISE(ABORT, 'injected telemetry failure'); END", trigger, device.ID)).Error + }); err != nil { + t.Fatal(err) + } + t.Cleanup(func() { + storage.Write(func(tx *gorm.DB) error { return tx.Exec("DROP TRIGGER IF EXISTS " + trigger).Error }) + }) + if _, err := FlushDeviceStates(context.Background()); err == nil { + t.Fatal("injected write failure was swallowed") + } + device.RX = 30 + QueueDeviceState(device, generation) + if err := storage.Write(func(tx *gorm.DB) error { return tx.Exec("DROP TRIGGER " + trigger).Error }); err != nil { + t.Fatal(err) + } + if count, err := FlushDeviceStates(context.Background()); err != nil || count != 1 { + t.Fatalf("retry = %d, %v", count, err) + } + var persisted Device + storage.Get().First(&persisted, device.ID) + if persisted.RX != 30 { + t.Fatalf("retry lost latest state: %+v", persisted) + } +} + +func TestDeviceReconnectRejectsOldGenerationAndRetainsTraffic(t *testing.T) { + _, network := newBatchTestNetwork(t) + old, oldGeneration := authenticateBatchDevice(t, network, "1000000000000003", "10.30.0.3") + old.RX = 33 + QueueDeviceState(old, oldGeneration) + current, generation := authenticateBatchDevice(t, network, old.VMac, "10.30.0.4") + if current.ID != old.ID || current.RX != 33 || generation == oldGeneration { + t.Fatal("reconnect did not retain identity and unflushed traffic") + } + old.Online, old.RX = false, 999 + QueueDeviceState(old, oldGeneration) + if got := GetDeviceByDevID(old.ID); !got.Online || got.RX != 33 || got.IP != "10.30.0.4" { + t.Fatalf("old session replaced current state: %+v", got) + } + current.TX, current.Online = 44, false + QueueDeviceState(current, generation) + if err := current.Delete(); err != nil { + t.Fatal(err) + } + QueueDeviceState(current, generation) + if _, err := FlushDeviceStates(context.Background()); err != nil { + t.Fatal(err) + } + if got := GetDeviceByDevID(current.ID); got.ID != 0 { + t.Fatal("late telemetry resurrected deleted device") + } +} + +func TestDeviceDeleteRechecksOnlineAfterReconnect(t *testing.T) { + _, network := newBatchTestNetwork(t) + device, generation := authenticateBatchDevice(t, network, "1000000000000011", "10.30.0.11") + device.Online = false + QueueDeviceState(device, generation) + stale := GetDeviceByDevID(device.ID) + if stale.Online { + t.Fatal("disconnect was not visible") + } + current, currentGeneration := authenticateBatchDevice(t, network, device.VMac, device.IP) + if err := stale.Delete(); !errors.Is(err, ErrDeviceOnline) { + t.Fatalf("stale delete removed a reconnected device: %v", err) + } + if err := (&Device{}).Delete(); !errors.Is(err, gorm.ErrRecordNotFound) { + t.Fatalf("zero ID delete = %v", err) + } + current.Online, current.TX = false, 77 + QueueDeviceState(current, currentGeneration) + if err := stale.Delete(); err != nil { + t.Fatalf("pending disconnect prevented deletion: %v", err) + } + var persisted Device + if err := storage.Get().Unscoped().First(&persisted, device.ID).Error; err != nil { + t.Fatal(err) + } + if !persisted.DeletedAt.Valid || persisted.TX != 77 { + t.Fatalf("delete lost final telemetry: %+v", persisted) + } + if err := stale.Delete(); err != nil { + t.Fatalf("repeat deletion was not idempotent: %v", err) + } +} + +func TestDeviceAuthenticationRejectsConflictsAndMissingParents(t *testing.T) { + _, network := newBatchTestNetwork(t) + var wg sync.WaitGroup + results := make(chan error, 2) + for i := 1; i <= 2; i++ { + wg.Add(1) + go func(i int) { + defer wg.Done() + _, _, err := AuthenticateDevice(context.Background(), network.ID, network.Password, fmt.Sprintf("%016x", i), "10.30.0.5", "", "") + results <- err + }(i) + } + wg.Wait() + close(results) + successes := 0 + for err := range results { + if err == nil { + successes++ + } + } + if successes != 1 { + t.Fatalf("concurrent IP claim succeeded %d times", successes) + } + if err := storage.Write(func(tx *gorm.DB) error { return tx.Delete(&network).Error }); err != nil { + t.Fatal(err) + } + if _, _, err := AuthenticateDevice(context.Background(), network.ID, network.Password, "1000000000000009", "10.30.0.9", "", ""); err == nil { + t.Fatal("authentication created a child under a deleted network") + } +} + +func TestDeviceBatchSpansSQLParameterLimitAndKeepsConcurrentChanges(t *testing.T) { + _, network := newBatchTestNetwork(t) + const size = 65 + devices := make([]Device, size) + generations := make([]uint64, size) + for i := range devices { + devices[i], generations[i] = authenticateBatchDevice(t, network, fmt.Sprintf("%016x", 100+i), fmt.Sprintf("10.30.1.%d", i+1)) + devices[i].RX = uint64(i + 1) + QueueDeviceState(devices[i], generations[i]) + } + done := make(chan error, 1) + go func() { _, err := FlushDeviceStates(context.Background()); done <- err }() + for i := range devices { + devices[i].RX = uint64(1000 + i) + QueueDeviceState(devices[i], generations[i]) + } + if err := <-done; err != nil { + t.Fatal(err) + } + if _, err := FlushDeviceStates(context.Background()); err != nil { + t.Fatal(err) + } + var persisted []Device + if err := storage.Get().Where("net_id = ?", network.ID).Order("id").Find(&persisted).Error; err != nil { + t.Fatal(err) + } + if len(persisted) != size { + t.Fatalf("batch size = %d", len(persisted)) + } + for i, device := range persisted { + if device.RX != uint64(1000+i) { + t.Fatalf("batch lost concurrent update at %d: %d", i, device.RX) + } + } +} + +// Hold the writer inside an already-started transaction. Operations submitted +// afterwards cannot commit until release, just as when SQLite waits on a lock. +func holdDeviceTestWriter(t *testing.T) func() { + t.Helper() + started, release, done := make(chan struct{}), make(chan struct{}), make(chan struct{}) + var once sync.Once + var result error + go func() { + result = storage.Write(func(tx *gorm.DB) error { close(started); <-release; return nil }) + close(done) + }() + releaseWriter := func() { + once.Do(func() { close(release) }) + select { + case <-done: + if result != nil { + t.Errorf("blocking test writer failed: %v", result) + } + case <-time.After(3 * time.Second): + t.Error("blocking test writer did not exit") + } + } + t.Cleanup(releaseWriter) + select { + case <-started: + case <-time.After(3 * time.Second): + t.Fatal("test writer did not start") + } + return releaseWriter +} + +func waitDeviceTestWriteQueued(t *testing.T) { + t.Helper() + deadline := time.Now().Add(2 * time.Second) + for storage.Stats().QueueDepth == 0 { + if time.Now().After(deadline) { + t.Fatal("device operation did not reach the writer queue") + } + time.Sleep(time.Millisecond) + } +} + +func queueDeviceWhileWriterBlocked(t *testing.T, device Device, generation uint64) { + t.Helper() + done := make(chan struct{}) + go func() { QueueDeviceState(device, generation); close(done) }() + select { + case <-done: + case <-time.After(250 * time.Millisecond): + t.Fatal("telemetry was blocked by an unrelated pending SQLite transaction") + } +} + +func TestDeviceAuthenticationDoesNotBlockTelemetryDuringSlowCommit(t *testing.T) { + user, network := newBatchTestNetwork(t) + _, otherNetwork := newBatchTestNetwork(t) + old, oldGeneration := authenticateBatchDevice(t, network, "1000000000000021", "10.30.0.21") + other, otherGeneration := authenticateBatchDevice(t, otherNetwork, "1000000000000022", "10.30.0.22") + old.RX, old.TX = 10, 20 + QueueDeviceState(old, oldGeneration) + releaseWriter := holdDeviceTestWriter(t) + type authResult struct { + device Device + generation uint64 + err error + } + authenticated := make(chan authResult, 1) + go func() { + device, generation, err := AuthenticateDevice(context.Background(), network.ID, network.Password, old.VMac, old.IP, "new-country", "new-region") + authenticated <- authResult{device: device, generation: generation, err: err} + }() + waitDeviceTestWriteQueued(t) + other.RX = 90 + queueDeviceWhileWriterBlocked(t, other, otherGeneration) + old.RX, old.TX, old.Hostname, old.Online = 70, 80, "late-ping", false + queueDeviceWhileWriterBlocked(t, old, oldGeneration) + releaseWriter() + result := <-authenticated + if result.err != nil { + t.Fatal(result.err) + } + current := result.device + if current.RX != 70 || current.TX != 80 || current.Hostname != "late-ping" || !current.Online || current.Country != "new-country" || result.generation == oldGeneration { + t.Fatalf("reconnect lost telemetry received during commit: %+v", current) + } + var persisted Device + if err := storage.Get().First(&persisted, current.ID).Error; err != nil { + t.Fatal(err) + } + if persisted.RX != 10 || persisted.TX != 20 { + t.Fatalf("unexpected committed baseline: %+v", persisted) + } + totals, err := GetUserTrafficTotals([]uint{user.ID}) + if err != nil || totals[user.ID].RX != 70 || totals[user.ID].TX != 80 { + t.Fatalf("pending reconnect delta was lost or double counted: %+v, %v", totals, err) + } + current.RX, current.TX = 75, 85 + QueueDeviceState(current, result.generation) + old.RX, old.TX = 999, 999 + QueueDeviceState(old, oldGeneration) + if _, err := FlushDeviceStates(context.Background()); err != nil { + t.Fatal(err) + } + if err := storage.Get().First(&persisted, current.ID).Error; err != nil { + t.Fatal(err) + } + if persisted.RX != 75 || persisted.TX != 85 { + t.Fatalf("new generation counters were overwritten: %+v", persisted) + } + totals, err = GetUserTrafficTotals([]uint{user.ID}) + if err != nil || totals[user.ID].RX != 75 || totals[user.ID].TX != 85 { + t.Fatalf("flushed reconnect delta was double counted: %+v, %v", totals, err) + } +} + +func TestDeviceDeleteDoesNotBlockOtherTelemetryDuringSlowCommit(t *testing.T) { + _, network := newBatchTestNetwork(t) + _, otherNetwork := newBatchTestNetwork(t) + device, generation := authenticateBatchDevice(t, network, "1000000000000031", "10.30.0.31") + other, otherGeneration := authenticateBatchDevice(t, otherNetwork, "1000000000000032", "10.30.0.32") + device.Online, device.TX = false, 40 + QueueDeviceState(device, generation) + releaseWriter := holdDeviceTestWriter(t) + deleted := make(chan error, 1) + go func() { deleted <- device.Delete() }() + waitDeviceTestWriteQueued(t) + other.TX = 123 + queueDeviceWhileWriterBlocked(t, other, otherGeneration) + releaseWriter() + if err := <-deleted; err != nil { + t.Fatal(err) + } + if _, err := FlushDeviceStates(context.Background()); err != nil { + t.Fatal(err) + } + var persisted Device + if err := storage.Get().First(&persisted, other.ID).Error; err != nil { + t.Fatal(err) + } + if persisted.TX != 123 { + t.Fatalf("independent telemetry did not persist: %+v", persisted) + } + persisted = Device{} + if err := storage.Get().Unscoped().First(&persisted, device.ID).Error; err != nil { + t.Fatal(err) + } + if !persisted.DeletedAt.Valid || persisted.TX != 40 { + t.Fatalf("delete did not preserve its captured offline state: %+v", persisted) + } +} + +func TestDeletingDeviceTreesPreservesPendingCountersWithinScope(t *testing.T) { + for _, scope := range []string{"network", "user"} { + t.Run(scope, func(t *testing.T) { + user, network := newBatchTestNetwork(t) + sibling := Net{UserID: user.ID, Name: "sibling", Password: "secret", DHCP: "10.31.0.0/16"} + if err := storage.Write(func(tx *gorm.DB) error { return tx.Create(&sibling).Error }); err != nil { + t.Fatal(err) + } + t.Cleanup(func() { + storage.Write(func(tx *gorm.DB) error { + if err := tx.Unscoped().Where("net_id = ?", sibling.ID).Delete(&Device{}).Error; err != nil { + return err + } + return tx.Unscoped().Delete(&sibling).Error + }) + deviceStates.Lock() + for id, entry := range deviceStates.entries { + if entry.device.NetID == sibling.ID { + removeDeviceStateLocked(id) + } + } + deviceStates.Unlock() + }) + device, generation := authenticateBatchDevice(t, network, "1000000000000041", "10.30.0.41") + other, otherGeneration := authenticateBatchDevice(t, sibling, "1000000000000042", "10.31.0.42") + device.RX, device.TX = 41, 82 + other.RX, other.TX = 99, 198 + QueueDeviceState(device, generation) + QueueDeviceState(other, otherGeneration) + netID := network.ID + if scope == "user" { + netID = 0 + } + if err := WriteDeletingDevices(context.Background(), user.ID, netID, func(tx *gorm.DB) error { + if netID != 0 { + if err := tx.Where("net_id = ?", netID).Delete(&Device{}).Error; err != nil { + return err + } + return tx.Delete(&network).Error + } + if err := tx.Where("net_id IN (SELECT id FROM nets WHERE user_id = ?)", user.ID).Delete(&Device{}).Error; err != nil { + return err + } + if err := tx.Where("user_id = ?", user.ID).Delete(&Net{}).Error; err != nil { + return err + } + return tx.Delete(&user).Error + }); err != nil { + t.Fatal(err) + } + var persisted Device + if err := storage.Get().Unscoped().First(&persisted, device.ID).Error; err != nil { + t.Fatal(err) + } + if !persisted.DeletedAt.Valid || persisted.RX != 41 || persisted.TX != 82 { + t.Fatalf("tree deletion lost pending counters: %+v", persisted) + } + persisted = Device{} + if err := storage.Get().Unscoped().First(&persisted, other.ID).Error; err != nil { + t.Fatal(err) + } + if scope == "network" { + if persisted.DeletedAt.Valid || persisted.RX != 0 || GetDeviceByDevID(other.ID).RX != 99 { + t.Fatalf("network deletion consumed sibling telemetry: %+v", persisted) + } + } else if !persisted.DeletedAt.Valid || persisted.RX != 99 { + t.Fatalf("user deletion did not save all networks: %+v", persisted) + } + device.RX = 999 + QueueDeviceState(device, generation) + if _, err := FlushDeviceStates(context.Background()); err != nil { + t.Fatal(err) + } + persisted = Device{} + if err := storage.Get().Unscoped().First(&persisted, device.ID).Error; err != nil { + t.Fatal(err) + } + if !persisted.DeletedAt.Valid || persisted.RX != 41 { + t.Fatal("old generation changed a deleted tree") + } + }) + } +} + +func TestDeletingDeviceTreeFailureRetainsDirtyStateAndRollsBack(t *testing.T) { + user, network := newBatchTestNetwork(t) + device, generation := authenticateBatchDevice(t, network, "1000000000000051", "10.30.0.51") + device.RX = 51 + QueueDeviceState(device, generation) + injected := errors.New("injected tree deletion failure") + err := WriteDeletingDevices(context.Background(), user.ID, network.ID, func(tx *gorm.DB) error { + if err := tx.Delete(&network).Error; err != nil { + return err + } + return injected + }) + if !errors.Is(err, injected) { + t.Fatalf("tree deletion error = %v", err) + } + var persisted Device + if err := storage.Get().First(&persisted, device.ID).Error; err != nil { + t.Fatal(err) + } + if persisted.RX != 0 || GetDeviceByDevID(device.ID).RX != 51 { + t.Fatal("failed deletion committed counters or dropped dirty state") + } + if _, err := FlushDeviceStates(context.Background()); err != nil { + t.Fatal(err) + } + if err := storage.Get().First(&persisted, device.ID).Error; err != nil { + t.Fatal(err) + } + if persisted.RX != 51 { + t.Fatal("failed deletion could not retry its pending telemetry") + } + if err := WriteDeletingDevices(context.Background(), 0, 0, func(tx *gorm.DB) error { return nil }); err == nil { + t.Fatal("unbounded deletion scope was accepted") + } +} diff --git a/model/integrity.go b/model/integrity.go new file mode 100644 index 0000000..fa30e6c --- /dev/null +++ b/model/integrity.go @@ -0,0 +1,183 @@ +package model + +import ( + "context" + "errors" + "fmt" + "strings" + "time" + + "github.com/lanthora/cacao/storage" + "gorm.io/gorm" +) + +var ErrConflict = errors.New("active record already exists") + +// EnsureIntegrity installs safeguards without deleting or merging ambiguous +// legacy identities. Maintenance reports existing duplicates for operator review. +func EnsureIntegrity() error { + return storage.Write(installIntegrity) +} + +func installIntegrity(tx *gorm.DB) error { + for _, item := range []struct{ table, keys, name string }{ + {"users", "name", "ux_active_users_name"}, + {"nets", "user_id, name", "ux_active_nets_name"}, + {"devices", "net_id, vmac", "ux_active_devices_vmac"}, + {"configs", "key", "ux_active_configs_key"}, + {"routes", "net_id, dev_addr, dev_mask, dst_addr, dst_mask, next_hop, priority", "ux_active_routes_entry"}, + } { + var duplicates int64 + if err := tx.Raw(fmt.Sprintf("SELECT COUNT(*) FROM (SELECT 1 FROM %s WHERE deleted_at IS NULL GROUP BY %s HAVING COUNT(*) > 1)", item.table, item.keys)).Scan(&duplicates).Error; err != nil { + return err + } + if duplicates == 0 { + if err := tx.Exec(fmt.Sprintf("CREATE UNIQUE INDEX IF NOT EXISTS %s ON %s (%s) WHERE deleted_at IS NULL", item.name, item.table, item.keys)).Error; err != nil { + return err + } + } + // The trigger also protects new writes when legacy duplicates prevent + // installing a unique index. Identifiers here are compile-time constants. + var comparisons []string + var changes []string + for _, key := range strings.Split(item.keys, ", ") { + comparisons = append(comparisons, key+" = NEW."+key) + changes = append(changes, "NEW."+key+" IS NOT OLD."+key) + } + condition := strings.Join(comparisons, " AND ") + for _, operation := range []struct{ name, sql string }{{"insert", "INSERT"}, {"update", "UPDATE OF " + item.keys + ", deleted_at"}} { + changed := "" + if operation.name == "update" { + changed = " AND (OLD.deleted_at IS NOT NULL OR " + strings.Join(changes, " OR ") + ")" + } + if err := tx.Exec(fmt.Sprintf("DROP TRIGGER IF EXISTS guard_%s_%s", item.table, operation.name)).Error; err != nil { + return err + } + query := fmt.Sprintf(`CREATE TRIGGER IF NOT EXISTS guard_%s_%s BEFORE %s ON %s +WHEN NEW.deleted_at IS NULL%s AND EXISTS (SELECT 1 FROM %s WHERE deleted_at IS NULL AND id <> NEW.id AND %s) +BEGIN SELECT RAISE(ABORT, 'duplicate active record'); END`, item.table, operation.name, operation.sql, item.table, changed, item.table, condition) + if err := tx.Exec(query).Error; err != nil { + return err + } + } + } + for _, child := range []struct{ table, parent, fk string }{{"nets", "users", "user_id"}, {"devices", "nets", "net_id"}, {"routes", "nets", "net_id"}} { + parentQuery := fmt.Sprintf("SELECT 1 FROM %s WHERE id = NEW.%s AND deleted_at IS NULL", child.parent, child.fk) + if child.parent == "nets" { + parentQuery = "SELECT 1 FROM nets JOIN users ON users.id = nets.user_id AND users.deleted_at IS NULL WHERE nets.id = NEW.net_id AND nets.deleted_at IS NULL" + } + for _, operation := range []struct{ name, sql string }{{"insert", "INSERT"}, {"update", "UPDATE OF " + child.fk + ", deleted_at"}} { + if err := tx.Exec(fmt.Sprintf("DROP TRIGGER IF EXISTS guard_%s_parent_%s", child.table, operation.name)).Error; err != nil { + return err + } + query := fmt.Sprintf(`CREATE TRIGGER IF NOT EXISTS guard_%s_parent_%s BEFORE %s ON %s +WHEN NEW.deleted_at IS NULL AND NOT EXISTS (%s) +BEGIN SELECT RAISE(ABORT, 'inactive or missing parent'); END`, child.table, operation.name, operation.sql, child.table, parentQuery) + if err := tx.Exec(query).Error; err != nil { + return err + } + } + query := fmt.Sprintf(`CREATE TRIGGER IF NOT EXISTS cascade_%s_soft_delete AFTER UPDATE OF deleted_at ON %s +WHEN NEW.deleted_at IS NOT NULL +BEGIN UPDATE %s SET deleted_at = NEW.deleted_at WHERE %s = NEW.id AND deleted_at IS NULL; END`, child.table, child.parent, child.table, child.fk) + if err := tx.Exec(query).Error; err != nil { + return err + } + // Preserve historical children as tombstones even if an operator + // physically deletes a parent outside the application. + query = fmt.Sprintf(`CREATE TRIGGER IF NOT EXISTS cascade_%s_delete AFTER DELETE ON %s +BEGIN UPDATE %s SET deleted_at = CURRENT_TIMESTAMP WHERE %s = OLD.id AND deleted_at IS NULL; END`, child.table, child.parent, child.table, child.fk) + if err := tx.Exec(query).Error; err != nil { + return err + } + } + var duplicateIPs int64 + if err := tx.Raw("SELECT COUNT(*) FROM (SELECT 1 FROM devices WHERE deleted_at IS NULL AND ip <> '' GROUP BY net_id, ip HAVING COUNT(*) > 1)").Scan(&duplicateIPs).Error; err != nil { + return err + } + if duplicateIPs == 0 { + if err := tx.Exec("CREATE UNIQUE INDEX IF NOT EXISTS ux_active_devices_ip ON devices(net_id, ip) WHERE deleted_at IS NULL AND ip <> ''").Error; err != nil { + return err + } + } + for _, operation := range []struct{ name, sql string }{{"insert", "INSERT"}, {"update", "UPDATE OF net_id, ip, deleted_at"}} { + changed := "" + if operation.name == "update" { + changed = " AND (OLD.deleted_at IS NOT NULL OR NEW.net_id IS NOT OLD.net_id OR NEW.ip IS NOT OLD.ip)" + } + if err := tx.Exec("DROP TRIGGER IF EXISTS guard_devices_ip_" + operation.name).Error; err != nil { + return err + } + if err := tx.Exec(fmt.Sprintf(`CREATE TRIGGER guard_devices_ip_%s BEFORE %s ON devices +WHEN NEW.deleted_at IS NULL AND NEW.ip <> ''%s AND EXISTS (SELECT 1 FROM devices WHERE id <> NEW.id AND deleted_at IS NULL AND net_id = NEW.net_id AND ip = NEW.ip) +BEGIN SELECT RAISE(ABORT, 'duplicate active device IP'); END`, operation.name, operation.sql, changed)).Error; err != nil { + return err + } + } + return tx.Exec("CREATE INDEX IF NOT EXISTS idx_devices_net_online ON devices (net_id, online, deleted_at)").Error +} + +// DeleteUserTree is atomic and safe to repeat. Network connections are revoked +// by the caller only after this transaction has committed. +func DeleteUserTree(userID uint) ([]uint, error) { + if userID == 0 { + return nil, gorm.ErrRecordNotFound + } + var netIDs []uint + err := WriteDeletingDevices(context.Background(), userID, 0, func(tx *gorm.DB) error { + if err := tx.Unscoped().Model(&Net{}).Where("user_id = ?", userID).Pluck("id", &netIDs).Error; err != nil { + return err + } + if len(netIDs) > 0 { + // Subqueries avoid SQLite's parameter limit for accounts with many nets. + nets := tx.Unscoped().Model(&Net{}).Select("id").Where("user_id = ?", userID) + if err := tx.Where("net_id IN (?)", nets).Delete(&Device{}).Error; err != nil { + return err + } + if err := tx.Where("net_id IN (?)", nets).Delete(&Route{}).Error; err != nil { + return err + } + if err := tx.Where("user_id = ?", userID).Delete(&Net{}).Error; err != nil { + return err + } + } + return tx.Where("id = ?", userID).Delete(&User{}).Error + }) + return netIDs, err +} + +func DeleteNetworkTree(netID, ownerID uint) error { + if netID == 0 || ownerID == 0 { + return gorm.ErrRecordNotFound + } + return WriteDeletingDevices(context.Background(), ownerID, netID, func(tx *gorm.DB) error { + var network Net + if err := tx.Unscoped().Where("id = ? AND user_id = ?", netID, ownerID).Take(&network).Error; err != nil { + return err + } + if err := tx.Where("net_id = ?", netID).Delete(&Device{}).Error; err != nil { + return err + } + if err := tx.Where("net_id = ?", netID).Delete(&Route{}).Error; err != nil { + return err + } + return tx.Where("id = ?", netID).Delete(&Net{}).Error + }) +} + +// SetConfigTx is usable inside a larger business transaction. Unchanged +// settings perform no UPDATE, so repeated requests do not generate WAL traffic. +func SetConfigTx(tx *gorm.DB, key, value string) error { + var current Config + err := tx.Where("key = ?", key).Order("id").Take(¤t).Error + if errors.Is(err, gorm.ErrRecordNotFound) { + return tx.Create(&Config{Key: key, Value: value}).Error + } + if err != nil { + return err + } + if current.Value == value { + return nil + } + return tx.Model(&Config{}).Where("id = ?", current.ID).Updates(map[string]interface{}{"value": value, "updated_at": time.Now()}).Error +} diff --git a/model/integrity_test.go b/model/integrity_test.go new file mode 100644 index 0000000..92ba982 --- /dev/null +++ b/model/integrity_test.go @@ -0,0 +1,135 @@ +package model + +import ( + "testing" + + "gorm.io/gorm" +) + +func TestIntegrityGuardsAndCascadePreserveTombstones(t *testing.T) { + db := maintenanceTestDB(t) + if err := db.Transaction(installIntegrity); err != nil { + t.Fatal(err) + } + // Re-running the migration must preserve the data and refresh our guards. + if err := db.Transaction(installIntegrity); err != nil { + t.Fatal(err) + } + u := User{Name: "owner", Role: "normal"} + if err := db.Create(&u).Error; err != nil { + t.Fatal(err) + } + n := Net{UserID: u.ID, Name: "network"} + if err := db.Create(&n).Error; err != nil { + t.Fatal(err) + } + d := Device{NetID: n.ID, VMac: "0123456789abcdef", IP: "192.168.1.2", RX: 123, TX: 456} + if err := db.Create(&d).Error; err != nil { + t.Fatal(err) + } + r := Route{NetID: n.ID, DstAddr: "10.0.0.0", DstMask: "255.0.0.0"} + if err := db.Create(&r).Error; err != nil { + t.Fatal(err) + } + for _, duplicate := range []interface{}{ + &User{Name: u.Name}, &Net{UserID: u.ID, Name: n.Name}, + &Device{NetID: n.ID, VMac: d.VMac, IP: "192.168.1.3"}, + &Device{NetID: n.ID, VMac: "fedcba9876543210", IP: d.IP}, + &Route{NetID: n.ID, DstAddr: r.DstAddr, DstMask: r.DstMask}, + } { + if err := db.Create(duplicate).Error; err == nil { + t.Fatalf("duplicate accepted: %T", duplicate) + } + } + for _, orphan := range []interface{}{&Net{UserID: u.ID + 100, Name: "orphan"}, &Device{NetID: n.ID + 100}, &Route{NetID: n.ID + 100}} { + if err := db.Create(orphan).Error; err == nil { + t.Fatalf("orphan accepted: %T", orphan) + } + } + if err := db.Delete(&u).Error; err != nil { + t.Fatal(err) + } + for _, entity := range []interface{}{&Net{}, &Device{}, &Route{}} { + var count int64 + if err := db.Model(entity).Count(&count).Error; err != nil || count != 0 { + t.Fatalf("cascade left active %T: %d %v", entity, count, err) + } + } + var historical Device + if err := db.Unscoped().First(&historical, d.ID).Error; err != nil || historical.RX != 123 || historical.TX != 456 { + t.Fatalf("historical counters lost: %+v %v", historical, err) + } + if err := db.Model(&Net{}).Unscoped().Where("id = ?", n.ID).Update("deleted_at", nil).Error; err == nil { + t.Fatal("restored network under deleted owner") + } + if err := db.Create(&User{Name: u.Name}).Error; err != nil { + t.Fatalf("soft-deleted identity cannot be reused: %v", err) + } +} + +func TestLegacyDuplicatesKeepOrdinaryUpdatesButRejectNewConflicts(t *testing.T) { + db := maintenanceTestDB(t) + users := []User{{Name: "legacy"}, {Name: "legacy"}} + if err := db.Create(&users).Error; err != nil { + t.Fatal(err) + } + nets := []Net{{UserID: users[0].ID, Name: "legacy"}, {UserID: users[0].ID, Name: "legacy"}} + if err := db.Create(&nets).Error; err != nil { + t.Fatal(err) + } + if err := db.Transaction(installIntegrity); err != nil { + t.Fatalf("legacy migration blocked startup: %v", err) + } + if err := db.Model(&users[0]).Updates(map[string]interface{}{"name": "legacy", "password": "updated"}).Error; err != nil { + t.Fatalf("unchanged legacy identity blocked password update: %v", err) + } + if err := db.Model(&nets[0]).Updates(map[string]interface{}{"name": "legacy", "password": "updated"}).Error; err != nil { + t.Fatalf("unchanged network name blocked update: %v", err) + } + if err := db.Create(&User{Name: "legacy"}).Error; err == nil { + t.Fatal("new duplicate escaped fallback trigger") + } + if err := db.Create(&Net{UserID: users[0].ID, Name: "legacy"}).Error; err == nil { + t.Fatal("new network duplicate escaped fallback trigger") + } + var count int64 + if err := db.Model(&User{}).Count(&count).Error; err != nil || count != 2 { + t.Fatal("migration removed ambiguous accounts") + } +} + +func TestLegacyOrphanAncestorCannotGainChildren(t *testing.T) { + db := maintenanceTestDB(t) + n := Net{UserID: 987654, Name: "orphan"} + if err := db.Create(&n).Error; err != nil { + t.Fatal(err) + } + if err := db.Transaction(installIntegrity); err != nil { + t.Fatal(err) + } + for _, child := range []interface{}{&Device{NetID: n.ID}, &Route{NetID: n.ID}} { + if err := db.Create(child).Error; err == nil { + t.Fatalf("invalid ancestor accepted for %T", child) + } + } + // Cleanup must still be able to tombstone the legacy orphan. + if err := db.Delete(&n).Error; err != nil { + t.Fatal(err) + } +} + +func TestConfigRepeatedValueDoesNotWriteAgain(t *testing.T) { + db := maintenanceTestDB(t) + if err := db.Transaction(func(tx *gorm.DB) error { return SetConfigTx(tx, "policy", "on") }); err != nil { + t.Fatal(err) + } + if err := db.Exec(`CREATE TRIGGER forbid_config_update BEFORE UPDATE ON configs BEGIN SELECT RAISE(ABORT, 'unexpected update'); END`).Error; err != nil { + t.Fatal(err) + } + if err := db.Transaction(func(tx *gorm.DB) error { return SetConfigTx(tx, "policy", "on") }); err != nil { + t.Fatalf("unchanged value caused a write: %v", err) + } + if err := db.Transaction(func(tx *gorm.DB) error { return SetConfigTx(tx, "policy", "off") }); err == nil { + t.Fatal("test trigger was not effective") + } +} diff --git a/model/maintenance.go b/model/maintenance.go new file mode 100644 index 0000000..c673e99 --- /dev/null +++ b/model/maintenance.go @@ -0,0 +1,193 @@ +package model + +import ( + "context" + "strconv" + "time" + + "github.com/lanthora/cacao/storage" + "gorm.io/gorm" +) + +type MaintenanceOptions struct { + Now time.Time + BatchSize int + CleanInactiveUsers bool + // ForceInactiveUsers is for an explicit administrator request. Automatic + // runs always honor autoCleanUser; both paths honor the configured threshold. + ForceInactiveUsers bool +} + +type MaintenanceResult struct { + RowsAffected int64 + DeletedNetIDs []uint + Details map[string]int64 +} + +// CleanMaintenance performs one bounded transaction. Children are removed before +// parents; a large subtree is consumed across runs without creating new orphans. +// All deletion is soft deletion: historical traffic remains available. +// Callers flush buffered device activity before calling and remove DeletedNetIDs +// from the in-memory network registry only after this transaction commits. +func CleanMaintenance(ctx context.Context, options MaintenanceOptions) (MaintenanceResult, error) { + return cleanMaintenance(ctx, options, func(fn func(*gorm.DB) error) error { return storage.WriteContext(ctx, fn) }) +} + +func cleanMaintenance(ctx context.Context, options MaintenanceOptions, write func(func(*gorm.DB) error) error) (MaintenanceResult, error) { + result := MaintenanceResult{Details: make(map[string]int64)} + if options.Now.IsZero() { + options.Now = time.Now() + } + if options.BatchSize <= 0 { + options.BatchSize = 250 + } + if options.BatchSize > 1000 { + options.BatchSize = 1000 + } + err := write(func(tx *gorm.DB) error { + tx = tx.WithContext(ctx) + var config []Config + if err := tx.Where("key IN ?", []string{"autoCleanUser", "inactiveUserThreshold"}).Order("id DESC").Find(&config).Error; err != nil { + return err + } + settings := make(map[string]string) + for _, item := range config { + if _, found := settings[item.Key]; !found { + settings[item.Key] = item.Value + } + } + var inactiveUsers []uint + if options.CleanInactiveUsers && (options.ForceInactiveUsers || settings["autoCleanUser"] == "true") { + threshold, err := strconv.Atoi(settings["inactiveUserThreshold"]) + if err != nil || threshold <= 0 { + threshold = 7 + } + // An excessively large legacy threshold means no account is old enough. + if threshold <= 3650000 { + if err := tx.Model(&User{}).Where("role = ? AND updated_at < ?", "normal", options.Now.AddDate(0, 0, -threshold)). + Where(`NOT EXISTS (SELECT 1 FROM nets JOIN devices ON devices.net_id = nets.id + WHERE nets.user_id = users.id AND nets.deleted_at IS NULL + AND devices.deleted_at IS NULL AND devices.online = ?)`, true). + Order("id").Limit(options.BatchSize).Pluck("id", &inactiveUsers).Error; err != nil { + return err + } + } + } + // These predicates also repair children of hard-deleted legacy parents. + invalidNet := `NOT EXISTS (SELECT 1 FROM nets JOIN users ON users.id = nets.user_id + WHERE nets.id = devices.net_id AND nets.deleted_at IS NULL AND users.deleted_at IS NULL)` + devices := tx.Model(&Device{}).Where(invalidNet). + Or(`online = ? AND EXISTS (SELECT 1 FROM nets JOIN users ON users.id = nets.user_id + WHERE nets.id = devices.net_id AND nets.deleted_at IS NULL AND users.deleted_at IS NULL + AND nets.lease > 0 AND julianday(devices.updated_at) + nets.lease < julianday(?))`, false, options.Now) + if len(inactiveUsers) > 0 { + devices = devices.Or("net_id IN (SELECT id FROM nets WHERE user_id IN ?)", inactiveUsers) + } + if err := maintenanceDeleteBatch(tx, devices, &Device{}, options.BatchSize, "devices", &result); err != nil { + return err + } + + routes := tx.Model(&Route{}).Where(`NOT EXISTS (SELECT 1 FROM nets JOIN users ON users.id = nets.user_id + WHERE nets.id = routes.net_id AND nets.deleted_at IS NULL AND users.deleted_at IS NULL)`) + if len(inactiveUsers) > 0 { + routes = routes.Or("net_id IN (SELECT id FROM nets WHERE user_id IN ?)", inactiveUsers) + } + if err := maintenanceDeleteBatch(tx, routes, &Route{}, options.BatchSize, "routes", &result); err != nil { + return err + } + + nets := tx.Model(&Net{}).Where("NOT EXISTS (SELECT 1 FROM users WHERE users.id = nets.user_id AND users.deleted_at IS NULL)") + if len(inactiveUsers) > 0 { + nets = nets.Or("user_id IN ?", inactiveUsers) + } + // Group the parent predicate before applying child-existence guards. + var netIDs []uint + if err := tx.Model(&Net{}).Where(nets). + Where("NOT EXISTS (SELECT 1 FROM devices WHERE devices.net_id = nets.id AND devices.deleted_at IS NULL)"). + Where("NOT EXISTS (SELECT 1 FROM routes WHERE routes.net_id = nets.id AND routes.deleted_at IS NULL)"). + Order("id").Limit(options.BatchSize).Pluck("id", &netIDs).Error; err != nil { + return err + } + if len(netIDs) > 0 { + deleted := tx.Where("id IN ?", netIDs).Delete(&Net{}) + if deleted.Error != nil { + return deleted.Error + } + result.RowsAffected += deleted.RowsAffected + result.Details["nets"] = deleted.RowsAffected + result.DeletedNetIDs = netIDs + } + if len(inactiveUsers) > 0 { + users := tx.Model(&User{}).Where("id IN ?", inactiveUsers). + Where("NOT EXISTS (SELECT 1 FROM nets WHERE nets.user_id = users.id AND nets.deleted_at IS NULL)") + if err := maintenanceDeleteBatch(tx, users, &User{}, options.BatchSize, "users", &result); err != nil { + return err + } + } + var sessionIDs []uint + if err := tx.Model(&User{}).Where("token <> ? AND token_expires_at IS NOT NULL AND token_expires_at <= ?", "", options.Now). + Order("id").Limit(options.BatchSize).Pluck("id", &sessionIDs).Error; err != nil { + return err + } + if len(sessionIDs) > 0 { + cleared := tx.Model(&User{}).Where("id IN ?", sessionIDs). + UpdateColumns(map[string]interface{}{"token": "", "token_expires_at": nil}) + if cleared.Error != nil { + return cleared.Error + } + result.RowsAffected += cleared.RowsAffected + result.Details["expiredSessions"] = cleared.RowsAffected + } + return nil + }) + if err != nil { + return MaintenanceResult{Details: make(map[string]int64)}, err + } + return result, nil +} + +func maintenanceDeleteBatch(tx, candidates *gorm.DB, entity interface{}, limit int, name string, result *MaintenanceResult) error { + var ids []uint + if err := candidates.Order("id").Limit(limit).Pluck("id", &ids).Error; err != nil { + return err + } + if len(ids) == 0 { + return nil + } + deleted := tx.Where("id IN ?", ids).Delete(entity) + if deleted.Error != nil { + return deleted.Error + } + result.RowsAffected += deleted.RowsAffected + result.Details[name] += deleted.RowsAffected + return nil +} + +// AuditIntegrity only reports ambiguous legacy identities. It never guesses +// which account/network/device/config should be deleted to resolve a conflict. +func AuditIntegrity(ctx context.Context) (map[string]int64, error) { + return auditIntegrity(storage.Get().WithContext(ctx)) +} + +func auditIntegrity(db *gorm.DB) (map[string]int64, error) { + checks := map[string]string{ + "duplicateUsers": "SELECT COUNT(*) FROM (SELECT name FROM users WHERE deleted_at IS NULL GROUP BY name HAVING COUNT(*) > 1)", + "duplicateNets": "SELECT COUNT(*) FROM (SELECT user_id, name FROM nets WHERE deleted_at IS NULL GROUP BY user_id, name HAVING COUNT(*) > 1)", + "duplicateDevices": "SELECT COUNT(*) FROM (SELECT net_id, vmac FROM devices WHERE deleted_at IS NULL GROUP BY net_id, vmac HAVING COUNT(*) > 1)", + "duplicateDeviceIPs": "SELECT COUNT(*) FROM (SELECT net_id, ip FROM devices WHERE deleted_at IS NULL AND ip <> '' GROUP BY net_id, ip HAVING COUNT(*) > 1)", + "duplicateRoutes": "SELECT COUNT(*) FROM (SELECT net_id, dev_addr, dev_mask, dst_addr, dst_mask, next_hop, priority FROM routes WHERE deleted_at IS NULL GROUP BY net_id, dev_addr, dev_mask, dst_addr, dst_mask, next_hop, priority HAVING COUNT(*) > 1)", + "duplicateConfigs": "SELECT COUNT(*) FROM (SELECT key FROM configs WHERE deleted_at IS NULL GROUP BY key HAVING COUNT(*) > 1)", + "orphanNets": "SELECT COUNT(*) FROM nets WHERE deleted_at IS NULL AND NOT EXISTS (SELECT 1 FROM users WHERE users.id = nets.user_id AND users.deleted_at IS NULL)", + "orphanDevices": "SELECT COUNT(*) FROM devices WHERE deleted_at IS NULL AND NOT EXISTS (SELECT 1 FROM nets JOIN users ON users.id = nets.user_id WHERE nets.id = devices.net_id AND nets.deleted_at IS NULL AND users.deleted_at IS NULL)", + "orphanRoutes": "SELECT COUNT(*) FROM routes WHERE deleted_at IS NULL AND NOT EXISTS (SELECT 1 FROM nets JOIN users ON users.id = nets.user_id WHERE nets.id = routes.net_id AND nets.deleted_at IS NULL AND users.deleted_at IS NULL)", + } + result := make(map[string]int64, len(checks)) + for name, query := range checks { + var count int64 + if err := db.Raw(query).Scan(&count).Error; err != nil { + return nil, err + } + result[name] = count + } + return result, nil +} diff --git a/model/maintenance_test.go b/model/maintenance_test.go new file mode 100644 index 0000000..f154ded --- /dev/null +++ b/model/maintenance_test.go @@ -0,0 +1,230 @@ +package model + +import ( + "context" + "path/filepath" + "testing" + "time" + + "github.com/glebarez/sqlite" + "gorm.io/gorm" +) + +func maintenanceTestDB(t *testing.T) *gorm.DB { + t.Helper() + db, err := gorm.Open(sqlite.Open(filepath.Join(t.TempDir(), "maintenance.db")), &gorm.Config{}) + if err != nil { + t.Fatal(err) + } + if err := db.AutoMigrate(&Config{}, &User{}, &Net{}, &Device{}, &Route{}); err != nil { + t.Fatal(err) + } + sqlDB, err := db.DB() + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { _ = sqlDB.Close() }) + return db +} + +func TestMaintenanceHonorsPoliciesAndPreservesTraffic(t *testing.T) { + db := maintenanceTestDB(t) + now := time.Now().UTC() + old := now.AddDate(0, 0, -30) + users := []User{{Name: "inactive", Role: "normal", Model: gorm.Model{UpdatedAt: old}}, {Name: "online", Role: "normal", Model: gorm.Model{UpdatedAt: old}}, {Name: "admin", Role: "admin", Model: gorm.Model{UpdatedAt: old}}} + if err := db.Create(&users).Error; err != nil { + t.Fatal(err) + } + nets := []Net{{UserID: users[0].ID, Name: "expired", Lease: 7}, {UserID: users[1].ID, Name: "online", Lease: 7}, {UserID: users[2].ID, Name: "no-lease"}} + if err := db.Create(&nets).Error; err != nil { + t.Fatal(err) + } + devices := []Device{{NetID: nets[0].ID, VMac: "offline", RX: 123, TX: 456, Model: gorm.Model{UpdatedAt: old}}, {NetID: nets[1].ID, VMac: "online", Online: true, Model: gorm.Model{UpdatedAt: old}}, {NetID: nets[2].ID, VMac: "no-lease", Model: gorm.Model{UpdatedAt: old}}} + if err := db.Create(&devices).Error; err != nil { + t.Fatal(err) + } + route := Route{NetID: nets[0].ID} + if err := db.Create(&route).Error; err != nil { + t.Fatal(err) + } + run := func(options MaintenanceOptions) MaintenanceResult { + t.Helper() + options.Now = now + result, err := cleanMaintenance(context.Background(), options, func(fn func(*gorm.DB) error) error { return db.Transaction(fn) }) + if err != nil { + t.Fatal(err) + } + return result + } + result := run(MaintenanceOptions{CleanInactiveUsers: true}) + if result.Details["devices"] != 1 || result.Details["users"] != 0 { + t.Fatalf("automatic policy not honored: %+v", result) + } + var historical Device + if err := db.Unscoped().First(&historical, devices[0].ID).Error; err != nil || historical.RX != 123 || historical.TX != 456 || !historical.DeletedAt.Valid { + t.Fatalf("lost historical counters: %+v, %v", historical, err) + } + result = run(MaintenanceOptions{CleanInactiveUsers: true, ForceInactiveUsers: true}) + if result.Details["users"] != 1 || result.Details["nets"] != 1 || result.Details["routes"] != 1 { + t.Fatalf("inactive cascade failed: %+v", result) + } + var remaining []User + if err := db.Find(&remaining).Error; err != nil || len(remaining) != 2 { + t.Fatalf("online user/admin removed: %+v %v", remaining, err) + } + var activeDevices int64 + db.Model(&Device{}).Count(&activeDevices) + if activeDevices != 2 { + t.Fatalf("online or unlimited lease device removed: %d", activeDevices) + } + if result := run(MaintenanceOptions{CleanInactiveUsers: true, ForceInactiveUsers: true}); result.RowsAffected != 0 { + t.Fatalf("cleanup is not idempotent: %+v", result) + } +} + +func TestMaintenanceBoundsSubtreesAndRepairsOrphans(t *testing.T) { + db := maintenanceTestDB(t) + user := User{Name: "old", Role: "normal", Model: gorm.Model{UpdatedAt: time.Now().AddDate(0, 0, -30)}} + if err := db.Create(&user).Error; err != nil { + t.Fatal(err) + } + network := Net{UserID: user.ID} + if err := db.Create(&network).Error; err != nil { + t.Fatal(err) + } + for i := 0; i < 3; i++ { + if err := db.Create(&Device{NetID: network.ID, RX: 10}).Error; err != nil { + t.Fatal(err) + } + } + for i := 0; i < 3; i++ { + result, err := cleanMaintenance(context.Background(), MaintenanceOptions{BatchSize: 1, CleanInactiveUsers: true, ForceInactiveUsers: true}, func(fn func(*gorm.DB) error) error { return db.Transaction(fn) }) + if err != nil { + t.Fatal(err) + } + if result.Details["devices"] != 1 { + t.Fatalf("batch limit ignored: %+v", result) + } + var orphans int64 + db.Raw("SELECT COUNT(*) FROM devices LEFT JOIN nets ON nets.id = devices.net_id WHERE devices.deleted_at IS NULL AND (nets.id IS NULL OR nets.deleted_at IS NOT NULL)").Scan(&orphans) + if orphans != 0 { + t.Fatal("cleanup introduced orphans") + } + if i < 2 && result.Details["users"] != 0 { + t.Fatal("parent deleted before bounded children cleanup") + } + } + if err := db.Create(&Device{NetID: 99999, Online: true}).Error; err != nil { + t.Fatal(err) + } + if err := db.Create(&Route{NetID: 99999}).Error; err != nil { + t.Fatal(err) + } + result, err := cleanMaintenance(context.Background(), MaintenanceOptions{BatchSize: 1}, func(fn func(*gorm.DB) error) error { return db.Transaction(fn) }) + if err != nil || result.Details["devices"] != 1 || result.Details["routes"] != 1 { + t.Fatalf("orphan repair failed: %+v %v", result, err) + } +} + +func TestMaintenanceRollsBackOnCancellation(t *testing.T) { + db := maintenanceTestDB(t) + if err := db.Create(&Device{NetID: 99999}).Error; err != nil { + t.Fatal(err) + } + ctx, cancel := context.WithCancel(context.Background()) + cancel() + result, err := cleanMaintenance(ctx, MaintenanceOptions{}, func(fn func(*gorm.DB) error) error { return db.Transaction(fn) }) + if err == nil || result.RowsAffected != 0 || len(result.DeletedNetIDs) != 0 { + t.Fatalf("canceled transaction reported success: %+v %v", result, err) + } + var count int64 + db.Model(&Device{}).Count(&count) + if count != 1 { + t.Fatal("canceled cleanup deleted data") + } +} + +func TestMaintenanceRespectsThresholdAndClearsOnlyExpiredSessions(t *testing.T) { + db := maintenanceTestDB(t) + now := time.Now().UTC() + old := now.AddDate(0, 0, -30) + expired, future := now.Add(-time.Hour), now.Add(time.Hour) + users := []User{ + {Name: "old-normal", Role: "normal", Model: gorm.Model{UpdatedAt: old}}, + {Name: "expired-admin", Role: "admin", Token: "expired", TokenExpiresAt: &expired, Model: gorm.Model{UpdatedAt: old}}, + {Name: "live-admin", Role: "admin", Token: "live", TokenExpiresAt: &future}, + } + if err := db.Create(&users).Error; err != nil { + t.Fatal(err) + } + configs := []Config{{Key: "autoCleanUser", Value: "true"}, {Key: "inactiveUserThreshold", Value: "60"}} + if err := db.Create(&configs).Error; err != nil { + t.Fatal(err) + } + options := MaintenanceOptions{Now: now, CleanInactiveUsers: true} + write := func(fn func(*gorm.DB) error) error { return db.Transaction(fn) } + result, err := cleanMaintenance(context.Background(), options, write) + if err != nil || result.Details["users"] != 0 || result.Details["expiredSessions"] != 1 { + t.Fatalf("threshold/session policy failed: %+v %v", result, err) + } + var stale, live User + if err := db.First(&stale, users[1].ID).Error; err != nil { + t.Fatal(err) + } + if stale.Token != "" || stale.TokenExpiresAt != nil || !stale.UpdatedAt.Equal(old) { + t.Fatalf("expired token not cleared without changing activity: %+v", stale) + } + if err := db.First(&live, users[2].ID).Error; err != nil || live.Token != "live" { + t.Fatalf("live token changed: %+v %v", live, err) + } + if err := db.Model(&Config{}).Where("key = ?", "inactiveUserThreshold").Update("value", "7").Error; err != nil { + t.Fatal(err) + } + result, err = cleanMaintenance(context.Background(), options, write) + if err != nil || result.Details["users"] != 1 { + t.Fatalf("enabled auto-clean did not honor changed threshold: %+v %v", result, err) + } +} + +func TestIntegrityAuditReportsDeviceIPAndRouteConflictsWithoutDeleting(t *testing.T) { + db := maintenanceTestDB(t) + devices := []Device{ + {NetID: 1, VMac: "a", IP: "192.0.2.1"}, {NetID: 1, VMac: "b", IP: "192.0.2.1"}, + {NetID: 1, VMac: "c"}, {NetID: 1, VMac: "d"}, + {NetID: 1, VMac: "e", IP: "192.0.2.2"}, {NetID: 1, VMac: "f", IP: "192.0.2.2"}, + {NetID: 2, VMac: "g", IP: "192.0.2.1"}, + } + if err := db.Create(&devices).Error; err != nil { + t.Fatal(err) + } + if err := db.Delete(&devices[5]).Error; err != nil { + t.Fatal(err) + } + routes := []Route{ + {NetID: 1, DevAddr: "a", Priority: 1}, {NetID: 1, DevAddr: "a", Priority: 1}, + {NetID: 1, DevAddr: "a", Priority: 2}, {NetID: 1, DevAddr: "a", Priority: 2}, + {NetID: 2, DevAddr: "a", Priority: 1}, + } + if err := db.Create(&routes).Error; err != nil { + t.Fatal(err) + } + if err := db.Delete(&routes[3]).Error; err != nil { + t.Fatal(err) + } + result, err := auditIntegrity(db) + if err != nil { + t.Fatal(err) + } + if result["duplicateDeviceIPs"] != 1 || result["duplicateRoutes"] != 1 { + t.Fatalf("incorrect conflict group counts: %+v", result) + } + var remaining int64 + db.Model(&Device{}).Count(&remaining) + if remaining != 6 { + t.Fatal("audit changed device records") + } + db.Model(&Route{}).Count(&remaining) + if remaining != 4 { + t.Fatal("audit changed route records") + } +} diff --git a/model/net.go b/model/net.go index 6d743d6..394cad1 100644 --- a/model/net.go +++ b/model/net.go @@ -1,6 +1,7 @@ package model import ( + "errors" "github.com/lanthora/cacao/logger" "github.com/lanthora/cacao/storage" "gorm.io/gorm" @@ -24,31 +25,64 @@ type Net struct { Lease uint } -func (n *Net) Create() { - db := storage.Get() - db.Create(n) +func (n *Net) Create() error { + return storage.Write(func(tx *gorm.DB) error { + var existing Net + err := tx.Where("user_id = ? AND name = ?", n.UserID, n.Name).Take(&existing).Error + if err == nil { + if existing.Password != n.Password || existing.DHCP != n.DHCP || existing.Broadcast != n.Broadcast || existing.Lease != n.Lease { + return ErrConflict + } + *n = existing + return nil + } + if !errors.Is(err, gorm.ErrRecordNotFound) { + return err + } + var user User + if err := tx.Where("id = ?", n.UserID).Take(&user).Error; err != nil { + return err + } + return tx.Create(n).Error + }) } -func (n *Net) Update() { - db := storage.Get() - db.Model(n).Select("*").Updates(n) +func (n *Net) Update() error { + return storage.Write(func(tx *gorm.DB) error { + var current Net + if err := tx.Where("id = ? AND user_id = ?", n.ID, n.UserID).Take(¤t).Error; err != nil { + return err + } + var count int64 + if current.Name != n.Name { + if err := tx.Model(&Net{}).Where("user_id = ? AND name = ? AND id <> ?", n.UserID, n.Name, n.ID).Count(&count).Error; err != nil { + return err + } + if count != 0 { + return ErrConflict + } + } + if current.Name == n.Name && current.Password == n.Password && current.DHCP == n.DHCP && current.Broadcast == n.Broadcast && current.Lease == n.Lease { + return nil + } + return tx.Model(&Net{}).Where("id = ?", n.ID).Select("name", "password", "dhcp", "broadcast", "lease").Updates(n).Error + }) } -func (n *Net) Delete() { - db := storage.Get() - db.Delete(n) +func (n *Net) Delete() error { + return DeleteNetworkTree(n.ID, n.UserID) } 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,11 +98,11 @@ 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 } -func DeleteNetByNetID(netid uint) { - db := storage.Get() - db.Delete(&Net{Model: gorm.Model{ID: netid}}) +func DeleteNetByNetID(netid uint) error { + network := GetNetByNetID(netid) + return DeleteNetworkTree(netid, network.UserID) } diff --git a/model/persistence_test.go b/model/persistence_test.go new file mode 100644 index 0000000..a4b1719 --- /dev/null +++ b/model/persistence_test.go @@ -0,0 +1,111 @@ +package model + +import ( + "fmt" + "strings" + "sync" + "testing" + + "github.com/google/uuid" + "github.com/lanthora/cacao/storage" +) + +func persistenceFixture(t *testing.T) (User, Net) { + t.Helper() + db := storage.Get() + u := User{Name: "tx" + strings.ReplaceAll(uuid.NewString(), "-", "")[:18], Role: "normal"} + if err := db.Create(&u).Error; err != nil { + t.Fatal(err) + } + n := Net{UserID: u.ID, Name: "network", DHCP: "192.168.202.0/24"} + if err := n.Create(); err != nil { + t.Fatal(err) + } + t.Cleanup(func() { + db.Unscoped().Where("net_id IN (SELECT id FROM nets WHERE user_id = ?)", u.ID).Delete(&Device{}) + db.Unscoped().Where("net_id IN (SELECT id FROM nets WHERE user_id = ?)", u.ID).Delete(&Route{}) + db.Unscoped().Where("user_id = ?", u.ID).Delete(&Net{}) + db.Unscoped().Delete(&u) + }) + return u, n +} + +func TestTreeDeletionRollbackAndRetry(t *testing.T) { + u, n := persistenceFixture(t) + db := storage.Get() + d := Device{NetID: n.ID, VMac: "0123456789abcdef", RX: 7, TX: 9} + r := Route{NetID: n.ID} + if err := db.Create(&d).Error; err != nil { + t.Fatal(err) + } + if err := r.Create(); err != nil { + t.Fatal(err) + } + trigger := "reject_route_delete_test" + if err := db.Exec(fmt.Sprintf(`CREATE TRIGGER %s BEFORE UPDATE OF deleted_at ON routes WHEN OLD.net_id = %d BEGIN SELECT RAISE(ABORT, 'simulated delete failure'); END`, trigger, n.ID)).Error; err != nil { + t.Fatal(err) + } + t.Cleanup(func() { db.Exec("DROP TRIGGER IF EXISTS " + trigger) }) + if _, err := DeleteUserTree(u.ID); err == nil { + t.Fatal("tree deletion ignored child failure") + } + for _, record := range []interface{}{&u, &n, &d, &r} { + if err := db.First(record).Error; err != nil { + t.Fatalf("rollback lost %T: %v", record, err) + } + } + if err := db.Exec("DROP TRIGGER " + trigger).Error; err != nil { + t.Fatal(err) + } + if _, err := DeleteUserTree(u.ID); err != nil { + t.Fatal(err) + } + if _, err := DeleteUserTree(u.ID); err != nil { + t.Fatalf("repeated deletion failed: %v", err) + } + for _, entity := range []interface{}{&Net{}, &Device{}, &Route{}} { + query := db.Model(entity) + if _, isNet := entity.(*Net); isNet { + query = query.Where("user_id = ?", u.ID) + } else { + query = query.Where("net_id = ?", n.ID) + } + var count int64 + if err := query.Count(&count).Error; err != nil || count != 0 { + t.Fatalf("orphaned %T: %d %v", entity, count, err) + } + } + var historical Device + if err := db.Unscoped().First(&historical, d.ID).Error; err != nil || historical.RX != 7 || historical.TX != 9 { + t.Fatal("historical traffic lost") + } +} + +func TestConcurrentNaturalKeyCreatesAreIdempotent(t *testing.T) { + u, n := persistenceFixture(t) + var wg sync.WaitGroup + errors := make(chan error, 40) + for i := 0; i < 20; i++ { + wg.Add(1) + go func() { + defer wg.Done() + network := Net{UserID: u.ID, Name: n.Name, DHCP: n.DHCP} + errors <- network.Create() + route := Route{NetID: n.ID, DstAddr: "10.0.0.0", DstMask: "255.0.0.0"} + errors <- route.Create() + }() + } + wg.Wait() + close(errors) + for err := range errors { + if err != nil { + t.Fatal(err) + } + } + var networks, routes int64 + storage.Get().Model(&Net{}).Where("user_id = ?", u.ID).Count(&networks) + storage.Get().Model(&Route{}).Where("net_id = ?", n.ID).Count(&routes) + if networks != 1 || routes != 1 { + t.Fatalf("duplicate natural keys: networks=%d routes=%d", networks, routes) + } +} diff --git a/model/route.go b/model/route.go index 911a2b2..8e76ef1 100644 --- a/model/route.go +++ b/model/route.go @@ -1,6 +1,7 @@ package model import ( + "errors" "github.com/lanthora/cacao/logger" "github.com/lanthora/cacao/storage" "gorm.io/gorm" @@ -25,14 +26,43 @@ type Route struct { Priority int } -func (r *Route) Create() { - db := storage.Get() - db.Create(r) +func (r *Route) Create() error { + _, err := r.CreateOnce() + return err } -func (r *Route) Delete() { - db := storage.Get() - db.Delete(r) +func (r *Route) CreateOnce() (bool, error) { + created := false + err := storage.Write(func(tx *gorm.DB) error { + var network Net + if err := tx.Model(&Net{}).Joins("JOIN users ON users.id = nets.user_id AND users.deleted_at IS NULL").Where("nets.id = ?", r.NetID).Take(&network).Error; err != nil { + return err + } + var existing Route + err := tx.Where("net_id = ? AND dev_addr = ? AND dev_mask = ? AND dst_addr = ? AND dst_mask = ? AND next_hop = ? AND priority = ?", r.NetID, r.DevAddr, r.DevMask, r.DstAddr, r.DstMask, r.NextHop, r.Priority).Take(&existing).Error + if err == nil { + *r = existing + return nil + } + if !errors.Is(err, gorm.ErrRecordNotFound) { + return err + } + if err := tx.Create(r).Error; err != nil { + return err + } + created = true + return nil + }) + return created && err == nil, err +} + +func (r *Route) Delete() error { + if r.ID == 0 { + return gorm.ErrRecordNotFound + } + return storage.Write(func(tx *gorm.DB) error { + return tx.Where("id = ? AND net_id = ?", r.ID, r.NetID).Delete(&Route{}).Error + }) } func GetRouteByRouteID(routeid uint) (route Route) { @@ -46,7 +76,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 } diff --git a/model/statistics.go b/model/statistics.go new file mode 100644 index 0000000..2189cc3 --- /dev/null +++ b/model/statistics.go @@ -0,0 +1,60 @@ +package model + +import "github.com/lanthora/cacao/storage" + +type UserStatistics struct { + NetNum uint `json:"netnum"` + DevNum uint `json:"devnum"` + RxSum uint64 `json:"rxsum"` + TxSum uint64 `json:"txsum"` +} + +type UserWithStatistics struct { + User `gorm:"embedded"` + UserStatistics `gorm:"embedded"` +} + +// Counts and traffic each use one aggregation, independent of user count. +// The traffic helper also overlays pending batched counter updates. +const userStatisticsQuery = ` +SELECT users.*, COALESCE(net_stats.net_num, 0) AS net_num, + COALESCE(device_stats.dev_num, 0) AS dev_num +FROM users +LEFT JOIN ( + SELECT user_id, COUNT(*) AS net_num FROM nets + WHERE deleted_at IS NULL GROUP BY user_id +) AS net_stats ON net_stats.user_id = users.id +LEFT JOIN ( + SELECT nets.user_id, COUNT(*) AS dev_num + FROM devices JOIN nets ON devices.net_id = nets.id + WHERE devices.deleted_at IS NULL AND nets.deleted_at IS NULL GROUP BY nets.user_id +) AS device_stats ON device_stats.user_id = users.id +WHERE users.deleted_at IS NULL` + +func GetUserStatistics(userid uint) (UserStatistics, error) { + var result UserWithStatistics + if userid == 0 { + return result.UserStatistics, nil + } + if err := storage.Get().Raw(userStatisticsQuery+" AND users.id = ?", userid).Scan(&result).Error; err != nil { + return result.UserStatistics, err + } + traffic, err := GetUserTrafficTotals([]uint{userid}) + result.RxSum, result.TxSum = traffic[userid].RX, traffic[userid].TX + return result.UserStatistics, err +} + +func GetUsersWithStatistics() ([]UserWithStatistics, error) { + result := make([]UserWithStatistics, 0) + if err := storage.Get().Raw(userStatisticsQuery + " ORDER BY users.id").Scan(&result).Error; err != nil { + return nil, err + } + traffic, err := GetUserTrafficTotals(nil) + if err != nil { + return nil, err + } + for index := range result { + result[index].RxSum, result[index].TxSum = traffic[result[index].ID].RX, traffic[result[index].ID].TX + } + return result, nil +} diff --git a/model/statistics_test.go b/model/statistics_test.go new file mode 100644 index 0000000..a7c2f5e --- /dev/null +++ b/model/statistics_test.go @@ -0,0 +1,42 @@ +package model + +import "testing" + +func TestStatisticsCountsDoNotMultiplyOrIncludeDeletedChildren(t *testing.T) { + db := maintenanceTestDB(t) + users := []User{{Name: "populated"}, {Name: "empty"}} + if err := db.Create(&users).Error; err != nil { + t.Fatal(err) + } + nets := []Net{{UserID: users[0].ID, Name: "first"}, {UserID: users[0].ID, Name: "second"}, {UserID: users[0].ID, Name: "deleted"}} + if err := db.Create(&nets).Error; err != nil { + t.Fatal(err) + } + devices := []Device{{NetID: nets[0].ID}, {NetID: nets[0].ID}, {NetID: nets[1].ID}, {NetID: nets[2].ID}} + if err := db.Create(&devices).Error; err != nil { + t.Fatal(err) + } + if err := db.Delete(&devices[1]).Error; err != nil { + t.Fatal(err) + } + if err := db.Delete(&nets[2]).Error; err != nil { + t.Fatal(err) + } + var rows []UserWithStatistics + if err := db.Raw(userStatisticsQuery + " ORDER BY users.id").Scan(&rows).Error; err != nil { + t.Fatal(err) + } + if len(rows) != 2 || rows[0].ID != users[0].ID || rows[0].NetNum != 2 || rows[0].DevNum != 2 || rows[1].NetNum != 0 || rows[1].DevNum != 0 { + t.Fatalf("incorrect grouped statistics: %+v", rows) + } + if err := db.Delete(&users[0]).Error; err != nil { + t.Fatal(err) + } + rows = nil + if err := db.Raw(userStatisticsQuery).Scan(&rows).Error; err != nil { + t.Fatal(err) + } + if len(rows) != 1 || rows[0].ID != users[1].ID { + t.Fatalf("deleted user leaked into statistics: %+v", rows) + } +} diff --git a/model/user.go b/model/user.go index 8279a5e..2ab3d25 100644 --- a/model/user.go +++ b/model/user.go @@ -14,25 +14,34 @@ 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() { - db := storage.Get() - db.Save(u) +func (u *User) Save() error { + return storage.Write(func(tx *gorm.DB) error { + if u.ID == 0 { + return tx.Create(u).Error + } + return tx.Model(&User{}).Where("id = ?", u.ID).Select("name", "password", "token", "token_expires_at", "role", "ip").Updates(u).Error + }) } -func (u *User) Delete() { - db := storage.Get() - db.Delete(u) +func (u *User) Delete() error { + _, err := DeleteUserTree(u.ID) + return err } func GetUsers() (users []User) { @@ -41,9 +50,9 @@ func GetUsers() (users []User) { return } -func DeleteUserByUserID(userid uint) { - db := storage.Get() - db.Delete(&User{Model: gorm.Model{ID: userid}}) +func DeleteUserByUserID(userid uint) error { + _, err := DeleteUserTree(userid) + return err } func GetLastActiveTimeByUserID(userid uint) time.Time { @@ -57,13 +66,12 @@ func GetLastActiveTimeByUserID(userid uint) time.Time { return time.Now() } -func RefreshUserLastActiveTimeByUserID(userid uint) { +func RefreshUserLastActiveTimeByUserID(userid uint) error { 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. + return storage.Write(func(tx *gorm.DB) error { + return tx.Model(&User{}).Where("id = ?", userid).UpdateColumn("updated_at", time.Now()).Error + }) } + return nil } diff --git a/storage/storage.go b/storage/storage.go index da86783..5ef2689 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -1,25 +1,32 @@ package storage import ( + "context" "os" - "path" + "path/filepath" - "github.com/glebarez/sqlite" "github.com/lanthora/cacao/argp" "github.com/lanthora/cacao/logger" "gorm.io/gorm" - gormlogger "gorm.io/gorm/logger" ) 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{ - Logger: gormlogger.Default.LogMode(gormlogger.Silent), - }) + databasePath := filepath.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) + } + database, err = openDatabase(databasePath) if err != nil { logger.Fatal("open storage database failed: %v", err) } @@ -27,8 +34,54 @@ func init() { logger.Info("storage=[%v]", storageDir) } -var db *gorm.DB +var database *store +// Get returns the bounded read pool. Runtime mutations must use Write; direct +// writes are reserved for startup migrations and test fixture setup. func Get() *gorm.DB { - return db + return database.reader +} + +// Write serializes a logical mutation and acknowledges it only after durable +// commit. Concurrent mutations share a short group-commit window. The callback +// must use its tx for ALL reads and writes, return every database error, and must +// not call Write/Flush recursively or perform external side effects. A callback +// may be rolled back even after it returned nil if the outer commit fails. +func Write(fn func(*gorm.DB) error) error { + return WriteContext(context.Background(), fn) +} + +// WriteContext allows cancellation while waiting for queue space or execution. +// Once execution starts, it waits for the definitive commit/rollback result; +// cancellation cannot turn a committed write into an ambiguous timeout response. +func WriteContext(ctx context.Context, fn func(*gorm.DB) error) error { + return database.write(ctx, fn) +} + +// Flush waits until all mutations accepted before its barrier have completed. +func Flush(ctx context.Context) error { + return database.flush(ctx) +} + +// Shutdown stops accepting mutations, drains accepted work, and closes both +// pools. A context timeout stops waiting; draining continues in the background. +// Call after HTTP/WebSocket handlers and background producers have stopped. +func Shutdown(ctx context.Context) error { + return database.shutdown(ctx) +} + +// Statistics describes this process's accepted write jobs. Flush barriers are +// excluded; jobs canceled after admission count as failed. QueueDepth excludes +// the batch currently being collected or executed. Counters reset on restart. +type Statistics struct { + QueueDepth int `json:"queueDepth"` + BatchesCommitted uint64 `json:"batchesCommitted"` + JobsCommitted uint64 `json:"jobsCommitted"` + JobsFailed uint64 `json:"jobsFailed"` + LastBatchSize uint64 `json:"lastBatchSize"` +} + +// Stats returns a nonblocking snapshot without issuing database queries. +func Stats() Statistics { + return database.stats() } diff --git a/storage/writer.go b/storage/writer.go new file mode 100644 index 0000000..fbadfc0 --- /dev/null +++ b/storage/writer.go @@ -0,0 +1,323 @@ +package storage + +import ( + "context" + "database/sql" + "database/sql/driver" + "errors" + "fmt" + "net/url" + "path/filepath" + "strings" + "sync" + "sync/atomic" + "time" + + "github.com/glebarez/sqlite" + "gorm.io/gorm" + gormlogger "gorm.io/gorm/logger" +) + +const ( + writeQueueSize = 1024 + writeBatchSize = 64 + writeBatchWait = 5 * time.Millisecond + readPoolSize = 8 +) + +const ( + requestQueued = iota + requestRunning + requestCanceled +) + +var ErrClosed = errors.New("storage is shutting down") + +type writeRequest struct { + ctx context.Context + fn func(*gorm.DB) error + result chan error + state atomic.Int32 + barrier bool +} + +type store struct { + reader, writer *gorm.DB + readerPool, writerPool *sql.DB + queue chan *writeRequest + slots chan struct{} + stopping, done chan struct{} + mu sync.Mutex + closed bool + closeErr error + batchesCommitted atomic.Uint64 + jobsCommitted atomic.Uint64 + jobsFailed atomic.Uint64 + lastBatchSize atomic.Uint64 +} + +func (s *store) stats() Statistics { + return Statistics{ + QueueDepth: len(s.queue), + BatchesCommitted: s.batchesCommitted.Load(), + JobsCommitted: s.jobsCommitted.Load(), + JobsFailed: s.jobsFailed.Load(), + LastBatchSize: s.lastBatchSize.Load(), + } +} + +func openDatabase(filename string) (*store, error) { + abs, err := filepath.Abs(filename) + if err != nil { + return nil, err + } + uriPath := filepath.ToSlash(abs) + if !strings.HasPrefix(uriPath, "/") { + uriPath = "/" + uriPath // Windows drive letters need file:///C:/... + } + params := url.Values{"_txlock": {"immediate"}, "_pragma": { + "busy_timeout(5000)", "journal_mode(WAL)", "foreign_keys(1)", "synchronous(FULL)", + }} + dsn := (&url.URL{Scheme: "file", Path: uriPath, RawQuery: params.Encode()}).String() + openPool := func(size int) (*gorm.DB, *sql.DB, error) { + db, err := gorm.Open(sqlite.Open(dsn), &gorm.Config{ + Logger: gormlogger.Default.LogMode(gormlogger.Silent), + }) + if err != nil { + return nil, nil, err + } + pool, err := db.DB() + if err != nil { + return nil, nil, err + } + pool.SetMaxOpenConns(size) + pool.SetMaxIdleConns(size) + return db, pool, nil + } + writer, writerPool, err := openPool(1) + if err != nil { + return nil, err + } + reader, readerPool, err := openPool(readPoolSize) + if err != nil { + _ = writerPool.Close() + return nil, err + } + s := &store{ + reader: reader, writer: writer, readerPool: readerPool, writerPool: writerPool, + queue: make(chan *writeRequest, writeQueueSize), slots: make(chan struct{}, writeQueueSize), + stopping: make(chan struct{}), done: make(chan struct{}), + } + go s.run() + return s, nil +} + +func (s *store) enqueue(ctx context.Context, fn func(*gorm.DB) error, barrier bool) (*writeRequest, error) { + if err := ctx.Err(); err != nil { + return nil, err + } + select { + case s.slots <- struct{}{}: + case <-ctx.Done(): + return nil, ctx.Err() + case <-s.stopping: + return nil, ErrClosed + } + s.mu.Lock() + defer s.mu.Unlock() + if s.closed { + <-s.slots + return nil, ErrClosed + } + if err := ctx.Err(); err != nil { + <-s.slots + return nil, err + } + r := &writeRequest{ctx: ctx, fn: fn, result: make(chan error, 1), barrier: barrier} + r.state.Store(requestQueued) + // A reserved slot guarantees this cannot block while holding the lock. + s.queue <- r + return r, nil +} + +func (s *store) write(ctx context.Context, fn func(*gorm.DB) error) error { + if fn == nil { + return errors.New("storage write callback is nil") + } + r, err := s.enqueue(ctx, fn, false) + if err != nil { + return err + } + select { + case err := <-r.result: + return err + case <-ctx.Done(): + if r.state.CompareAndSwap(requestQueued, requestCanceled) { + return ctx.Err() + } + return <-r.result + } +} + +func (s *store) flush(ctx context.Context) error { + r, err := s.enqueue(ctx, nil, true) + if err != nil { + return err + } + select { + case err := <-r.result: + return err + case <-ctx.Done(): + return ctx.Err() + } +} + +func (s *store) shutdown(ctx context.Context) error { + s.mu.Lock() + if !s.closed { + s.closed = true + close(s.stopping) + close(s.queue) + } + s.mu.Unlock() + select { + case <-s.done: + return s.closeErr + case <-ctx.Done(): + return ctx.Err() + } +} + +func (s *store) run() { + defer func() { + s.closeErr = errors.Join(s.writerPool.Close(), s.readerPool.Close()) + close(s.done) + }() + for first := range s.queue { + <-s.slots + batch := []*writeRequest{first} + if !first.barrier { + timer := time.NewTimer(writeBatchWait) + collect: + for len(batch) < writeBatchSize { + select { + case r, ok := <-s.queue: + if !ok { + break collect + } + <-s.slots + batch = append(batch, r) + if r.barrier { + break collect + } + case <-timer.C: + break collect + } + } + timer.Stop() + } + s.commitBatch(batch) + } +} + +func invokeWrite(fn func(*gorm.DB) error, tx *gorm.DB) (err error) { + defer func() { + if recovered := recover(); recovered != nil { + err = fmt.Errorf("storage write callback panicked: %v", recovered) + } + }() + return fn(tx) +} + +func (s *store) commitBatch(batch []*writeRequest) { + results := make([]error, len(batch)) + var tx *gorm.DB + var conn *sql.Conn + defer func() { + if conn != nil { + _ = conn.Close() + } + }() + var outerErr error + var batchSize uint64 + for i, r := range batch { + if r.barrier { + continue + } + if err := r.ctx.Err(); err != nil { + r.state.CompareAndSwap(requestQueued, requestCanceled) + } + if !r.state.CompareAndSwap(requestQueued, requestRunning) { + results[i] = r.ctx.Err() + continue + } + batchSize++ + if outerErr != nil { + continue + } + if tx == nil { + conn, outerErr = s.writerPool.Conn(context.Background()) + if outerErr != nil { + continue + } + connectionDB := s.writer.Session(&gorm.Session{NewDB: true, SkipDefaultTransaction: true, Context: context.Background()}) + connectionDB.Statement.ConnPool = conn + tx = connectionDB.Begin() + if tx.Error != nil { + outerErr = tx.Error + continue + } + } + name := fmt.Sprintf("storage_write_%d", i) + if err := tx.Exec("SAVEPOINT " + name).Error; err != nil { + outerErr = err + continue + } + callbackDB := tx.Session(&gorm.Session{NewDB: true, SkipDefaultTransaction: true, Context: context.WithoutCancel(r.ctx)}) + results[i] = invokeWrite(r.fn, callbackDB) + if results[i] != nil { + if err := tx.Exec("ROLLBACK TO SAVEPOINT " + name).Error; err != nil { + outerErr = err + continue + } + } + if err := tx.Exec("RELEASE SAVEPOINT " + name).Error; err != nil { + outerErr = err + } + } + if tx != nil { + if outerErr == nil { + outerErr = tx.Commit().Error + } + if outerErr != nil { + // database/sql marks a Tx done even when driver.Commit fails. This + // driver can leave the SQLite transaction open (e.g. a deferred FK + // violation), so explicitly clean the same pinned connection. + if err := tx.Rollback().Error; err != nil { + if _, err := conn.ExecContext(context.Background(), "ROLLBACK"); err != nil { + // Never return a connection with uncertain transaction state + // to the pool after an I/O or rollback failure. + _ = conn.Raw(func(any) error { return driver.ErrBadConn }) + } + } + } else { + s.batchesCommitted.Add(1) + } + } + if batchSize != 0 { + s.lastBatchSize.Store(batchSize) + } + for i, r := range batch { + if outerErr != nil { + results[i] = errors.Join(results[i], fmt.Errorf("storage batch transaction failed: %w", outerErr)) + } + if !r.barrier { + if results[i] == nil { + s.jobsCommitted.Add(1) + } else { + s.jobsFailed.Add(1) + } + } + r.result <- results[i] + } +} diff --git a/storage/writer_test.go b/storage/writer_test.go new file mode 100644 index 0000000..b3b6eaf --- /dev/null +++ b/storage/writer_test.go @@ -0,0 +1,389 @@ +package storage + +import ( + "context" + "database/sql" + "errors" + "fmt" + "path/filepath" + "sync" + "sync/atomic" + "testing" + "time" + + "gorm.io/gorm" +) + +type testRecord struct { + ID int `gorm:"primaryKey"` + Value int +} + +func testStore(t *testing.T) *store { + t.Helper() + s, err := openDatabase(filepath.Join(t.TempDir(), "database with spaces.db")) + if err != nil { + t.Fatal(err) + } + t.Cleanup(func() { + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + if err := s.shutdown(ctx); err != nil { + t.Error(err) + } + }) + if err := s.reader.AutoMigrate(&testRecord{}); err != nil { + t.Fatal(err) + } + return s +} + +func TestPragmasApplyToEveryConnection(t *testing.T) { + s := testStore(t) + for _, pool := range []*sql.DB{s.readerPool, s.writerPool} { + var connections []*sql.Conn + for range pool.Stats().MaxOpenConnections { + conn, err := pool.Conn(context.Background()) + if err != nil { + t.Fatal(err) + } + connections = append(connections, conn) + for pragma, want := range map[string]int{"busy_timeout": 5000, "foreign_keys": 1, "synchronous": 2} { + var got int + if err := conn.QueryRowContext(context.Background(), "PRAGMA "+pragma).Scan(&got); err != nil || got != want { + t.Errorf("%s=%d, want %d, error: %v", pragma, got, want, err) + } + } + var mode string + if err := conn.QueryRowContext(context.Background(), "PRAGMA journal_mode").Scan(&mode); err != nil || mode != "wal" { + t.Errorf("journal_mode=%s, error: %v", mode, err) + } + } + for _, conn := range connections { + _ = conn.Close() + } + } +} + +func TestConcurrentWritesShareCommitsAndAreReadableOnReturn(t *testing.T) { + s := testStore(t) + const writers = 256 + start := make(chan struct{}) + var wg sync.WaitGroup + var transactions sync.Map + var active, peak atomic.Int32 + for i := range writers { + wg.Add(1) + go func(id int) { + defer wg.Done() + <-start + err := s.write(context.Background(), func(tx *gorm.DB) error { + current := active.Add(1) + defer active.Add(-1) + for previous := peak.Load(); current > previous && !peak.CompareAndSwap(previous, current); previous = peak.Load() { + } + transactions.Store(tx.Statement.ConnPool, true) + return tx.Create(&testRecord{ID: id, Value: id}).Error + }) + if err != nil { + t.Errorf("write %d: %v", id, err) + return + } + var record testRecord + if err := s.reader.First(&record, id).Error; err != nil || record.Value != id { + t.Errorf("read committed %d: value=%d error=%v", id, record.Value, err) + } + }(i + 1) + } + close(start) + wg.Wait() + if peak.Load() != 1 { + t.Errorf("concurrent writers=%d, want 1", peak.Load()) + } + commits := 0 + transactions.Range(func(_, _ any) bool { commits++; return true }) + if commits >= writers/2 { + t.Errorf("%d tasks used %d commits; expected group commits", writers, commits) + } + stats := s.stats() + if stats.JobsCommitted != writers || stats.JobsFailed != 0 || stats.BatchesCommitted != uint64(commits) || stats.LastBatchSize > writeBatchSize { + t.Errorf("incorrect concurrent write statistics: %+v", stats) + } +} + +func TestImmediateWriteTransactionAndReadersDoNotSeeDirtyData(t *testing.T) { + s := testStore(t) + started, release := make(chan struct{}), make(chan struct{}) + result := make(chan error, 1) + go func() { + result <- s.write(context.Background(), func(tx *gorm.DB) error { + close(started) + <-release + return tx.Create(&testRecord{ID: 1}).Error + }) + }() + <-started + conn, err := s.readerPool.Conn(context.Background()) + if err != nil { + close(release) + t.Fatal(err) + } + if _, err := conn.ExecContext(context.Background(), "PRAGMA busy_timeout=20"); err != nil { + t.Error(err) + } + // The writer has only read so far. BEGIN IMMEDIATE must already hold the + // write reservation, avoiding a later read-to-write SQLITE_BUSY upgrade. + otherTx, beginErr := conn.BeginTx(context.Background(), nil) + if beginErr == nil { + _ = otherTx.Rollback() + t.Error("writer did not reserve its write lock at BEGIN") + } + _, _ = conn.ExecContext(context.Background(), "PRAGMA busy_timeout=5000") + _ = conn.Close() + close(release) + if err := <-result; err != nil { + t.Fatal(err) + } + + inserted, commit := make(chan struct{}), make(chan struct{}) + go func() { + result <- s.write(context.Background(), func(tx *gorm.DB) error { + if err := tx.Create(&testRecord{ID: 2}).Error; err != nil { + close(inserted) + return err + } + close(inserted) + <-commit + return nil + }) + }() + <-inserted + var count int64 + if err := s.reader.Model(&testRecord{}).Where("id = ?", 2).Count(&count).Error; err != nil || count != 0 { + t.Errorf("read saw uncommitted data: count=%d error=%v", count, err) + } + close(commit) + if err := <-result; err != nil { + t.Fatal(err) + } +} + +func batchRequest(fn func(*gorm.DB) error) *writeRequest { + r := &writeRequest{ctx: context.Background(), fn: fn, result: make(chan error, 1)} + r.state.Store(requestQueued) + return r +} + +func TestSavepointsIsolateFailedAndPanickingJobs(t *testing.T) { + s := testStore(t) + rejected := errors.New("reject entire operation") + batch := []*writeRequest{ + batchRequest(func(tx *gorm.DB) error { return tx.Create(&testRecord{ID: 1}).Error }), + batchRequest(func(tx *gorm.DB) error { + if err := tx.Create(&testRecord{ID: 2}).Error; err != nil { + return err + } + return rejected + }), + batchRequest(func(tx *gorm.DB) error { + if err := tx.Create(&testRecord{ID: 3}).Error; err != nil { + return err + } + panic("test callback") + }), + batchRequest(func(tx *gorm.DB) error { return tx.Create(&testRecord{ID: 4}).Error }), + } + s.commitBatch(batch) + for i, request := range batch { + err := <-request.result + if (i == 1 || i == 2) != (err != nil) { + t.Errorf("job %d error=%v", i, err) + } + } + var ids []int + if err := s.reader.Model(&testRecord{}).Order("id").Pluck("id", &ids).Error; err != nil { + t.Fatal(err) + } + if fmt.Sprint(ids) != "[1 4]" { + t.Fatalf("partially failed jobs leaked rows: %v", ids) + } + stats := s.stats() + if stats.JobsCommitted != 2 || stats.JobsFailed != 2 || stats.BatchesCommitted != 1 || stats.LastBatchSize != 4 { + t.Errorf("incorrect savepoint statistics: %+v", stats) + } +} + +func TestFailedOuterCommitRollsBackEveryJobAndReusesConnection(t *testing.T) { + s := testStore(t) + for _, statement := range []string{ + "CREATE TABLE parents (id INTEGER PRIMARY KEY)", + "CREATE TABLE children (id INTEGER PRIMARY KEY, parent_id INTEGER REFERENCES parents(id) DEFERRABLE INITIALLY DEFERRED)", + } { + if err := s.reader.Exec(statement).Error; err != nil { + t.Fatal(err) + } + } + batch := []*writeRequest{ + batchRequest(func(tx *gorm.DB) error { return tx.Create(&testRecord{ID: 1}).Error }), + batchRequest(func(tx *gorm.DB) error { return tx.Exec("INSERT INTO children VALUES (1, 99)").Error }), + } + s.commitBatch(batch) + for _, request := range batch { + if err := <-request.result; err == nil { + t.Fatal("acknowledged failed commit") + } + } + stats := s.stats() + if stats.JobsCommitted != 0 || stats.JobsFailed != 2 || stats.BatchesCommitted != 0 { + t.Errorf("failed transaction counted as committed: %+v", stats) + } + var count int64 + if err := s.reader.Model(&testRecord{}).Count(&count).Error; err != nil || count != 0 { + t.Fatalf("commit failure left data: count=%d error=%v", count, err) + } + if err := s.write(context.Background(), func(tx *gorm.DB) error { + return tx.Create(&testRecord{ID: 2}).Error + }); err != nil { + t.Fatalf("failed commit poisoned writer connection: %v", err) + } +} + +func TestSQLiteAutomaticRollbackFailsWholeBatchAndRecovers(t *testing.T) { + s := testStore(t) + if err := s.reader.Exec(`CREATE TRIGGER abort_transaction BEFORE INSERT ON test_records +WHEN NEW.id = 2 BEGIN SELECT RAISE(ROLLBACK, 'abort whole transaction'); END`).Error; err != nil { + t.Fatal(err) + } + var lastExecuted bool + batch := []*writeRequest{ + batchRequest(func(tx *gorm.DB) error { return tx.Create(&testRecord{ID: 1}).Error }), + batchRequest(func(tx *gorm.DB) error { return tx.Create(&testRecord{ID: 2}).Error }), + batchRequest(func(tx *gorm.DB) error { + lastExecuted = true + return tx.Create(&testRecord{ID: 3}).Error + }), + } + s.commitBatch(batch) + for _, request := range batch { + if err := <-request.result; err == nil { + t.Fatal("acknowledged a job from an automatically rolled back transaction") + } + } + if lastExecuted { + t.Fatal("continued executing jobs after SQLite invalidated the outer transaction") + } + var count int64 + if err := s.reader.Model(&testRecord{}).Count(&count).Error; err != nil || count != 0 { + t.Fatalf("automatic rollback leaked data: count=%d error=%v", count, err) + } + if err := s.write(context.Background(), func(tx *gorm.DB) error { + return tx.Create(&testRecord{ID: 4}).Error + }); err != nil { + t.Fatalf("automatic rollback poisoned the next transaction: %v", err) + } +} + +func TestCancellationAndShutdownDrain(t *testing.T) { + s := testStore(t) + started, release := make(chan struct{}), make(chan struct{}) + ctx, cancel := context.WithCancel(context.Background()) + result := make(chan error, 1) + go func() { + result <- s.write(ctx, func(tx *gorm.DB) error { + close(started) + <-release + return tx.Create(&testRecord{ID: 1}).Error + }) + }() + <-started + cancel() + select { + case err := <-result: + t.Fatalf("running write returned before final commit: %v", err) + default: + } + queuedCtx, cancelQueued := context.WithCancel(context.Background()) + var executed atomic.Bool + request, err := s.enqueue(queuedCtx, func(tx *gorm.DB) error { executed.Store(true); return nil }, false) + if err != nil { + t.Fatal(err) + } + cancelQueued() + stopCtx, stopCancel := context.WithTimeout(context.Background(), 10*time.Millisecond) + defer stopCancel() + if err := s.shutdown(stopCtx); !errors.Is(err, context.DeadlineExceeded) { + t.Fatalf("shutdown while running: %v", err) + } + if err := s.write(context.Background(), func(tx *gorm.DB) error { return nil }); !errors.Is(err, ErrClosed) { + t.Fatalf("accepted after shutdown: %v", err) + } + close(release) + if err := <-result; err != nil { + t.Fatal(err) + } + if err := <-request.result; !errors.Is(err, context.Canceled) { + t.Fatalf("queued cancel: %v", err) + } + if executed.Load() { + t.Fatal("canceled queued mutation executed") + } + if err := s.shutdown(context.Background()); err != nil { + t.Fatal(err) + } +} + +func TestBoundedQueueHonorsCancellation(t *testing.T) { + s := testStore(t) + started, release := make(chan struct{}), make(chan struct{}) + defer close(release) + go func() { + _ = s.write(context.Background(), func(tx *gorm.DB) error { + close(started) + <-release + return nil + }) + }() + <-started + for range writeQueueSize { + if _, err := s.enqueue(context.Background(), func(tx *gorm.DB) error { return nil }, false); err != nil { + t.Fatal(err) + } + } + if depth := s.stats().QueueDepth; depth != writeQueueSize { + t.Errorf("queueDepth=%d, want %d", depth, writeQueueSize) + } + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond) + defer cancel() + if err := s.write(ctx, func(tx *gorm.DB) error { return nil }); !errors.Is(err, context.DeadlineExceeded) { + t.Fatalf("full queue did not honor cancellation: %v", err) + } +} + +func TestFlushWaitsForEarlierCommit(t *testing.T) { + s := testStore(t) + r, err := s.enqueue(context.Background(), func(tx *gorm.DB) error { + return tx.Create(&testRecord{ID: 1}).Error + }, false) + if err != nil { + t.Fatal(err) + } + if err := s.flush(context.Background()); err != nil { + t.Fatal(err) + } + select { + case err := <-r.result: + if err != nil { + t.Fatal(err) + } + default: + t.Fatal("flush completed before earlier write acknowledgement") + } + var count int64 + if err := s.reader.Model(&testRecord{}).Count(&count).Error; err != nil || count != 1 { + t.Fatalf("flush did not commit preceding write: count=%d error=%v", count, err) + } + stats := s.stats() + if stats.JobsCommitted != 1 || stats.LastBatchSize != 1 { + t.Errorf("flush barrier counted as mutation: %+v", stats) + } +}