@reglow/reglow 0.4.5 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +76 -16
- package/dist/reglow/common/sort.d.ts +66 -0
- package/dist/reglow/common/sort.js +102 -0
- package/dist/reglow/common/sort.js.map +1 -0
- package/dist/reglow/core/config.d.ts +3 -0
- package/dist/reglow/core/config.js +11 -1
- package/dist/reglow/core/config.js.map +1 -1
- package/dist/reglow/core/models.d.ts +2 -0
- package/dist/reglow/core/models.js +1 -0
- package/dist/reglow/core/models.js.map +1 -1
- package/dist/reglow/core/tenant_guard.d.ts +26 -0
- package/dist/reglow/core/tenant_guard.js +116 -0
- package/dist/reglow/core/tenant_guard.js.map +1 -0
- package/dist/reglow/modules/agreement/controller.js +48 -15
- package/dist/reglow/modules/agreement/controller.js.map +1 -1
- package/dist/reglow/modules/agreement/repository.d.ts +6 -2
- package/dist/reglow/modules/agreement/repository.js +50 -10
- package/dist/reglow/modules/agreement/repository.js.map +1 -1
- package/dist/reglow/modules/agreement/service.d.ts +2 -2
- package/dist/reglow/modules/agreement/service.js +4 -4
- package/dist/reglow/modules/agreement/service.js.map +1 -1
- package/dist/reglow/modules/ai/controller.js +22 -7
- package/dist/reglow/modules/ai/controller.js.map +1 -1
- package/dist/reglow/modules/article/controller.js +65 -18
- package/dist/reglow/modules/article/controller.js.map +1 -1
- package/dist/reglow/modules/article/repository.d.ts +6 -2
- package/dist/reglow/modules/article/repository.js +48 -10
- package/dist/reglow/modules/article/repository.js.map +1 -1
- package/dist/reglow/modules/article/service.d.ts +2 -2
- package/dist/reglow/modules/article/service.js +10 -8
- package/dist/reglow/modules/article/service.js.map +1 -1
- package/dist/reglow/modules/config/controller.js +1 -1
- package/dist/reglow/modules/config/controller.js.map +1 -1
- package/dist/reglow/modules/config/repository.d.ts +3 -1
- package/dist/reglow/modules/config/repository.js +18 -4
- package/dist/reglow/modules/config/repository.js.map +1 -1
- package/dist/reglow/modules/customer_service/controller.js +77 -23
- package/dist/reglow/modules/customer_service/controller.js.map +1 -1
- package/dist/reglow/modules/customer_service/repository.d.ts +15 -5
- package/dist/reglow/modules/customer_service/repository.js +93 -15
- package/dist/reglow/modules/customer_service/repository.js.map +1 -1
- package/dist/reglow/modules/customer_service/service.d.ts +5 -5
- package/dist/reglow/modules/customer_service/service.js +10 -10
- package/dist/reglow/modules/customer_service/service.js.map +1 -1
- package/dist/reglow/modules/dashboard/controller.d.ts +6 -0
- package/dist/reglow/modules/dashboard/controller.js +8 -0
- package/dist/reglow/modules/dashboard/controller.js.map +1 -0
- package/dist/reglow/modules/dashboard/router.d.ts +11 -0
- package/dist/reglow/modules/dashboard/router.js +9 -0
- package/dist/reglow/modules/dashboard/router.js.map +1 -0
- package/dist/reglow/modules/dashboard/service.d.ts +8 -0
- package/dist/reglow/modules/dashboard/service.js +34 -0
- package/dist/reglow/modules/dashboard/service.js.map +1 -0
- package/dist/reglow/modules/dept/controller.js +2 -2
- package/dist/reglow/modules/dept/controller.js.map +1 -1
- package/dist/reglow/modules/dept/repository.d.ts +3 -1
- package/dist/reglow/modules/dept/repository.js +42 -5
- package/dist/reglow/modules/dept/repository.js.map +1 -1
- package/dist/reglow/modules/dept/service.d.ts +1 -1
- package/dist/reglow/modules/dept/service.js +2 -2
- package/dist/reglow/modules/dept/service.js.map +1 -1
- package/dist/reglow/modules/dict/controller.js +18 -6
- package/dist/reglow/modules/dict/controller.js.map +1 -1
- package/dist/reglow/modules/dict/repository.d.ts +6 -2
- package/dist/reglow/modules/dict/repository.js +28 -7
- package/dist/reglow/modules/dict/repository.js.map +1 -1
- package/dist/reglow/modules/dict/service.d.ts +2 -2
- package/dist/reglow/modules/dict/service.js +4 -4
- package/dist/reglow/modules/dict/service.js.map +1 -1
- package/dist/reglow/modules/employee/controller.js +1 -1
- package/dist/reglow/modules/employee/controller.js.map +1 -1
- package/dist/reglow/modules/employee/repository.d.ts +3 -1
- package/dist/reglow/modules/employee/repository.js +35 -4
- package/dist/reglow/modules/employee/repository.js.map +1 -1
- package/dist/reglow/modules/employee/service.d.ts +1 -1
- package/dist/reglow/modules/employee/service.js +2 -2
- package/dist/reglow/modules/employee/service.js.map +1 -1
- package/dist/reglow/modules/log/controller.js +46 -7
- package/dist/reglow/modules/log/controller.js.map +1 -1
- package/dist/reglow/modules/material/controller.js +32 -11
- package/dist/reglow/modules/material/controller.js.map +1 -1
- package/dist/reglow/modules/material/repository.d.ts +4 -2
- package/dist/reglow/modules/material/repository.js +24 -7
- package/dist/reglow/modules/material/repository.js.map +1 -1
- package/dist/reglow/modules/material/service.d.ts +2 -2
- package/dist/reglow/modules/material/service.js +11 -7
- package/dist/reglow/modules/material/service.js.map +1 -1
- package/dist/reglow/modules/menu/controller.js +1 -1
- package/dist/reglow/modules/menu/controller.js.map +1 -1
- package/dist/reglow/modules/message/controller.js +32 -13
- package/dist/reglow/modules/message/controller.js.map +1 -1
- package/dist/reglow/modules/message/repository.d.ts +7 -3
- package/dist/reglow/modules/message/repository.js +63 -19
- package/dist/reglow/modules/message/repository.js.map +1 -1
- package/dist/reglow/modules/message/service.d.ts +3 -3
- package/dist/reglow/modules/message/service.js +18 -8
- package/dist/reglow/modules/message/service.js.map +1 -1
- package/dist/reglow/modules/notice/controller.js +22 -7
- package/dist/reglow/modules/notice/controller.js.map +1 -1
- package/dist/reglow/modules/notice/repository.d.ts +4 -2
- package/dist/reglow/modules/notice/repository.js +24 -9
- package/dist/reglow/modules/notice/repository.js.map +1 -1
- package/dist/reglow/modules/notice/service.d.ts +2 -2
- package/dist/reglow/modules/notice/service.js +16 -7
- package/dist/reglow/modules/notice/service.js.map +1 -1
- package/dist/reglow/modules/photo/controller.js +52 -19
- package/dist/reglow/modules/photo/controller.js.map +1 -1
- package/dist/reglow/modules/photo/controller_client.js +37 -15
- package/dist/reglow/modules/photo/controller_client.js.map +1 -1
- package/dist/reglow/modules/photo/policy.d.ts +35 -0
- package/dist/reglow/modules/photo/policy.js +40 -0
- package/dist/reglow/modules/photo/policy.js.map +1 -0
- package/dist/reglow/modules/photo/repository.d.ts +6 -2
- package/dist/reglow/modules/photo/repository.js +53 -8
- package/dist/reglow/modules/photo/repository.js.map +1 -1
- package/dist/reglow/modules/photo/service.d.ts +2 -2
- package/dist/reglow/modules/photo/service.js +23 -11
- package/dist/reglow/modules/photo/service.js.map +1 -1
- package/dist/reglow/modules/post/controller.js +1 -1
- package/dist/reglow/modules/post/controller.js.map +1 -1
- package/dist/reglow/modules/post/repository.d.ts +3 -1
- package/dist/reglow/modules/post/repository.js +26 -6
- package/dist/reglow/modules/post/repository.js.map +1 -1
- package/dist/reglow/modules/post/service.d.ts +1 -1
- package/dist/reglow/modules/post/service.js +2 -2
- package/dist/reglow/modules/post/service.js.map +1 -1
- package/dist/reglow/modules/role/controller.js +1 -1
- package/dist/reglow/modules/role/controller.js.map +1 -1
- package/dist/reglow/modules/role/repository.d.ts +3 -1
- package/dist/reglow/modules/role/repository.js +38 -9
- package/dist/reglow/modules/role/repository.js.map +1 -1
- package/dist/reglow/modules/role/service.d.ts +1 -1
- package/dist/reglow/modules/role/service.js +2 -2
- package/dist/reglow/modules/role/service.js.map +1 -1
- package/dist/reglow/modules/security/audit_chain.d.ts +64 -0
- package/dist/reglow/modules/security/audit_chain.js +91 -0
- package/dist/reglow/modules/security/audit_chain.js.map +1 -0
- package/dist/reglow/modules/security/crypto.d.ts +18 -0
- package/dist/reglow/modules/security/crypto.js +78 -0
- package/dist/reglow/modules/security/crypto.js.map +1 -0
- package/dist/reglow/modules/security/repository.d.ts +6 -0
- package/dist/reglow/modules/security/repository.js +30 -0
- package/dist/reglow/modules/security/repository.js.map +1 -0
- package/dist/reglow/modules/user/controller.js +1 -1
- package/dist/reglow/modules/user/controller.js.map +1 -1
- package/dist/reglow/modules/user/repository.d.ts +3 -1
- package/dist/reglow/modules/user/repository.js +30 -3
- package/dist/reglow/modules/user/repository.js.map +1 -1
- package/dist/reglow/modules/user/service.d.ts +1 -1
- package/dist/reglow/modules/user/service.js +2 -2
- package/dist/reglow/modules/user/service.js.map +1 -1
- package/dist/reglow/modules/video/controller.js +67 -20
- package/dist/reglow/modules/video/controller.js.map +1 -1
- package/dist/reglow/modules/video/repository.d.ts +6 -2
- package/dist/reglow/modules/video/repository.js +41 -8
- package/dist/reglow/modules/video/repository.js.map +1 -1
- package/dist/reglow/modules/video/service.d.ts +2 -2
- package/dist/reglow/modules/video/service.js +16 -10
- package/dist/reglow/modules/video/service.js.map +1 -1
- package/dist/reglow/scripts/init-data.js +28 -1
- package/dist/reglow/scripts/init-data.js.map +1 -1
- package/dist/reglow/scripts/schema.js +16 -0
- package/dist/reglow/scripts/schema.js.map +1 -1
- package/dist/server.js +23 -1
- package/dist/server.js.map +1 -1
- package/package.json +7 -3
package/README.md
CHANGED
|
@@ -37,17 +37,18 @@ cp .env.example .env
|
|
|
37
37
|
|
|
38
38
|
关键配置项:
|
|
39
39
|
|
|
40
|
-
| 变量 | 说明
|
|
41
|
-
| --------------------------- |
|
|
42
|
-
| `PORT` | 服务端口
|
|
43
|
-
| `DB_DRIVER` | 数据库驱动 (`sqlite` / `mysql`)
|
|
44
|
-
| `DB_SQLITE_PATH` | SQLite 数据库文件路径
|
|
45
|
-
| `REDIS_URL` | Redis 连接地址
|
|
46
|
-
| `JWT_SECRET` | JWT 签名密钥
|
|
47
|
-
| `JWT_ACCESS_EXPIRE_MINUTES` | Access Token 过期时间(分钟)
|
|
48
|
-
| `CORS_ORIGINS` | 允许的跨域源(逗号分隔)
|
|
49
|
-
| `STORAGE_BACKEND` | 存储后端 (`local` / `s3`)
|
|
50
|
-
| `LOG_LEVEL` | 日志级别
|
|
40
|
+
| 变量 | 说明 | 默认值 |
|
|
41
|
+
| --------------------------- | -------------------------------- | -------------------------- |
|
|
42
|
+
| `PORT` | 服务端口 | `9520` |
|
|
43
|
+
| `DB_DRIVER` | 数据库驱动 (`sqlite` / `mysql`) | `sqlite` |
|
|
44
|
+
| `DB_SQLITE_PATH` | SQLite 数据库文件路径 | `./reglow_admin.db` |
|
|
45
|
+
| `REDIS_URL` | Redis 连接地址 | `redis://localhost:6379/0` |
|
|
46
|
+
| `JWT_SECRET` | JWT 签名密钥 | `change-me-in-production` |
|
|
47
|
+
| `JWT_ACCESS_EXPIRE_MINUTES` | Access Token 过期时间(分钟) | `120` |
|
|
48
|
+
| `CORS_ORIGINS` | 允许的跨域源(逗号分隔) | `http://localhost:5173` |
|
|
49
|
+
| `STORAGE_BACKEND` | 存储后端 (`local` / `s3`) | `local` |
|
|
50
|
+
| `LOG_LEVEL` | 日志级别 | `INFO` |
|
|
51
|
+
| `TENANT_GUARD` | 多租户错配自检 (`enforce`/`off`) | `enforce` |
|
|
51
52
|
|
|
52
53
|
### 启动
|
|
53
54
|
|
|
@@ -62,12 +63,20 @@ npm run build
|
|
|
62
63
|
npm start
|
|
63
64
|
```
|
|
64
65
|
|
|
65
|
-
|
|
66
|
+
启动后访问(默认端口 `9520`):
|
|
66
67
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
68
|
+
| 服务 | 地址 |
|
|
69
|
+
| ------------- | ---------------------------------------- |
|
|
70
|
+
| Swagger UI | http://localhost:9520/docs |
|
|
71
|
+
| Scalar 调试台 | http://localhost:9520/scalar |
|
|
72
|
+
| OpenAPI JSON | http://localhost:9520/documentation/json |
|
|
73
|
+
| 管理端 API | http://localhost:9520/admin/api/v1 |
|
|
74
|
+
| 用户端 API | http://localhost:9520/api/v1 |
|
|
75
|
+
| 健康检查 | http://localhost:9520/health |
|
|
76
|
+
| 指标监控 | http://localhost:9520/metrics |
|
|
77
|
+
|
|
78
|
+
> 文档页(`docs` / `scalar`)按部署环境自动开关:开发(`APP_ENV` 未设置或 `dev`)默认开,生产(`APP_ENV=production`)默认关;
|
|
79
|
+
> 显式设置 `DEBUG` 永远优先;`scalar` 的 OpenAPI 也可经 `http://localhost:9520/scalar/openapi.json` 获取。
|
|
71
80
|
|
|
72
81
|
## 目录结构
|
|
73
82
|
|
|
@@ -194,6 +203,50 @@ reglow/
|
|
|
194
203
|
}
|
|
195
204
|
```
|
|
196
205
|
|
|
206
|
+
### 分页排序(`sort_by` / `sort_order`)
|
|
207
|
+
|
|
208
|
+
所有**管理端分页列表接口**统一支持服务端**多列**排序,通过以下两个可选查询参数控制:
|
|
209
|
+
|
|
210
|
+
| 参数 | 类型 | 默认值 | 取值约束 |
|
|
211
|
+
| ------------ | ------ | ------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
212
|
+
| `sort_by` | string | 无 | 排序字段列表,逗号分隔,**最多 3 项**(超出 3 项的尾部直接忽略)。每项为 `field` 或 `field:dir`(`dir` = `asc` \| `desc`,大小写不敏感,`:dir` 可省略)。字段取该列表项 item DTO 的 **snake_case** 字段名(即数据库列名风格),精确匹配、大小写敏感;仅接受该表**自有**列(不含关联/join 列),且排除敏感列 |
|
|
213
|
+
| `sort_order` | string | `asc` | `asc` \| `desc`,大小写不敏感;作为**未显式带 `:dir` 的项**的默认方向 |
|
|
214
|
+
|
|
215
|
+
生效规则:
|
|
216
|
+
|
|
217
|
+
- **逐项校验**:每一项字段都必须命中该表的可排序列白名单(实体自有列、且排除敏感列);非法 / 敏感 / 未知字段只**跳过该项**,其余合法项照常生效,**不报错、不返回 400/500**;
|
|
218
|
+
- 一个合法项都没有(`sort_by` 缺省 / 空串 / 全部非法或敏感)→ **完全忽略**排序参数,接口保持原有默认排序,SQL 与响应与不带该参数时完全一致,**不报错、不返回 400**;
|
|
219
|
+
- 排序生效时:按合法项的**书写顺序**依次作为**主 → 次 → 末**排序,末尾再追加该接口**原有默认排序链**兜底,保证分页稳定、结果确定;
|
|
220
|
+
- 旧单列写法 `?sort_by=created_at&sort_order=desc` 继续有效(等价于单列,行为、SQL、响应与之前完全一致);
|
|
221
|
+
- 可排序列白名单在各自模块的 repository 中显式声明(如 `USER_SORTABLE_COLUMNS`),用户输入的每一项都先经白名单解析为真实列名常量再交给 knex,永不直接拼入 `ORDER BY`。
|
|
222
|
+
|
|
223
|
+
敏感列(即使存在也禁止排序):`password`、`password_hash`、`salt`、`token`、`refresh_token`、`access_token`、`secret`、`app_secret`、`api_key`、`private_key`。
|
|
224
|
+
|
|
225
|
+
示例:
|
|
226
|
+
|
|
227
|
+
```http
|
|
228
|
+
# 多列:昵称升序为主、创建时间降序为次,末尾追加接口原有默认排序(id desc)兜底
|
|
229
|
+
GET /admin/api/v1/users/?page=1&size=20&sort_by=nickname:asc,created_at:desc
|
|
230
|
+
|
|
231
|
+
# 混合省略方向:两项均未带 :dir,统一使用 sort_order(此处 asc)
|
|
232
|
+
GET /admin/api/v1/users/?page=1&size=20&sort_by=nickname,created_at&sort_order=asc
|
|
233
|
+
|
|
234
|
+
# 旧单列写法:行为、SQL、响应与不带 :dir 的单列完全一致
|
|
235
|
+
GET /admin/api/v1/users/?sort_by=created_at&sort_order=desc
|
|
236
|
+
|
|
237
|
+
# 含敏感列:仅跳过 password_hash,仍按 nickname 降序
|
|
238
|
+
GET /admin/api/v1/users/?sort_by=password_hash,nickname:desc
|
|
239
|
+
|
|
240
|
+
# 方向大小写不敏感
|
|
241
|
+
GET /admin/api/v1/dict-types/?page=1&size=10&sort_by=name:DESC
|
|
242
|
+
|
|
243
|
+
# 超过 3 项:只取前 3 项,尾部忽略
|
|
244
|
+
GET /admin/api/v1/users/?sort_by=status:asc,nickname:desc,created_at:asc,id:asc
|
|
245
|
+
|
|
246
|
+
# 全部非法:忽略排序,回落接口原有默认排序,不报错
|
|
247
|
+
GET /admin/api/v1/users/?sort_by=password_hash,not_a_column
|
|
248
|
+
```
|
|
249
|
+
|
|
197
250
|
### 异常码体系
|
|
198
251
|
|
|
199
252
|
按模块分段的统一异常码,覆盖 `1000-9999` 范围,详见 `reglow/common/errors.ts`。
|
|
@@ -258,10 +311,17 @@ npm run dev
|
|
|
258
311
|
# 类型检查
|
|
259
312
|
npm run type-check
|
|
260
313
|
|
|
314
|
+
# 单元/契约测试(排序契约)
|
|
315
|
+
npm test
|
|
316
|
+
|
|
261
317
|
# 编译
|
|
262
318
|
npm run build
|
|
263
319
|
```
|
|
264
320
|
|
|
321
|
+
> 说明:`npm test` 使用临时 SQLite 数据库运行排序契约测试(`tests/sort.test.ts`)。
|
|
322
|
+
> 由于 `better-sqlite3` 为原生模块,请使用与其编译时的 ABI 相匹配的 Node 版本
|
|
323
|
+
> (本仓库预编译版本对应 Node 20;若 Node 版本不一致,可执行 `npm rebuild better-sqlite3`)。
|
|
324
|
+
|
|
265
325
|
## License
|
|
266
326
|
|
|
267
327
|
UNLICENSED
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 管理端分页列表统一服务端排序工具(支持多列)。
|
|
3
|
+
*
|
|
4
|
+
* 统一契约(四端一致):
|
|
5
|
+
* - `sort_by`:排序字段列表,逗号分隔,**最多 3 项**(超出部分直接忽略);
|
|
6
|
+
* 每项为 `field` 或 `field:dir`(`dir` = `asc` | `desc`,大小写不敏感,`:dir` 可省略)。
|
|
7
|
+
* 字段名取列表项 item DTO 的 snake_case 字段名(即数据库列名风格),精确匹配、大小写敏感;
|
|
8
|
+
* 仅接受该实体(表)**自有**的列,不含关联/join 列或计算字段。
|
|
9
|
+
* 例:`?sort_by=nickname:asc,created_at:desc`
|
|
10
|
+
* - `sort_order`:`asc` | `desc`,大小写不敏感,默认 `asc`;作为「未显式带 `:dir` 的项」的默认方向。
|
|
11
|
+
* 旧写法 `?sort_by=created_at&sort_order=desc` 继续有效(等价于单列多列契约的第一项)。
|
|
12
|
+
* - **逐项校验**:字段必须命中 `allowed`(该表可排序列白名单)且非敏感列;
|
|
13
|
+
* 非法 / 敏感 / 未知字段:**跳过该项**,保留其余合法项(**不报错、不返回 400/500**);
|
|
14
|
+
* 一个合法项都没有 → **完全忽略**排序参数,保持调用方原有默认排序,不报错、不返回 400。
|
|
15
|
+
* - 生效时:按合法项的**书写顺序**依次作为主→次→末排序,最后追加该接口**原有默认排序链**
|
|
16
|
+
* (`defaultOrder`),保证分页稳定、结果确定。
|
|
17
|
+
* - 用户输入永不直接拼入 ORDER BY:每一项都必须先经 `allowed` 白名单解析为真实列名常量,
|
|
18
|
+
* 再交给 knex 的 `.orderBy(column, direction)`。
|
|
19
|
+
*
|
|
20
|
+
* 对应 backend-python 的 reglow/common/sort.py、backend-rust 的 src/common/sort.rs。
|
|
21
|
+
*/
|
|
22
|
+
import type { Knex } from "knex";
|
|
23
|
+
/** 最多允许的排序项数(`sort_by` 中超出 3 项的尾部直接忽略) */
|
|
24
|
+
export declare const MAX_SORT_ITEMS = 3;
|
|
25
|
+
/** 敏感列名单 —— 无论实体是否拥有该列,都不允许作为排序字段 */
|
|
26
|
+
export declare const SORTABLE_EXCLUDED: ReadonlySet<string>;
|
|
27
|
+
/** 是否为敏感列(不可作为排序字段) */
|
|
28
|
+
export declare function isSensitiveColumn(name: string): boolean;
|
|
29
|
+
/** 解析排序方向:`desc`(大小写不敏感),其它一律按 `asc` 处理 */
|
|
30
|
+
export declare function parseSortOrder(v?: string | null): "asc" | "desc";
|
|
31
|
+
/**
|
|
32
|
+
* 解析 `sort_by` 为排序项列表(仅做语法解析,**不做白名单/敏感列校验**)。
|
|
33
|
+
*
|
|
34
|
+
* - 逗号分隔,每项 `field` 或 `field:dir`;`dir` 大小写不敏感;
|
|
35
|
+
* - 未显式带 `:dir` 的项使用 `sortOrder`(默认 `asc`)作为方向;
|
|
36
|
+
* - 空项 / 空字段被忽略;最多返回 `MAX_SORT_ITEMS` 项(超出尾部忽略)。
|
|
37
|
+
*
|
|
38
|
+
* 白名单与敏感列校验由调用方(`applySort`)逐项进行。
|
|
39
|
+
*/
|
|
40
|
+
export declare function parseSortItems(sortBy: string | undefined | null, sortOrder: string | undefined | null): Array<{
|
|
41
|
+
field: string;
|
|
42
|
+
order: "asc" | "desc";
|
|
43
|
+
}>;
|
|
44
|
+
/**
|
|
45
|
+
* 校验并解析**单列**排序规格(保留单列语义,供其它调用方使用)。
|
|
46
|
+
*
|
|
47
|
+
* 仅当 `sortBy` 是非空字符串、非敏感列、且落在 `allowed`(该表可排序列白名单)内时,
|
|
48
|
+
* 返回真实列名与方向;否则返回 `null`(调用方据此忽略排序参数,保持默认排序)。
|
|
49
|
+
*/
|
|
50
|
+
export declare function resolveSort(sortBy: string | undefined | null, sortOrder: string | undefined | null, allowed: readonly string[]): {
|
|
51
|
+
column: string;
|
|
52
|
+
order: "asc" | "desc";
|
|
53
|
+
} | null;
|
|
54
|
+
/**
|
|
55
|
+
* 为分页查询应用统一排序,作为各列表接口的唯一入口。
|
|
56
|
+
*
|
|
57
|
+
* - 逐项解析 `sort_by`,对每个合法项(命中 `allowed` 且非敏感列)按书写顺序
|
|
58
|
+
* `.orderBy(<真实列>, <方向>)`,最后追加 `defaultOrder`(分页稳定兜底);
|
|
59
|
+
* - 无任何合法项(缺省 / 空串 / 全部非法或敏感):只追加 `defaultOrder`
|
|
60
|
+
* (生成的 SQL 与不带排序参数时完全一致)。
|
|
61
|
+
*
|
|
62
|
+
* `columnPrefix` 为可选参数:当列表查询存在 join、列名可能产生歧义时(如员工列表、
|
|
63
|
+
* 客服会话列表),传入所属表名以限定列(如 `${Employee}.id`);前缀只加在白名单解析出的
|
|
64
|
+
* 真实列上。不带 join 的查询无需传入。
|
|
65
|
+
*/
|
|
66
|
+
export declare function applySort<T extends Knex.QueryBuilder>(qb: T, sortBy: string | undefined | null, sortOrder: string | undefined | null, allowed: readonly string[], defaultOrder: ReadonlyArray<[string, "asc" | "desc"]>, columnPrefix?: string): T;
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
/** 最多允许的排序项数(`sort_by` 中超出 3 项的尾部直接忽略) */
|
|
2
|
+
export const MAX_SORT_ITEMS = 3;
|
|
3
|
+
/** 敏感列名单 —— 无论实体是否拥有该列,都不允许作为排序字段 */
|
|
4
|
+
export const SORTABLE_EXCLUDED = new Set([
|
|
5
|
+
"password",
|
|
6
|
+
"password_hash",
|
|
7
|
+
"salt",
|
|
8
|
+
"token",
|
|
9
|
+
"refresh_token",
|
|
10
|
+
"access_token",
|
|
11
|
+
"secret",
|
|
12
|
+
"app_secret",
|
|
13
|
+
"api_key",
|
|
14
|
+
"private_key",
|
|
15
|
+
]);
|
|
16
|
+
/** 是否为敏感列(不可作为排序字段) */
|
|
17
|
+
export function isSensitiveColumn(name) {
|
|
18
|
+
if (typeof name !== "string")
|
|
19
|
+
return false;
|
|
20
|
+
return SORTABLE_EXCLUDED.has(name.trim().toLowerCase());
|
|
21
|
+
}
|
|
22
|
+
/** 解析排序方向:`desc`(大小写不敏感),其它一律按 `asc` 处理 */
|
|
23
|
+
export function parseSortOrder(v) {
|
|
24
|
+
if (typeof v === "string" && v.trim().toLowerCase() === "desc")
|
|
25
|
+
return "desc";
|
|
26
|
+
return "asc";
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* 解析 `sort_by` 为排序项列表(仅做语法解析,**不做白名单/敏感列校验**)。
|
|
30
|
+
*
|
|
31
|
+
* - 逗号分隔,每项 `field` 或 `field:dir`;`dir` 大小写不敏感;
|
|
32
|
+
* - 未显式带 `:dir` 的项使用 `sortOrder`(默认 `asc`)作为方向;
|
|
33
|
+
* - 空项 / 空字段被忽略;最多返回 `MAX_SORT_ITEMS` 项(超出尾部忽略)。
|
|
34
|
+
*
|
|
35
|
+
* 白名单与敏感列校验由调用方(`applySort`)逐项进行。
|
|
36
|
+
*/
|
|
37
|
+
export function parseSortItems(sortBy, sortOrder) {
|
|
38
|
+
if (typeof sortBy !== "string")
|
|
39
|
+
return [];
|
|
40
|
+
const items = [];
|
|
41
|
+
for (const raw of sortBy.split(",")) {
|
|
42
|
+
const item = raw.trim();
|
|
43
|
+
if (!item)
|
|
44
|
+
continue;
|
|
45
|
+
const sep = item.indexOf(":");
|
|
46
|
+
const field = (sep >= 0 ? item.slice(0, sep) : item).trim();
|
|
47
|
+
if (!field)
|
|
48
|
+
continue;
|
|
49
|
+
const explicitDir = sep >= 0 ? item.slice(sep + 1).trim() : "";
|
|
50
|
+
const order = explicitDir
|
|
51
|
+
? parseSortOrder(explicitDir)
|
|
52
|
+
: parseSortOrder(sortOrder);
|
|
53
|
+
items.push({ field, order });
|
|
54
|
+
if (items.length >= MAX_SORT_ITEMS)
|
|
55
|
+
break;
|
|
56
|
+
}
|
|
57
|
+
return items;
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* 校验并解析**单列**排序规格(保留单列语义,供其它调用方使用)。
|
|
61
|
+
*
|
|
62
|
+
* 仅当 `sortBy` 是非空字符串、非敏感列、且落在 `allowed`(该表可排序列白名单)内时,
|
|
63
|
+
* 返回真实列名与方向;否则返回 `null`(调用方据此忽略排序参数,保持默认排序)。
|
|
64
|
+
*/
|
|
65
|
+
export function resolveSort(sortBy, sortOrder, allowed) {
|
|
66
|
+
if (typeof sortBy !== "string")
|
|
67
|
+
return null;
|
|
68
|
+
const name = sortBy.trim();
|
|
69
|
+
if (!name || isSensitiveColumn(name))
|
|
70
|
+
return null;
|
|
71
|
+
if (!allowed.includes(name))
|
|
72
|
+
return null;
|
|
73
|
+
return { column: name, order: parseSortOrder(sortOrder) };
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* 为分页查询应用统一排序,作为各列表接口的唯一入口。
|
|
77
|
+
*
|
|
78
|
+
* - 逐项解析 `sort_by`,对每个合法项(命中 `allowed` 且非敏感列)按书写顺序
|
|
79
|
+
* `.orderBy(<真实列>, <方向>)`,最后追加 `defaultOrder`(分页稳定兜底);
|
|
80
|
+
* - 无任何合法项(缺省 / 空串 / 全部非法或敏感):只追加 `defaultOrder`
|
|
81
|
+
* (生成的 SQL 与不带排序参数时完全一致)。
|
|
82
|
+
*
|
|
83
|
+
* `columnPrefix` 为可选参数:当列表查询存在 join、列名可能产生歧义时(如员工列表、
|
|
84
|
+
* 客服会话列表),传入所属表名以限定列(如 `${Employee}.id`);前缀只加在白名单解析出的
|
|
85
|
+
* 真实列上。不带 join 的查询无需传入。
|
|
86
|
+
*/
|
|
87
|
+
export function applySort(qb, sortBy, sortOrder, allowed, defaultOrder, columnPrefix) {
|
|
88
|
+
let query = qb;
|
|
89
|
+
for (const { field, order } of parseSortItems(sortBy, sortOrder)) {
|
|
90
|
+
if (isSensitiveColumn(field))
|
|
91
|
+
continue;
|
|
92
|
+
if (!allowed.includes(field))
|
|
93
|
+
continue;
|
|
94
|
+
const column = columnPrefix ? `${columnPrefix}.${field}` : field;
|
|
95
|
+
query = query.orderBy(column, order);
|
|
96
|
+
}
|
|
97
|
+
for (const [column, order] of defaultOrder) {
|
|
98
|
+
query = query.orderBy(column, order);
|
|
99
|
+
}
|
|
100
|
+
return query;
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=sort.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sort.js","sourceRoot":"","sources":["../../../reglow/common/sort.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ interface DeviceSessionConfig {
|
|
|
6
6
|
export interface AppSettings {
|
|
7
7
|
APP_NAME: string;
|
|
8
8
|
APP_VERSION: string;
|
|
9
|
+
APP_ENV: string;
|
|
9
10
|
DEBUG: boolean;
|
|
10
11
|
PORT: number;
|
|
11
12
|
DB_DRIVER: string;
|
|
@@ -30,6 +31,8 @@ export interface AppSettings {
|
|
|
30
31
|
S3_BUCKET: string;
|
|
31
32
|
S3_REGION: string;
|
|
32
33
|
CDN_DOMAIN: string;
|
|
34
|
+
/** 加密 provider:auto / sha256 / sm(对齐 Python 的 SECURITY_CRYPTO_PROVIDER) */
|
|
35
|
+
SECURITY_CRYPTO_PROVIDER: string;
|
|
33
36
|
LOG_LEVEL: string;
|
|
34
37
|
LOG_DIR: string;
|
|
35
38
|
LOG_FILE_MAX_BYTES: number;
|
|
@@ -31,7 +31,8 @@ const JWT_SECRET = str(env.JWT_SECRET, "change-me-in-production");
|
|
|
31
31
|
const settings = {
|
|
32
32
|
// Application
|
|
33
33
|
APP_NAME: str(env.APP_NAME, "ReglowAdmin"),
|
|
34
|
-
APP_VERSION: str(env.APP_VERSION, "0.
|
|
34
|
+
APP_VERSION: str(env.APP_VERSION, "0.6.0"),
|
|
35
|
+
APP_ENV: str(env.APP_ENV, "dev"),
|
|
35
36
|
DEBUG: bool(env.DEBUG, false),
|
|
36
37
|
PORT: int(env.PORT, 9520),
|
|
37
38
|
// Database
|
|
@@ -66,6 +67,8 @@ const settings = {
|
|
|
66
67
|
S3_BUCKET: str(env.S3_BUCKET, ""),
|
|
67
68
|
S3_REGION: str(env.S3_REGION, ""),
|
|
68
69
|
CDN_DOMAIN: str(env.CDN_DOMAIN, ""),
|
|
70
|
+
// 安全 / 等保:加密 provider(auto / sha256 / sm)
|
|
71
|
+
SECURITY_CRYPTO_PROVIDER: str(env.SECURITY_CRYPTO_PROVIDER, "auto"),
|
|
69
72
|
// Logging
|
|
70
73
|
LOG_LEVEL: str(env.LOG_LEVEL, "INFO"),
|
|
71
74
|
LOG_DIR: str(env.LOG_DIR, "./logs"),
|
|
@@ -79,5 +82,12 @@ const settings = {
|
|
|
79
82
|
user: { mobile: 3, tablet: 3, desktop: 3 },
|
|
80
83
|
},
|
|
81
84
|
};
|
|
85
|
+
// 按部署环境判定 DEBUG 默认值(显式设置的 DEBUG 永远优先):
|
|
86
|
+
// 开发(APP_ENV 未设置或为 dev/test)默认开 → /docs、/scalar 开箱即用;
|
|
87
|
+
// 生产(APP_ENV=production/prod)默认关。不再用 JWT_SECRET 是否配置来猜测环境。
|
|
88
|
+
if (process.env.DEBUG === undefined) {
|
|
89
|
+
const appEnv = settings.APP_ENV.toLowerCase();
|
|
90
|
+
settings.DEBUG = appEnv !== "production" && appEnv !== "prod";
|
|
91
|
+
}
|
|
82
92
|
export default settings;
|
|
83
93
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../reglow/core/config.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,SAAS,GAAG,CAAC,KAAc,EAAE,QAAQ,GAAG,EAAE;IACxC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC;IAC3D,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,GAAG,CAAC,KAAc,EAAE,QAAgB;IAC3C,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACtC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,IAAI,CAAC,KAAc,EAAE,QAAQ,GAAG,KAAK;IAC5C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC;IAC3D,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AAC1E,CAAC;AAED,SAAS,IAAI,CAAC,KAAc,EAAE,WAAqB,EAAE;IACnD,IAAI,CAAC,KAAK;QAAE,OAAO,QAAQ,CAAC;IAC5B,OAAO,MAAM,CAAC,KAAK,CAAC;SACjB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../reglow/core/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,7 @@ export declare const TableNames: {
|
|
|
47
47
|
readonly CSSession: "cs_session";
|
|
48
48
|
readonly CSAgent: "cs_agent";
|
|
49
49
|
readonly CSMessage: "cs_message";
|
|
50
|
+
readonly SecurityAuditLog: "sys_security_audit";
|
|
50
51
|
};
|
|
51
52
|
export type TableName = (typeof TableNames)[keyof typeof TableNames];
|
|
52
53
|
export declare const ModelRegistry: {
|
|
@@ -95,4 +96,5 @@ export declare const ModelRegistry: {
|
|
|
95
96
|
CSSession: "cs_session";
|
|
96
97
|
CSAgent: "cs_agent";
|
|
97
98
|
CSMessage: "cs_message";
|
|
99
|
+
SecurityAuditLog: "sys_security_audit";
|
|
98
100
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../reglow/core/models.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,QAAQ,EAAE,cAAc;IACxB,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,mBAAmB;IACjC,IAAI,EAAE,UAAU;IAChB,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,eAAe;IACzB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;IAEhB,SAAS,EAAE,YAAY;IACvB,UAAU,EAAE,aAAa;IACzB,YAAY,EAAE,mBAAmB;IACjC,QAAQ,EAAE,eAAe;IAEzB,IAAI,EAAE,UAAU;IAChB,SAAS,EAAE,gBAAgB;IAC3B,aAAa,EAAE,oBAAoB;IAEnC,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,eAAe;IAEzB,QAAQ,EAAE,cAAc;IACxB,aAAa,EAAE,oBAAoB;IACnC,qBAAqB,EAAE,6BAA6B;IAEpD,OAAO,EAAE,aAAa;IACtB,eAAe,EAAE,sBAAsB;IACvC,MAAM,EAAE,YAAY;IACpB,UAAU,EAAE,iBAAiB;IAE7B,SAAS,EAAE,eAAe;IAC1B,gBAAgB,EAAE,uBAAuB;IAEzC,OAAO,EAAE,aAAa;IACtB,eAAe,EAAE,sBAAsB;IACvC,iBAAiB,EAAE,wBAAwB;IAE3C,KAAK,EAAE,WAAW;IAClB,UAAU,EAAE,iBAAiB;IAC7B,aAAa,EAAE,oBAAoB;IAEnC,KAAK,EAAE,WAAW;IAClB,aAAa,EAAE,oBAAoB;IACnC,eAAe,EAAE,sBAAsB;IAEvC,YAAY,EAAE,eAAe;IAE7B,QAAQ,EAAE,WAAW;IACrB,eAAe,EAAE,mBAAmB;IACpC,gBAAgB,EAAE,oBAAoB;IACtC,UAAU,EAAE,cAAc;IAC1B,SAAS,EAAE,YAAY;IACvB,OAAO,EAAE,UAAU;IACnB,SAAS,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../reglow/core/models.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,QAAQ,EAAE,cAAc;IACxB,YAAY,EAAE,mBAAmB;IACjC,YAAY,EAAE,mBAAmB;IACjC,IAAI,EAAE,UAAU;IAChB,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,eAAe;IACzB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,UAAU;IAEhB,SAAS,EAAE,YAAY;IACvB,UAAU,EAAE,aAAa;IACzB,YAAY,EAAE,mBAAmB;IACjC,QAAQ,EAAE,eAAe;IAEzB,IAAI,EAAE,UAAU;IAChB,SAAS,EAAE,gBAAgB;IAC3B,aAAa,EAAE,oBAAoB;IAEnC,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,eAAe;IAEzB,QAAQ,EAAE,cAAc;IACxB,aAAa,EAAE,oBAAoB;IACnC,qBAAqB,EAAE,6BAA6B;IAEpD,OAAO,EAAE,aAAa;IACtB,eAAe,EAAE,sBAAsB;IACvC,MAAM,EAAE,YAAY;IACpB,UAAU,EAAE,iBAAiB;IAE7B,SAAS,EAAE,eAAe;IAC1B,gBAAgB,EAAE,uBAAuB;IAEzC,OAAO,EAAE,aAAa;IACtB,eAAe,EAAE,sBAAsB;IACvC,iBAAiB,EAAE,wBAAwB;IAE3C,KAAK,EAAE,WAAW;IAClB,UAAU,EAAE,iBAAiB;IAC7B,aAAa,EAAE,oBAAoB;IAEnC,KAAK,EAAE,WAAW;IAClB,aAAa,EAAE,oBAAoB;IACnC,eAAe,EAAE,sBAAsB;IAEvC,YAAY,EAAE,eAAe;IAE7B,QAAQ,EAAE,WAAW;IACrB,eAAe,EAAE,mBAAmB;IACpC,gBAAgB,EAAE,oBAAoB;IACtC,UAAU,EAAE,cAAc;IAC1B,SAAS,EAAE,YAAY;IACvB,OAAO,EAAE,UAAU;IACnB,SAAS,EAAE,YAAY;IAEvB,gBAAgB,EAAE,oBAAoB;CAC9B,CAAC;AAIX,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,GAAG,UAAU;IACb,GAAG,CAAC,IAA6B;QAC/B,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/** 逃生阀取值:enforce(默认,命中即拒绝启动)/ off(仅输出 WARN,不阻断) */
|
|
2
|
+
export declare const TENANT_GUARD_ENFORCE = "enforce";
|
|
3
|
+
export declare const TENANT_GUARD_OFF = "off";
|
|
4
|
+
/** 自检结果:ok 通过 / warn 仅告警(逃生阀 off)/ block 拒绝启动 */
|
|
5
|
+
export interface TenantGuardOutcome {
|
|
6
|
+
level: "ok" | "warn" | "block";
|
|
7
|
+
tables: string[];
|
|
8
|
+
message: string;
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* 纯决策函数(零 IO)—— 由已有事实推出结论,便于单测钉死边界。
|
|
12
|
+
*
|
|
13
|
+
* @param hitTables 探测到 tenant_id 存在非空数据的表名
|
|
14
|
+
* @param isolationImplemented 本语言是否处于「已实现隔离的多租户模式」
|
|
15
|
+
* @param guardEnv 逃生阀取值(缺省 / 未知一律按 enforce 处理,即 fail-closed)
|
|
16
|
+
*/
|
|
17
|
+
export declare function decideTenantGuard(input: {
|
|
18
|
+
hitTables: string[];
|
|
19
|
+
isolationImplemented: boolean;
|
|
20
|
+
guardEnv?: string;
|
|
21
|
+
}): TenantGuardOutcome;
|
|
22
|
+
/**
|
|
23
|
+
* IO 层:启动时调用。
|
|
24
|
+
* 命中且 enforce 时**抛错**终止启动;off 时输出 WARN 但不阻断。
|
|
25
|
+
*/
|
|
26
|
+
export declare function assertTenantGuard(): Promise<TenantGuardOutcome>;
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
import settings from "./config.js";
|
|
2
|
+
import { logger } from "./logging.js";
|
|
3
|
+
import { ForbiddenException } from "../common/errors.js";
|
|
4
|
+
/** 逃生阀取值:enforce(默认,命中即拒绝启动)/ off(仅输出 WARN,不阻断) */
|
|
5
|
+
export const TENANT_GUARD_ENFORCE = "enforce";
|
|
6
|
+
export const TENANT_GUARD_OFF = "off";
|
|
7
|
+
/** node 恒为「未实现隔离」(契约 currentImpl.node.state = "none") */
|
|
8
|
+
const ISOLATION_IMPLEMENTED = false;
|
|
9
|
+
const ISOLATION_STATUS = '未实现(node 无 tenant 模块,contract/tenant.json 的 currentImpl.node.state = "none")';
|
|
10
|
+
/** 命中表名归一化:去空、去重、排序(输出稳定,可断言) */
|
|
11
|
+
function normalizeTables(tables) {
|
|
12
|
+
return [...new Set(tables.filter((t) => !!t))].sort();
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* 纯决策函数(零 IO)—— 由已有事实推出结论,便于单测钉死边界。
|
|
16
|
+
*
|
|
17
|
+
* @param hitTables 探测到 tenant_id 存在非空数据的表名
|
|
18
|
+
* @param isolationImplemented 本语言是否处于「已实现隔离的多租户模式」
|
|
19
|
+
* @param guardEnv 逃生阀取值(缺省 / 未知一律按 enforce 处理,即 fail-closed)
|
|
20
|
+
*/
|
|
21
|
+
export function decideTenantGuard(input) {
|
|
22
|
+
const tables = normalizeTables(input.hitTables);
|
|
23
|
+
// ② / ④ 库中无含 tenant_id 数据的表 → 通过
|
|
24
|
+
if (tables.length === 0) {
|
|
25
|
+
return {
|
|
26
|
+
level: "ok",
|
|
27
|
+
tables,
|
|
28
|
+
message: "多租户错配自检通过:库中不存在含 tenant_id 非空数据的表。",
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
const hit = tables.join(", ");
|
|
32
|
+
// 本语言已实现隔离的多租户模式 → 通过
|
|
33
|
+
if (input.isolationImplemented) {
|
|
34
|
+
return {
|
|
35
|
+
level: "ok",
|
|
36
|
+
tables,
|
|
37
|
+
message: `多租户错配自检通过:命中表 [${hit}] 含 tenant_id 数据,本语言已实现租户隔离。`,
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
// ⑤ 有租户数据但未实现隔离:默认拒绝启动,仅显式 off 才降级为 WARN(且必须留痕)
|
|
41
|
+
const guardEnv = (input.guardEnv ?? TENANT_GUARD_ENFORCE).trim().toLowerCase();
|
|
42
|
+
const isOff = guardEnv === TENANT_GUARD_OFF;
|
|
43
|
+
const lines = [
|
|
44
|
+
isOff
|
|
45
|
+
? "多租户错配自检被显式跳过(TENANT_GUARD=off),仅告警不阻断:"
|
|
46
|
+
: "多租户错配自检未通过,拒绝启动:",
|
|
47
|
+
// ① 命中的表名清单
|
|
48
|
+
` 命中表(tenant_id 存在非空数据): ${hit}`,
|
|
49
|
+
// ② 本语言隔离状态
|
|
50
|
+
` 本语言隔离状态: ${ISOLATION_STATUS}`,
|
|
51
|
+
// ③ 两条出路
|
|
52
|
+
" 出路: ① 改用单租户库(库中不含多租户数据);② 先实现租户隔离(含 tenant_id 表的查询强制注入过滤)后再接入本库。",
|
|
53
|
+
isOff
|
|
54
|
+
? " 风险: 该库若确为多租户库,涉及 tenant_id 表的查询将缺少过滤而返回全部租户数据。"
|
|
55
|
+
: " 若确认该库在单租户下运行、仅残留历史 tenant_id 数据,可显式设置 TENANT_GUARD=off 跳过本自检(将输出 WARN,不静默)。",
|
|
56
|
+
];
|
|
57
|
+
return { level: isOff ? "warn" : "block", tables, message: lines.join("\n") };
|
|
58
|
+
}
|
|
59
|
+
/** 从 knex 原始查询结果取数据行:mysql2 返回 [rows, fields],better-sqlite3 直接返回 rows */
|
|
60
|
+
function extractRows(result) {
|
|
61
|
+
if (Array.isArray(result) && Array.isArray(result[0])) {
|
|
62
|
+
return result[0];
|
|
63
|
+
}
|
|
64
|
+
return Array.isArray(result) ? result : [];
|
|
65
|
+
}
|
|
66
|
+
/** ① 找出库中所有含 tenant_id 列的表(按项目既有 DB_DRIVER 分支) */
|
|
67
|
+
async function findTablesWithTenantColumn(knex) {
|
|
68
|
+
if (settings.DB_DRIVER === "sqlite") {
|
|
69
|
+
const tables = extractRows(await knex.raw("SELECT name FROM sqlite_master WHERE type = 'table' AND name NOT LIKE 'sqlite_%' ORDER BY name"))
|
|
70
|
+
.map((r) => String(r.name))
|
|
71
|
+
.filter(Boolean);
|
|
72
|
+
const withColumn = [];
|
|
73
|
+
for (const t of tables) {
|
|
74
|
+
const cols = extractRows(await knex.raw("SELECT name FROM pragma_table_info(?) WHERE name = 'tenant_id'", [t]));
|
|
75
|
+
if (cols.length)
|
|
76
|
+
withColumn.push(t);
|
|
77
|
+
}
|
|
78
|
+
return withColumn;
|
|
79
|
+
}
|
|
80
|
+
// MySQL:限定当前库,避免误扫同实例其他库
|
|
81
|
+
const rows = extractRows(await knex.raw("SELECT table_name AS name FROM information_schema.columns " +
|
|
82
|
+
"WHERE table_schema = DATABASE() AND column_name = 'tenant_id' ORDER BY table_name"));
|
|
83
|
+
return rows.map((r) => String(r.name)).filter(Boolean);
|
|
84
|
+
}
|
|
85
|
+
/** ③ 逐表探测 tenant_id 非空的行(每表一条 SELECT 1 ... LIMIT 1) */
|
|
86
|
+
async function probeTenantData(knex, tables) {
|
|
87
|
+
const hit = [];
|
|
88
|
+
for (const t of tables) {
|
|
89
|
+
const rows = extractRows(await knex.raw("SELECT 1 FROM ?? WHERE tenant_id IS NOT NULL LIMIT 1", [t]));
|
|
90
|
+
if (rows.length)
|
|
91
|
+
hit.push(t);
|
|
92
|
+
}
|
|
93
|
+
return hit;
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* IO 层:启动时调用。
|
|
97
|
+
* 命中且 enforce 时**抛错**终止启动;off 时输出 WARN 但不阻断。
|
|
98
|
+
*/
|
|
99
|
+
export async function assertTenantGuard() {
|
|
100
|
+
const { knex } = await import("./database.js");
|
|
101
|
+
const candidates = await findTablesWithTenantColumn(knex);
|
|
102
|
+
const hitTables = await probeTenantData(knex, candidates);
|
|
103
|
+
const outcome = decideTenantGuard({
|
|
104
|
+
hitTables,
|
|
105
|
+
isolationImplemented: ISOLATION_IMPLEMENTED,
|
|
106
|
+
guardEnv: process.env.TENANT_GUARD,
|
|
107
|
+
});
|
|
108
|
+
if (outcome.level === "block") {
|
|
109
|
+
throw new ForbiddenException(outcome.message);
|
|
110
|
+
}
|
|
111
|
+
if (outcome.level === "warn") {
|
|
112
|
+
logger.warn(`[tenant-guard] ${outcome.message}`);
|
|
113
|
+
}
|
|
114
|
+
return outcome;
|
|
115
|
+
}
|
|
116
|
+
//# sourceMappingURL=tenant_guard.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant_guard.js","sourceRoot":"","sources":["../../../reglow/core/tenant_guard.ts"],"names":[],"mappings":"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"}
|