mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-09-29 22:06:38 +08:00
dbaa3bf140
docs(changelog): 修正表述笔误
refactor(cordis): 磁盘缓存改用上上游能力并清理本地副本
按上游/下游归属规约:类型断言守卫已回流 Wavelet(f3d85d5,附回归用例),
本仓库删除 OpenFlare/plugins/server/pkg/cache 整包并改 import 到
Wavelet/pkg/cache/disk,同步后与上游零漂移。
验证:go build 通过;go test ./... exit 0(137 包 ok);256 条路由对拍与
232 条 swagger 操作均零差异;make build-all 四进制;前端零改动。
docs(cordis): 记录 T1 清理结果与五个复用阻塞点
refactor(cordis): server 复用上游 pkg 能力并删除等价本地副本
按上游/下游归属规约清理重复实现,删除 7 个与上游等价的本地包并改 import:
shared/response→pkg/response、pkg/{logger,mail,trace,httppool,cache/ram}→
上游同名包、infra/persistence/batchwriter→pkg/batchwriter。逐项核过差异:
httppool 逐字节相同;logger 的 Config 字段完全一致;response 的 7 个 Abort*
一致;cache/ram 换过去顺带把裸 go 变回带 panic 恢复的 util.Go。
两处非等价差异按语义处理:
- batchwriter.Stats 与 status DTO 原为类型别名,改为消费侧逐字段转换,
避免 model 反向依赖基础设施类型;
- 上游 pkg/idgen 要求显式 Init(本地副本为懒加载自动初始化),本次保留本地
副本,待与 infra 初始化一并迁移(已登记在清理计划)。
验证:go build 通过;go test ./... exit 0(138 包 ok);256 条路由对拍零差异;
make swagger 232 条操作零增减,且归一化后与旧文档深度相等——差异仅为
response.Any / logger.LogEntry 两个定义名随包路径改名,接口形状未变。
chore(cordis): 回流内核与 pkg/util 通用能力并清理 vendoring 污染
按新增的上游/下游归属规约:HandleRaw/BasePath 与版本比较、网络、格式化助手
属通用能力,已提交到 Wavelet 分支 feat/cordis-router-raw-routes,本仓库改为
纯同步获取(pkg/util 已零漂移),补丁登记保留至上游合并。
同时修掉我此前 git add -A 造成的污染:首次 vendoring 把上游工作区里被
gitignore 的运行期产物一起提交进来(upload 的 diskcache 缓存块 650 个与
driver_http/dist 前端构建物 380 个,共 12872 行/1030 文件)。sync-upstream.sh
现显式排除 uploads/dist/data/*.db,.gitignore 补上对应兜底规则。
AGENTS.md 增加上游/下游改动归属规约,并把仍指向前 Cordis 布局的硬性约束
(internal/router + Serve、internal/repository/logstore、internal/platform/bootstrap、
internal/cmd)改到当前插件路径。
验证:go build 通过;go test ./... exit 0(144 包 ok);make swagger 232 条
操作与基线逐条一致;make build-all 四进制;gofmt 干净。
feat(cordis): server 插件化并改由内核挂载控制面路由
新增 plugins/server/plugin.go:Apply 以 ctx.Router().Group(app.api_prefix)
声明根级与 /v1 全部路由;33 个注册函数由 *gin.RouterGroup 改为
core.RouterExtension,RegisterCollection 改用内核新增的 HandleRaw 保留
尾部斜杠变体,AdminMiddlewares 返回 []any(Go 不允许把 []T 展开为 ...any)。
删除 router.Serve 与 registerRoutes,装配根改为 core.App +
driver_http.New(WithEngine(router.BuildEngine())),监听、信号与优雅退出归内核;
前端 SPA 的 NoRoute 兜底因内核暂无贡献点而保留在引擎层。
路由保真证据:plugin_parity_test 对拍 baseline/routes-engine.txt 的 256 条
(方法 路径) 零差异;go test ./... exit 0(144 包 ok,含真实 handler 的
openflare/integration 用例走同一条挂载路径);make swagger 232 条操作与基线
逐条一致;golangci-lint 0 issues;make build-all 四进制;embed_frontend
标签编译通过;前端零改动。
已知待补:带 Redis 的实机 HTTP 冒烟(本机 6379 未启动,session store 与
改造前一样在建店阶段即 fatal),以及 bootstrap 的任务/设置/迁移注册迁入 Apply。
feat(core): RouterExtension 增加 HandleRaw 与 BasePath 以保真尾部斜杠路由
server 插件化的前置:Handle 经 cleanPath 会剥掉尾部斜杠,无法表达
/resource 与 /resource/ 两条不同路由,而 OpenFlare 有 20 个历史 list
端点两者都注册且部署关闭了 RedirectTrailingSlash,缺失即 404。新增
HandleRaw 与 BasePath(作用域包装器同样登记反注册),补 extpoints 用例;
并把 router.Serve 拆出 BuildEngine 以便交给 driver_http.WithEngine 复用,
新增路由表导出 harness,固化 256 条 (方法 路径) 基线供插件化对拍。
上游补丁登记于 backend/OpenFlare/upstream-patches.md,同步脚本改为按目录
前缀输出差异并在同步后提醒确认补丁是否仍在。
验证:go build 通过;go test ./... exit 0(143 包 ok);gofmt 干净。
docs(cordis): 记录 server 插件接入内核的可行路径与内核能力缺口
feat(cordis): agent/relay/flared 落地为内核驱动插件
三个边缘守护进程各新增 plugin.go,实现 core.Plugin + core.Driver
(自定义 DriverType 与同名 profile),装配与生命周期从 main 迁入
Apply/Start/Stop:Apply 负责 JSON 配置加载、运行环境与用户确保、
openresty/frps/frpc 管理器与各服务装配;Start 以 util.Go 拉起阻塞式
runner 与 GeoIP 周期更新;Stop 收敛主循环结果并在超时时报错而非静默。
入口改为 core.NewApp(core.WithProfile(...)) + Prepare/Run,保持
-config 旗标、默认路径、退出码与启动/停止日志不变。
验证:go build 通过;go test ./... exit 0(143 包 ok,含 3 个插件身份
与配置失败路径测试);make build-all 四进制产出;三进制实跑缺失配置
均 exit 1 且错误链保留 load {agent,relay,flared} config 原因;gofmt 干净。
refactor(cordis): 按功能职责拆分为 4 个插件与 share 共享层
backend/OpenFlare 不再平铺遗留分层,改为 plugins/{server,agent,relay,flared}
加 share/:控制面业务(openflare/admin/oauth/user/upload/cap/config/health 与
repository/model/infra/router 等支撑层)归 server;三个边缘守护进程各自成插件;
被两个以上插件消费的 protocol/geoip/wsclient/render/pagesarchive/edge 归 share。
同时把 pkg/util 与 buildinfo 合并回上游 pkg(上游已覆盖全部符号,仅 8 个函数与
2 个类型为 OpenFlare 独有,已一并迁入),装配根统一到 backend/cmd(含三个 daemon
入口),Dockerfile 与 release 工作流的构建路径和 -X 注入路径同步更新。
验证:go build 通过;go test ./... exit 0(141 包 ok);make swagger exit 0 且
232 条 API 操作与基线逐条一致;make build-all 产出 4 进制;-X 注入经二进制
strings 实测生效;日志后端直连门禁改写为按 server 插件业务域扫描并在扫描数为 0
时报错(防门禁静默失效);前端零改动。
feat(cordis): 落地 backend/share 共享层与上游同步脚本
跨插件共享资源(控制消息协议、GeoIP+iputil、边缘守护进程日志)从下游包
移入 backend/share,并声明其只能依赖 core/pkg 与标准/第三方库,禁止反向
引用下游业务与具体插件实现;新增 scripts/sync-upstream.sh 只覆盖
backend/{core,pkg,plugins},同步后 --check 报告零差异,证明与上游逐字一致。
go build 通过,go test ./... exit 0(142 包 ok),前端零改动。
refactor(cordis): 采用与 Wavelet 同构的单模块布局并引入上游内核
按上游结构落位:backend/{core,pkg,plugins} 为 Wavelet 上游拷贝,OpenFlare
全部业务收拢到上游 downstream 所对应的位置 backend/OpenFlare/,模块名保持
Wavelet 以保证上游 import 路径逐字一致、同步零改写;三个 daemon 入口移至
backend/OpenFlare/cmd,backend/cmd 与 main.go 作为控制面装配根。
行为不变:go build 通过,142 个测试包全绿(含上游插件测试),232 条 API
操作与改造前逐条一致,四进制产物正常,前端零改动。swagger 暂只扫描下游代码,
待 P4 挂载上游路由后再纳入 plugins/。
style: 修正模块路径改写导致的 import 分组排序漂移
refactor(layout): Go 代码迁入 backend/ 并将模块名简化为 OpenFlare
对齐上游 Wavelet 的仓库布局,为以第二 module 形态 vendoring Cordis 内核与
平台插件做准备:模块路径整体改写为 OpenFlare,Go 目标加 cd backend,
swaggo 产物移至 backend/docs 并把 json/yaml 复制回 docs/ 供站点消费,
Dockerfile 与 release 工作流的构建目录、ldflags 模块路径同步更新。
行为保持不变:232 条路由与改造前逐条一致,95 个测试包全绿,
四进制产物正常,前端零改动。
chore(cordis): 落地改造计划与 schema/路由基线
新增 legacy_dump_test 迁移快照 harness:在临时 sqlite 库上按生产顺序
(goose.UpTo → zone 导入 → goose.Up)跑完 76 个历史迁移并导出 schema 与
版本序列,作为改造前后一致性门禁的唯一事实来源。同时记录 232 条路由清单
与 foundation 实施计划。
docs(cordis): add OpenFlare Cordis 架构改造设计
明确上游以第二 module 形态 vendoring 进 backend/Wavelet、4 个插件
(server/agent/relay/flared) 全部装载内核,并规定保留 76 个历史 goose
迁移 + 一次性版本 stamp 桥接的迁移方案,配套三方 schema 一致性门禁,
确保已部署库不重跑历史、不丢数据。
559 lines
17 KiB
Go
559 lines
17 KiB
Go
// Copyright 2026 Arctel.net
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package extpoints
|
|
|
|
import (
|
|
"strings"
|
|
"sync"
|
|
)
|
|
|
|
// RouteDefinition holds the metadata and handler list for a single HTTP route.
|
|
type RouteDefinition struct {
|
|
ID uint64
|
|
Method string
|
|
Path string
|
|
Handlers []any
|
|
Middlewares []any
|
|
}
|
|
|
|
// RouterExtension defines the interface for registering routes and middlewares.
|
|
type RouterExtension interface {
|
|
Use(middlewares ...any)
|
|
Group(prefix string, middlewares ...any) RouterExtension
|
|
Handle(method, path string, handlers ...any) RouteDefinition
|
|
// HandleRaw joins path with the group prefix but preserves a trailing slash,
|
|
// so `/resource` and `/resource/` can coexist as distinct routes.
|
|
HandleRaw(method, path string, handlers ...any) RouteDefinition
|
|
// BasePath reports this group's absolute prefix ("" for the root registry).
|
|
BasePath() string
|
|
GET(path string, handlers ...any) RouteDefinition
|
|
POST(path string, handlers ...any) RouteDefinition
|
|
PUT(path string, handlers ...any) RouteDefinition
|
|
DELETE(path string, handlers ...any) RouteDefinition
|
|
PATCH(path string, handlers ...any) RouteDefinition
|
|
HEAD(path string, handlers ...any) RouteDefinition
|
|
OPTIONS(path string, handlers ...any) RouteDefinition
|
|
Any(path string, handlers ...any) []RouteDefinition
|
|
Routes() []RouteDefinition
|
|
Middlewares() []any
|
|
Unregister(method, path string) bool
|
|
UnregisterByID(id uint64) bool
|
|
RegisterWhitelist(patterns ...string)
|
|
Whitelist() []string
|
|
IsWhitelisted(path string) bool
|
|
}
|
|
|
|
// RouterRegistry implements RouterExtension as the root route and middleware collector.
|
|
type RouterRegistry struct {
|
|
mu sync.RWMutex
|
|
nextID uint64
|
|
routes []RouteDefinition
|
|
middlewares []any
|
|
whitelist PathWhitelist
|
|
}
|
|
|
|
// NewRouterRegistry creates a new root router collector.
|
|
func NewRouterRegistry() *RouterRegistry {
|
|
return &RouterRegistry{}
|
|
}
|
|
|
|
// Use registers global middlewares to the router.
|
|
func (r *RouterRegistry) Use(middlewares ...any) {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
r.middlewares = append(r.middlewares, middlewares...)
|
|
}
|
|
|
|
// Middlewares returns a copy of registered root middlewares.
|
|
func (r *RouterRegistry) Middlewares() []any {
|
|
r.mu.RLock()
|
|
defer r.mu.RUnlock()
|
|
res := make([]any, len(r.middlewares))
|
|
copy(res, r.middlewares)
|
|
return res
|
|
}
|
|
|
|
// Group creates a new RouteGroup under the router.
|
|
func (r *RouterRegistry) Group(prefix string, middlewares ...any) RouterExtension {
|
|
return &RouterGroup{
|
|
registry: r,
|
|
prefix: cleanPath(prefix),
|
|
middlewares: middlewares,
|
|
}
|
|
}
|
|
|
|
// Handle registers a route with a custom HTTP method and handlers.
|
|
func (r *RouterRegistry) Handle(method, path string, handlers ...any) RouteDefinition {
|
|
return r.addRoute(method, cleanPath(path), handlers...)
|
|
}
|
|
|
|
// addRoute appends a route whose path is already normalised.
|
|
func (r *RouterRegistry) addRoute(method, fullPath string, handlers ...any) RouteDefinition {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
|
|
r.nextID++
|
|
rd := RouteDefinition{
|
|
ID: r.nextID,
|
|
Method: strings.ToUpper(method),
|
|
Path: fullPath,
|
|
Handlers: handlers,
|
|
Middlewares: append([]any(nil), r.middlewares...),
|
|
}
|
|
r.routes = append(r.routes, rd)
|
|
return rd
|
|
}
|
|
|
|
// Unregister removes a route matching method and path from the registry.
|
|
func (r *RouterRegistry) Unregister(method, path string) bool {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
|
|
targetMethod := strings.ToUpper(method)
|
|
targetPath := cleanPath(path)
|
|
|
|
for i, rd := range r.routes {
|
|
if rd.Method == targetMethod && rd.Path == targetPath {
|
|
r.routes = append(r.routes[:i], r.routes[i+1:]...)
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// UnregisterByID removes a route by its unique ID.
|
|
func (r *RouterRegistry) UnregisterByID(id uint64) bool {
|
|
r.mu.Lock()
|
|
defer r.mu.Unlock()
|
|
|
|
for i, rd := range r.routes {
|
|
if rd.ID == id {
|
|
r.routes = append(r.routes[:i], r.routes[i+1:]...)
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// GET registers a GET route.
|
|
func (r *RouterRegistry) GET(path string, handlers ...any) RouteDefinition {
|
|
return r.Handle("GET", path, handlers...)
|
|
}
|
|
|
|
// POST registers a POST route.
|
|
func (r *RouterRegistry) POST(path string, handlers ...any) RouteDefinition {
|
|
return r.Handle("POST", path, handlers...)
|
|
}
|
|
|
|
// PUT registers a PUT route.
|
|
func (r *RouterRegistry) PUT(path string, handlers ...any) RouteDefinition {
|
|
return r.Handle("PUT", path, handlers...)
|
|
}
|
|
|
|
// DELETE registers a DELETE route.
|
|
func (r *RouterRegistry) DELETE(path string, handlers ...any) RouteDefinition {
|
|
return r.Handle("DELETE", path, handlers...)
|
|
}
|
|
|
|
// PATCH registers a PATCH route.
|
|
func (r *RouterRegistry) PATCH(path string, handlers ...any) RouteDefinition {
|
|
return r.Handle("PATCH", path, handlers...)
|
|
}
|
|
|
|
// HEAD registers a HEAD route.
|
|
func (r *RouterRegistry) HEAD(path string, handlers ...any) RouteDefinition {
|
|
return r.Handle("HEAD", path, handlers...)
|
|
}
|
|
|
|
// OPTIONS registers an OPTIONS route.
|
|
func (r *RouterRegistry) OPTIONS(path string, handlers ...any) RouteDefinition {
|
|
return r.Handle("OPTIONS", path, handlers...)
|
|
}
|
|
|
|
// Any registers a route for standard HTTP methods.
|
|
func (r *RouterRegistry) Any(path string, handlers ...any) []RouteDefinition {
|
|
methods := []string{"GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS"}
|
|
defs := make([]RouteDefinition, 0, len(methods))
|
|
for _, m := range methods {
|
|
defs = append(defs, r.Handle(m, path, handlers...))
|
|
}
|
|
return defs
|
|
}
|
|
|
|
// Routes returns a copy of all collected RouteDefinitions.
|
|
func (r *RouterRegistry) Routes() []RouteDefinition {
|
|
r.mu.RLock()
|
|
defer r.mu.RUnlock()
|
|
res := make([]RouteDefinition, len(r.routes))
|
|
copy(res, r.routes)
|
|
return res
|
|
}
|
|
|
|
// RegisterWhitelist adds path patterns to the whitelist.
|
|
func (r *RouterRegistry) RegisterWhitelist(patterns ...string) {
|
|
r.whitelist.Add(patterns...)
|
|
}
|
|
|
|
// Whitelist returns a copy of all registered whitelist path patterns.
|
|
func (r *RouterRegistry) Whitelist() []string {
|
|
return r.whitelist.Patterns()
|
|
}
|
|
|
|
// IsWhitelisted checks if the given path matches any registered whitelist pattern.
|
|
func (r *RouterRegistry) IsWhitelisted(path string) bool {
|
|
return r.whitelist.Match(path)
|
|
}
|
|
|
|
// RouterGroup represents a scoped route group with a path prefix and group-level middlewares.
|
|
type RouterGroup struct {
|
|
registry *RouterRegistry
|
|
prefix string
|
|
middlewares []any
|
|
}
|
|
|
|
// Use adds middlewares to this group.
|
|
func (g *RouterGroup) Use(middlewares ...any) {
|
|
g.middlewares = append(g.middlewares, middlewares...)
|
|
}
|
|
|
|
// Group creates a nested RouteGroup.
|
|
func (g *RouterGroup) Group(prefix string, middlewares ...any) RouterExtension {
|
|
combinedPrefix := joinPaths(g.prefix, prefix)
|
|
combinedMiddlewares := make([]any, 0, len(g.middlewares)+len(middlewares))
|
|
combinedMiddlewares = append(combinedMiddlewares, g.middlewares...)
|
|
combinedMiddlewares = append(combinedMiddlewares, middlewares...)
|
|
|
|
return &RouterGroup{
|
|
registry: g.registry,
|
|
prefix: combinedPrefix,
|
|
middlewares: combinedMiddlewares,
|
|
}
|
|
}
|
|
|
|
// Handle registers a route under this group.
|
|
func (g *RouterGroup) Handle(method, path string, handlers ...any) RouteDefinition {
|
|
return g.addRoute(method, joinPaths(g.prefix, path), handlers...)
|
|
}
|
|
|
|
// addRoute appends a route under this group whose path is already joined.
|
|
func (g *RouterGroup) addRoute(method, fullPath string, handlers ...any) RouteDefinition {
|
|
g.registry.mu.Lock()
|
|
defer g.registry.mu.Unlock()
|
|
|
|
allMiddlewares := make([]any, 0, len(g.registry.middlewares)+len(g.middlewares))
|
|
allMiddlewares = append(allMiddlewares, g.registry.middlewares...)
|
|
allMiddlewares = append(allMiddlewares, g.middlewares...)
|
|
|
|
g.registry.nextID++
|
|
rd := RouteDefinition{
|
|
ID: g.registry.nextID,
|
|
Method: strings.ToUpper(method),
|
|
Path: fullPath,
|
|
Handlers: handlers,
|
|
Middlewares: allMiddlewares,
|
|
}
|
|
g.registry.routes = append(g.registry.routes, rd)
|
|
return rd
|
|
}
|
|
|
|
// Unregister removes a route under this group prefix matching method and path.
|
|
func (g *RouterGroup) Unregister(method, path string) bool {
|
|
fullPath := joinPaths(g.prefix, path)
|
|
return g.registry.Unregister(method, fullPath)
|
|
}
|
|
|
|
// UnregisterByID removes a route by its unique ID.
|
|
func (g *RouterGroup) UnregisterByID(id uint64) bool {
|
|
return g.registry.UnregisterByID(id)
|
|
}
|
|
|
|
// GET registers a GET route in this group.
|
|
func (g *RouterGroup) GET(path string, handlers ...any) RouteDefinition {
|
|
return g.Handle("GET", path, handlers...)
|
|
}
|
|
|
|
// POST registers a POST route in this group.
|
|
func (g *RouterGroup) POST(path string, handlers ...any) RouteDefinition {
|
|
return g.Handle("POST", path, handlers...)
|
|
}
|
|
|
|
// PUT registers a PUT route in this group.
|
|
func (g *RouterGroup) PUT(path string, handlers ...any) RouteDefinition {
|
|
return g.Handle("PUT", path, handlers...)
|
|
}
|
|
|
|
// DELETE registers a DELETE route in this group.
|
|
func (g *RouterGroup) DELETE(path string, handlers ...any) RouteDefinition {
|
|
return g.Handle("DELETE", path, handlers...)
|
|
}
|
|
|
|
// PATCH registers a PATCH route in this group.
|
|
func (g *RouterGroup) PATCH(path string, handlers ...any) RouteDefinition {
|
|
return g.Handle("PATCH", path, handlers...)
|
|
}
|
|
|
|
// HEAD registers a HEAD route in this group.
|
|
func (g *RouterGroup) HEAD(path string, handlers ...any) RouteDefinition {
|
|
return g.Handle("HEAD", path, handlers...)
|
|
}
|
|
|
|
// OPTIONS registers an OPTIONS route in this group.
|
|
func (g *RouterGroup) OPTIONS(path string, handlers ...any) RouteDefinition {
|
|
return g.Handle("OPTIONS", path, handlers...)
|
|
}
|
|
|
|
// Any registers a route in this group for standard HTTP methods.
|
|
func (g *RouterGroup) Any(path string, handlers ...any) []RouteDefinition {
|
|
methods := []string{"GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS"}
|
|
defs := make([]RouteDefinition, 0, len(methods))
|
|
for _, m := range methods {
|
|
defs = append(defs, g.Handle(m, path, handlers...))
|
|
}
|
|
return defs
|
|
}
|
|
|
|
// Routes returns all routes from the parent registry.
|
|
func (g *RouterGroup) Routes() []RouteDefinition {
|
|
return g.registry.Routes()
|
|
}
|
|
|
|
// Middlewares returns a copy of the group's middlewares.
|
|
func (g *RouterGroup) Middlewares() []any {
|
|
res := make([]any, len(g.middlewares))
|
|
copy(res, g.middlewares)
|
|
return res
|
|
}
|
|
|
|
// RegisterWhitelist adds path patterns under this group prefix to the whitelist.
|
|
func (g *RouterGroup) RegisterWhitelist(patterns ...string) {
|
|
for _, p := range patterns {
|
|
g.registry.RegisterWhitelist(joinPaths(g.prefix, p))
|
|
}
|
|
}
|
|
|
|
// Whitelist returns a copy of all registered whitelist path patterns.
|
|
func (g *RouterGroup) Whitelist() []string {
|
|
return g.registry.Whitelist()
|
|
}
|
|
|
|
// IsWhitelisted checks if the given path matches any registered whitelist pattern.
|
|
func (g *RouterGroup) IsWhitelisted(path string) bool {
|
|
return g.registry.IsWhitelisted(path)
|
|
}
|
|
|
|
func cleanPath(p string) string {
|
|
if p == "" {
|
|
return "/"
|
|
}
|
|
if !strings.HasPrefix(p, "/") {
|
|
p = "/" + p
|
|
}
|
|
if len(p) > 1 && strings.HasSuffix(p, "/") {
|
|
p = strings.TrimSuffix(p, "/")
|
|
}
|
|
return p
|
|
}
|
|
|
|
func joinPaths(base, relative string) string {
|
|
if base == "" || base == "/" {
|
|
return cleanPath(relative)
|
|
}
|
|
if relative == "" || relative == "/" {
|
|
return cleanPath(base)
|
|
}
|
|
base = strings.TrimSuffix(base, "/")
|
|
relative = strings.TrimPrefix(relative, "/")
|
|
return cleanPath(base + "/" + relative)
|
|
}
|
|
|
|
// MatchPathPattern checks if a URL path matches a pattern (supports exact match and wildcards).
|
|
func MatchPathPattern(pattern, path string) bool {
|
|
pattern = cleanPath(pattern)
|
|
path = cleanPath(path)
|
|
|
|
if pattern == path {
|
|
return true
|
|
}
|
|
|
|
// Suffix wildcard: /api/v1/oauth/* matches /api/v1/oauth and /api/v1/oauth/...
|
|
if strings.HasSuffix(pattern, "/*") {
|
|
prefix := strings.TrimSuffix(pattern, "/*")
|
|
if path == prefix || strings.HasPrefix(path, prefix+"/") {
|
|
return true
|
|
}
|
|
}
|
|
|
|
// Parameter wildcard: /api/v1/oauth/*/authorize or /api/v1/oauth/:source/authorize
|
|
patternParts := strings.Split(pattern, "/")
|
|
pathParts := strings.Split(path, "/")
|
|
if len(patternParts) == len(pathParts) {
|
|
matched := true
|
|
for i, part := range patternParts {
|
|
if part == "*" || strings.HasPrefix(part, ":") {
|
|
continue
|
|
}
|
|
if part != pathParts[i] {
|
|
matched = false
|
|
break
|
|
}
|
|
}
|
|
if matched {
|
|
return true
|
|
}
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
// compiledPattern holds a whitelist pattern with its per-request work already done.
|
|
type compiledPattern struct {
|
|
raw string // normalised pattern, reported back by Patterns
|
|
prefix string // non-empty when the pattern ends in "/*"
|
|
parts []string // normalised pattern split on "/"
|
|
}
|
|
|
|
// PathWhitelist matches request paths against a fixed set of patterns.
|
|
//
|
|
// Patterns are registered once during plugin Apply and never change afterwards, so
|
|
// normalising and splitting them on every request is wasted work. PathWhitelist
|
|
// does that once at registration instead. The zero value is ready to use.
|
|
type PathWhitelist struct {
|
|
mu sync.RWMutex
|
|
patterns []compiledPattern
|
|
}
|
|
|
|
// NewPathWhitelist returns a whitelist pre-populated with the given patterns.
|
|
func NewPathWhitelist(patterns ...string) *PathWhitelist {
|
|
w := &PathWhitelist{}
|
|
w.Add(patterns...)
|
|
return w
|
|
}
|
|
|
|
// compilePatterns normalises and splits each pattern once, ahead of any request.
|
|
func compilePatterns(patterns []string) []compiledPattern {
|
|
compiled := make([]compiledPattern, 0, len(patterns))
|
|
for _, p := range patterns {
|
|
clean := cleanPath(p)
|
|
cp := compiledPattern{raw: clean, parts: strings.Split(clean, "/")}
|
|
if strings.HasSuffix(clean, "/*") {
|
|
cp.prefix = strings.TrimSuffix(clean, "/*")
|
|
}
|
|
compiled = append(compiled, cp)
|
|
}
|
|
return compiled
|
|
}
|
|
|
|
// Add appends patterns, normalising and splitting each now rather than per request.
|
|
func (w *PathWhitelist) Add(patterns ...string) {
|
|
if len(patterns) == 0 {
|
|
return
|
|
}
|
|
compiled := compilePatterns(patterns)
|
|
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
w.patterns = append(w.patterns, compiled...)
|
|
}
|
|
|
|
// Replace discards any existing patterns and installs the given ones, for callers
|
|
// whose configuration is a full swap rather than an incremental registration.
|
|
func (w *PathWhitelist) Replace(patterns ...string) {
|
|
compiled := compilePatterns(patterns)
|
|
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
w.patterns = compiled
|
|
}
|
|
|
|
// Match reports whether path matches any registered pattern. Equivalent to calling
|
|
// MatchPathPattern for every pattern, except the path is normalised and split once.
|
|
func (w *PathWhitelist) Match(path string) bool {
|
|
clean := cleanPath(path)
|
|
pathParts := strings.Split(clean, "/")
|
|
|
|
w.mu.RLock()
|
|
defer w.mu.RUnlock()
|
|
for i := range w.patterns {
|
|
p := &w.patterns[i]
|
|
if p.raw == clean {
|
|
return true
|
|
}
|
|
// A suffix wildcard matches both the bare prefix and anything below it.
|
|
if p.prefix != "" && (clean == p.prefix || strings.HasPrefix(clean, p.prefix+"/")) {
|
|
return true
|
|
}
|
|
if len(p.parts) != len(pathParts) {
|
|
continue
|
|
}
|
|
if matchSegments(p.parts, pathParts) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// matchSegments compares an already-split pattern against an already-split path.
|
|
func matchSegments(patternParts, pathParts []string) bool {
|
|
for i, part := range patternParts {
|
|
if part == "*" || strings.HasPrefix(part, ":") {
|
|
continue
|
|
}
|
|
if part != pathParts[i] {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
// Patterns returns a copy of the registered patterns in registration order.
|
|
func (w *PathWhitelist) Patterns() []string {
|
|
w.mu.RLock()
|
|
defer w.mu.RUnlock()
|
|
res := make([]string, len(w.patterns))
|
|
for i := range w.patterns {
|
|
res[i] = w.patterns[i].raw
|
|
}
|
|
return res
|
|
}
|
|
|
|
// ─── Raw path registration ────────────────────────────────────────────────────
|
|
|
|
// ensureLeadingSlash normalises a path to start with exactly one "/" while
|
|
// preserving any trailing slash (unlike cleanPath).
|
|
func ensureLeadingSlash(p string) string {
|
|
if p == "" {
|
|
return "/"
|
|
}
|
|
if !strings.HasPrefix(p, "/") {
|
|
return "/" + p
|
|
}
|
|
return p
|
|
}
|
|
|
|
// joinPathPreservingTrailing joins a group prefix and a relative path without
|
|
// stripping a trailing slash, so a group "/x" can serve both "/x" and "/x/".
|
|
func joinPathPreservingTrailing(base, relative string) string {
|
|
rel := ensureLeadingSlash(relative)
|
|
if base == "" || base == "/" {
|
|
return rel
|
|
}
|
|
return strings.TrimSuffix(cleanPath(base), "/") + rel
|
|
}
|
|
|
|
// HandleRaw registers a route on the root registry, preserving a trailing slash.
|
|
func (r *RouterRegistry) HandleRaw(method, path string, handlers ...any) RouteDefinition {
|
|
return r.addRoute(method, ensureLeadingSlash(path), handlers...)
|
|
}
|
|
|
|
// BasePath returns "" because the root registry has no prefix.
|
|
func (r *RouterRegistry) BasePath() string { return "" }
|
|
|
|
// HandleRaw registers a route under this group, preserving a trailing slash.
|
|
func (g *RouterGroup) HandleRaw(method, path string, handlers ...any) RouteDefinition {
|
|
return g.addRoute(method, joinPathPreservingTrailing(g.prefix, path), handlers...)
|
|
}
|
|
|
|
// BasePath returns this group's absolute prefix.
|
|
func (g *RouterGroup) BasePath() string { return g.prefix }
|