Compare commits
4
Commits
v1.0.3
..
ext-v1.0.4
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ec9718466d | ||
|
|
c5bb08022a | ||
|
|
b710745e88 | ||
|
|
5cf84fe9b7 |
No files matched your search
@@ -8,6 +8,26 @@
|
||||
|
||||
### Changed
|
||||
|
||||
## Ext pack v1.0.4 — 2026-09-17
|
||||
|
||||
### Highlights
|
||||
|
||||
**ext/web 能力面扩展(CLI 仍为 v1.0.3)**:可配置 RBAC、租户作用域、WS `on_message`/presence、原生 SPA 内存路由、协同记事本 MVP。安装:
|
||||
|
||||
```bash
|
||||
marqdo ext add web # CDN latest → 1.0.4
|
||||
```
|
||||
|
||||
### Added
|
||||
- **RBAC**:五表(`web_permissions` / `web_roles` / `web_role_permissions` / `web_users` / `web_user_roles`);`app.enable_rbac`、`app.gate permissions=`、`rbac.can`、注册页、`/_rbac/*` 管理 API/desk。
|
||||
- **Tenant**:`app.tenant`(path/header/subdomain)+ `tenant_scope` 自动过滤/盖戳。
|
||||
- **WebSocket G-WS2**:`route_ws` 支持 `on_message` 钩子、动态 room、`presence` 通道。
|
||||
- **Native SPA**:内存 `store_set` / `spa_goto` 与全页 WASM SPA 样站。
|
||||
- **Collab MVP**:LWW 文档协议(`DOC\t`)双端协同记事本样站。
|
||||
|
||||
### Changed
|
||||
- 扩展包 SemVer **1.0.4**(`ext/VERSION`);与 CLI **v1.0.3** 可独立安装。
|
||||
|
||||
## v1.0.3 — 2026-09-17
|
||||
|
||||
### Highlights
|
||||
|
||||
@@ -921,8 +921,23 @@ function runIntervalEffect(exports, spec, onError) {
|
||||
intervalHandles.set(id, handle);
|
||||
}
|
||||
|
||||
const memoryKV = new Map();
|
||||
|
||||
function storageStore(scope) {
|
||||
if (scope === "cookie") return null;
|
||||
if (scope === "memory" || scope === "mem" || scope === "内存") {
|
||||
return {
|
||||
getItem(key) {
|
||||
return memoryKV.has(key) ? memoryKV.get(key) : null;
|
||||
},
|
||||
setItem(key, value) {
|
||||
memoryKV.set(key, String(value));
|
||||
},
|
||||
removeItem(key) {
|
||||
memoryKV.delete(key);
|
||||
},
|
||||
};
|
||||
}
|
||||
if (typeof localStorage === "undefined") return null;
|
||||
return scope === "session" ? sessionStorage : localStorage;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
# Collaborative document MVP
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted · MVP (LWW)** |
|
||||
| 日期 | 2026-09-17 |
|
||||
|
||||
## Approach
|
||||
|
||||
Not a full CRDT. Peers sync plain text over `route_ws mode=room` with:
|
||||
|
||||
- Client → server: `DOC\\t<body>`
|
||||
- Server fan-out (existing G-WS1/2)
|
||||
- Apply remote if body ≠ local; `applying` flag suppresses echo
|
||||
- Presence JSON on `room.presence` (`presence=True`)
|
||||
|
||||
## Demo
|
||||
|
||||
`examples/web-collab-doc/` — open two browsers on the same room.
|
||||
@@ -0,0 +1,80 @@
|
||||
# `ext/web` 可配置 RBAC(角色 ⊥ 权限)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 验收 | qdqc:注册登录、评论、desk 内建角色/赋权;`tests/ext/web-rbac-*-smoke.mq.md` |
|
||||
| 状态 | **Accepted · 已落地核心**(HTTP register + `/_rbac/*` + gate permissions;样站 qdqc 已接线) |
|
||||
|
||||
---
|
||||
|
||||
## 0. 一句话
|
||||
|
||||
权限是原子能力(`resource:action`);角色是权限包;用户通过 `user_roles` 获得角色。门禁与业务都问 `can(user, permission)`。管理员可在后台新建角色、勾选权限、赋给用户——**禁止**只靠写死的 `role=admin|user` 字符串作为唯一模型(兼容期仍可读旧 `roles=` gate)。
|
||||
|
||||
---
|
||||
|
||||
## 1. 表结构(SQLite / Postgres 同构)
|
||||
|
||||
| 表 | 列 |
|
||||
|----|-----|
|
||||
| `web_permissions` | `code` PK, `resource`, `action`, `description` |
|
||||
| `web_roles` | `id` PK, `name` UNIQUE, `is_system` INT, `tenant_id` TEXT NULL |
|
||||
| `web_role_permissions` | `role_id`, `permission_code` PK(role_id, permission_code) |
|
||||
| `web_user_roles` | `user_id`, `role_id`, `tenant_id` TEXT NULL, PK(user_id, role_id, tenant_id) |
|
||||
| `web_users` | `id` PK, `username` UNIQUE, `password_hash`, `created_at` |
|
||||
|
||||
命名带 `web_` 前缀,避免与业务表冲突。站点也可映射自定义表名(后期);首版固定。
|
||||
|
||||
---
|
||||
|
||||
## 2. 权限码约定
|
||||
|
||||
形如 `comments:create`、`desk:access`、`roles:manage`。内置种子见 `DefaultCatalog`。`*` 或角色名 `superadmin` / 兼容 `admin`:登录时展开为目录全集。
|
||||
|
||||
---
|
||||
|
||||
## 3. 作者 API
|
||||
|
||||
```markdown
|
||||
**`应用` = > `应用`.权限 确保结构=真 目录=`权限目录`**
|
||||
**`应用` = > `应用`.门禁 路径="/desk" 权限="desk:access" 匹配="prefix" 拒绝="redirect"**
|
||||
**`应用` = > `应用`.鉴权 用户表=`管理员` 注册=真 注册路径="/register" …**
|
||||
```
|
||||
|
||||
| 方法 | ABI | 说明 |
|
||||
|------|-----|------|
|
||||
| `app.rbac` / `权限` | `web_app_rbac` | ensure schema + optional seed catalog table |
|
||||
| `app.gate` | `web_app_gate` | 新增 `permissions`/`权限`(CSV);与 `roles` 可并存:有 permissions 时按权限判定 |
|
||||
| `rbac.can` | `web_rbac_can` | `{ok, allowed}` |
|
||||
| `rbac.assign_role` | `web_rbac_assign_role` | 用户←角色 |
|
||||
| `rbac.set_role_permissions` | `web_rbac_set_role_permissions` | 角色←权限列表 |
|
||||
|
||||
防提权:`set_role_permissions` / `assign_role` 在 HTTP 管理面检查操作者 `roles:manage` 且不能授予自身没有的 permission。
|
||||
|
||||
---
|
||||
|
||||
## 4. 运行时
|
||||
|
||||
1. `listen`:若 `auth.rbac=true` 或调用过 `app.rbac`,对 `db` URL `EnsureSchema` + 种子。
|
||||
2. 登录成功:解析角色 → DB `user_roles` ∪ GFM 角色展开 → session `permissions`(CSV)+ 兼容 `role`。
|
||||
3. `withRBAC`:gate 含 `permissions` 则 `PermissionAllowed`;否则旧 `RoleAllowed`。
|
||||
4. 注册:`POST /register` 写入 `web_users`,默认赋 `member` 角色。
|
||||
|
||||
---
|
||||
|
||||
## 5. qdqc 映射
|
||||
|
||||
| 产品 | 权限码 |
|
||||
|------|--------|
|
||||
| 发评论 | `comments:create` |
|
||||
| 删任意评论 | `comments:delete` |
|
||||
| 进 desk | `desk:access` |
|
||||
| 管角色 | `roles:manage` |
|
||||
|
||||
首个 GFM `admin` 用户登录后视为 `superadmin`(全权限);DB 迁移后绑定 `superadmin` 角色。
|
||||
|
||||
---
|
||||
|
||||
## 6. 非目标(本切片)
|
||||
|
||||
对象级 ACL 全图、ABAC;租户列先可空,多租户波次再启用。
|
||||
@@ -0,0 +1,24 @@
|
||||
# Native SPA(Marqdo WASM 全页客户端)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted · MVP** |
|
||||
| 日期 | 2026-09-17 |
|
||||
| 相关 | [browser-marqdo-wasm.md](browser-marqdo-wasm.md) · route D/E |
|
||||
|
||||
## 约定
|
||||
|
||||
| 表 | 列 | 用途 |
|
||||
|----|-----|------|
|
||||
| 客户端路由 | `路径` / `面板` / `标题` | 文档化视图;运行时用 `path` + `set_attr(hidden)` 切换 |
|
||||
| 客户端状态 | `browser.store_set` / `store_get` `scope=memory` | 页内状态(列表 JSON、当前 id) |
|
||||
|
||||
作者零业务 JS:`web.client_embed` + `static/client.mq.md` + `lib/browser`。
|
||||
|
||||
## Bridge
|
||||
|
||||
`storage` effect 支持 `scope=memory`(进程内 `Map`),与 `local` / `session` / `cookie` 并列。
|
||||
|
||||
## Demo
|
||||
|
||||
`examples/web-spa-app/` — 列表 → 详情 → 编辑,全客户端路由。
|
||||
@@ -0,0 +1,23 @@
|
||||
# ext/web multi-tenant (path / subdomain / header)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted · MVP** |
|
||||
| 日期 | 2026-09-17 |
|
||||
| 相关 | [ext-web-rbac.md](ext-web-rbac.md) · full-ambition plan |
|
||||
|
||||
## Author API
|
||||
|
||||
```markdown
|
||||
**应用 = > `应用`.tenant mode="path" param="t" column="tenant_id" default_scope=False**
|
||||
```
|
||||
|
||||
JSON route table may set `tenant_scope` / `租户作用域` = true so `GET /api/items?t=acme` only returns rows with `tenant_id=acme`.
|
||||
|
||||
## Runtime
|
||||
|
||||
1. `withTenant` resolves id into request context.
|
||||
2. Scoped JSON selects `AND tenant_id=?`; missing tenant → 400.
|
||||
3. `default_scope=True` also stamps form POST bodies.
|
||||
|
||||
Demo: `examples/web-tenant-saas/`.
|
||||
@@ -580,7 +580,9 @@ submit → action=insert → db.insert;action=update → db.update
|
||||
## 9. 非本波次(可记入路线图)
|
||||
|
||||
- Postgres / Redis / S3 驱动细节(SQLite 已落地);
|
||||
- 复杂权限与多租户;
|
||||
- ~~复杂权限与多租户~~ → **可配置 RBAC** 见 [ext-web-rbac.md](ext-web-rbac.md);**多租户** 见 [ext-web-tenant.md](ext-web-tenant.md)(path/subdomain/header + `tenant_scope`);
|
||||
- ~~重客户端 SPA~~ → **Native SPA** 见 [ext-web-spa.md](ext-web-spa.md)(WASM + 路由表 + `store_set` memory);
|
||||
- ~~实时协同编辑~~ → **Collab MVP** 见 [ext-web-collab.md](ext-web-collab.md)(WS room LWW 文本 + presence);
|
||||
- 子页路由糖的更多约定(`# 应用.route` 已够用)。
|
||||
|
||||
---
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
# web-collab-doc
|
||||
|
||||
Two-browser collaborative notepad over WebSocket room (last-write-wins text).
|
||||
|
||||
```bash
|
||||
marqdo wasm build -o examples/web-collab-doc/static
|
||||
cd examples/web-collab-doc
|
||||
marqdo run index.mq.md
|
||||
# open http://127.0.0.1:18094 twice
|
||||
```
|
||||
|
||||
Design: [ext-web-collab.md](../../doc/design/ext-web-collab.md).
|
||||
@@ -0,0 +1,24 @@
|
||||
---
|
||||
title: web-collab-doc
|
||||
description: Two-browser collaborative plain-text editor over WS room (LWW snapshot sync)
|
||||
import web:ext/web/web.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
Collaborative notepad: open the page in two browsers; edits fan out via
|
||||
`/live/{room}` WebSocket (mode=room + presence). Build WASM first:
|
||||
|
||||
```
|
||||
marqdo wasm build -o examples/web-collab-doc/static
|
||||
```
|
||||
|
||||
**`embed` = > web.client_embed bridge="/static/marqdo-bridge.js" wasm="/static/marqdo_wasm.wasm" source="/static/client.mq.md" boot=True**
|
||||
|
||||
**`intro` = "<p class='lede'>Room <code>demo</code> · open twice to co-edit.</p><p id='presence'>presence: —</p><textarea id='doc' rows='16' cols='72' placeholder='Type together…'></textarea><pre id='log'></pre>" + embed**
|
||||
|
||||
**page = > web.page title="Collab doc" intro=intro layout="bare"**
|
||||
**app = > web.app page=page host="127.0.0.1" port=18094**
|
||||
**app = > app.static dir="static" mount="/static"**
|
||||
**app = > `app`.route_ws path="/live/{id}" mode="room" room_key="doc.{id}" presence=True**
|
||||
> `app`.listen
|
||||
@@ -0,0 +1,85 @@
|
||||
---
|
||||
title: collab client
|
||||
description: LWW text sync over WS room + presence (DOC\\t protocol)
|
||||
import browser:lib/browser.mq.md
|
||||
import table:lib/table.mq.md
|
||||
import text:lib/text.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
**`ws_id` = "doc"**
|
||||
**`applying` = False**
|
||||
**`doc` = ""**
|
||||
|
||||
`wire` =
|
||||
|
||||
| @ | 选择器 | 事件 | 调用 | 值选择器 |
|
||||
|---|--------|------|------|----------|
|
||||
| 1 | "#doc" | input | on_edit | "#doc" |
|
||||
|
||||
`open` =
|
||||
|
||||
| op | id | url | then_open | then_message | then_error | then_close |
|
||||
|----|----|-----|-----------|--------------|------------|------------|
|
||||
| open | `ws_id` | "ws://127.0.0.1:18094/live/demo" | on_open | on_msg | on_err | on_close |
|
||||
|
||||
**`w` = > table.put in=None at="wire" value=wire**
|
||||
**`ws` = > browser.ws spec=open**
|
||||
**`boot` = > browser.merge a=w b=ws**
|
||||
**`ready` = > browser.set_text sel="#log" text="connecting…"**
|
||||
*> browser.merge a=boot b=ready*
|
||||
|
||||
## on_open
|
||||
+ `ok`=True
|
||||
|
||||
*> browser.set_text sel="#log" text="ws open · room demo"*
|
||||
|
||||
## on_err
|
||||
+ `error`=""
|
||||
|
||||
**`msg` = "ws error: " + error**
|
||||
*> browser.set_text sel="#log" text=msg*
|
||||
|
||||
## on_close
|
||||
*> browser.set_text sel="#log" text="ws closed"*
|
||||
|
||||
## on_edit
|
||||
+ `value`=""
|
||||
|
||||
1. `applying`
|
||||
**`applying` = False**
|
||||
****
|
||||
2. *
|
||||
**`doc` = value**
|
||||
**`payload` = "DOC\t" + value**
|
||||
`send` =
|
||||
|
||||
| op | id | data |
|
||||
|----|----|------|
|
||||
| send | `ws_id` | `payload` |
|
||||
|
||||
*> browser.ws spec=send*
|
||||
|
||||
## on_msg
|
||||
+ `data`=""
|
||||
|
||||
1. `data` != ""
|
||||
**`is_pres` = > text.starts_with text=data prefix="{"**
|
||||
1. `is_pres`
|
||||
**`msg` = "presence: " + data**
|
||||
*> browser.set_text sel="#presence" text=msg*
|
||||
2. *
|
||||
**`is_doc` = > text.starts_with text=data prefix="DOC\t"**
|
||||
1. `is_doc`
|
||||
**`remote` = > text.replace text=data old="DOC\t" new="" count=1**
|
||||
1. `remote` != `doc`
|
||||
**`doc` = remote**
|
||||
**`applying` = True**
|
||||
*> browser.set_value sel="#doc" value=remote*
|
||||
2. *
|
||||
****
|
||||
2. *
|
||||
****
|
||||
2. *
|
||||
****
|
||||
@@ -0,0 +1,14 @@
|
||||
# web-spa-app
|
||||
|
||||
Marqdo **native SPA**: list → detail → edit with client routes + `scope=memory` store. Zero author JS.
|
||||
|
||||
## Run
|
||||
|
||||
```bash
|
||||
marqdo wasm build -o examples/web-spa-app/static
|
||||
cd examples/web-spa-app
|
||||
marqdo run index.mq.md
|
||||
# http://127.0.0.1:18093
|
||||
```
|
||||
|
||||
Design: [ext-web-spa.md](../../doc/design/ext-web-spa.md).
|
||||
@@ -0,0 +1,23 @@
|
||||
---
|
||||
title: web-spa-app
|
||||
description: Native Marqdo SPA — list/detail/edit via WASM client routes + memory store
|
||||
import web:ext/web/web.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
Full-page client app (zero author JS). Build assets first:
|
||||
|
||||
```
|
||||
marqdo wasm build -o examples/web-spa-app/static
|
||||
```
|
||||
|
||||
**`embed` = > web.client_embed bridge="/static/marqdo-bridge.js" wasm="/static/marqdo_wasm.wasm" source="/static/client.mq.md" boot=True**
|
||||
|
||||
**`intro` = "<nav class='spa-nav'><button type='button' id='nav-list'>Items</button> <button type='button' id='nav-new'>New</button></nav><p id='title' class='spa-title'>Items</p><section id='view-list'><ul id='items'></ul><p class='hint'>Click an item for detail.</p></section><section id='view-detail' hidden><p id='detail-body'></p><p><button type='button' id='btn-edit'>Edit</button> <button type='button' id='btn-back'>Back</button></p></section><section id='view-edit' hidden><label>Title <input id='edit-title' /></label><p><button type='button' id='btn-save'>Save</button> <button type='button' id='btn-cancel'>Cancel</button></p></section><pre id='log'></pre>" + embed**
|
||||
|
||||
**page = > web.page title="Marqdo SPA" intro=intro layout="bare"**
|
||||
**app = > web.app page=page host="127.0.0.1" port=18093**
|
||||
**app = > app.static dir="static" mount="/static"**
|
||||
**app = > app.redirect from="/item" to="/" permanent=False**
|
||||
> `app`.listen
|
||||
@@ -0,0 +1,174 @@
|
||||
---
|
||||
title: spa client
|
||||
description: routes table + memory store; list / detail / edit
|
||||
import browser:lib/browser.mq.md
|
||||
import table:lib/table.mq.md
|
||||
import text:lib/text.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
Routes (documentation + titles). Runtime switches panels by `path`.
|
||||
|
||||
`routes` =
|
||||
|
||||
| @ | 路径 | 面板 | 标题 |
|
||||
|---|------|------|------|
|
||||
| 1 | / | #view-list | Items |
|
||||
| 2 | /item | #view-detail | Detail |
|
||||
| 3 | /edit | #view-edit | Edit |
|
||||
|
||||
**`path` = "/"**
|
||||
**`cur_id` = ""**
|
||||
**`items` = "Alpha\nBeta"**
|
||||
|
||||
`wire` =
|
||||
|
||||
| @ | 选择器 | 事件 | 调用 | 委托 | 值选择器 |
|
||||
|---|--------|------|------|------|----------|
|
||||
| 1 | "#nav-list" | click | go_list | | |
|
||||
| 2 | "#nav-new" | click | go_new | | |
|
||||
| 3 | "#items" | click | open_item | "li[data-id]" | |
|
||||
| 4 | "#btn-edit" | click | go_edit | | |
|
||||
| 5 | "#btn-back" | click | go_list | | |
|
||||
| 6 | "#btn-save" | click | save_item | | "#edit-title" |
|
||||
| 7 | "#btn-cancel" | click | go_list | | |
|
||||
| 8 | "window" | popstate | on_pop | | |
|
||||
|
||||
`seed` =
|
||||
|
||||
| op | key | value | scope |
|
||||
|----|-----|-------|-------|
|
||||
| set | spa-items | `items` | memory |
|
||||
|
||||
**`w` = > table.put in=None at="wire" value=wire**
|
||||
**`s` = > browser.storage spec=seed**
|
||||
**`boot` = > browser.merge a=w b=s**
|
||||
**`ready` = > browser.set_text sel="#log" text="spa ready — click Items"**
|
||||
*> browser.merge a=boot b=ready*
|
||||
|
||||
## on_pop
|
||||
+ `path`=""
|
||||
|
||||
1. `path` != ""
|
||||
**`path` = path**
|
||||
2. *
|
||||
****
|
||||
*> spa_render*
|
||||
|
||||
## go_list
|
||||
**`path` = "/"**
|
||||
**`cur_id` = ""**
|
||||
*> spa_render*
|
||||
|
||||
## go_new
|
||||
**`path` = "/edit"**
|
||||
**`cur_id` = ""**
|
||||
*> spa_render*
|
||||
|
||||
## go_edit
|
||||
**`path` = "/edit"**
|
||||
*> spa_render*
|
||||
|
||||
## open_item
|
||||
+ `data_id`=""
|
||||
|
||||
1. `data_id` != ""
|
||||
**`cur_id` = data_id**
|
||||
**`path` = "/item"**
|
||||
*> spa_render*
|
||||
2. *
|
||||
****
|
||||
|
||||
## save_item
|
||||
+ `value`=""
|
||||
|
||||
1. `value` != ""
|
||||
1. `cur_id` != ""
|
||||
**`parts` = > text.str_split s=items sep="\n"**
|
||||
**`next` = ""**
|
||||
- [item](parts)
|
||||
1. `item` != ""
|
||||
1. `item` == `cur_id`
|
||||
1. `next` == ""
|
||||
**`next` = value**
|
||||
2. *
|
||||
**`next` = next + "\n" + value**
|
||||
2. *
|
||||
1. `next` == ""
|
||||
**`next` = item**
|
||||
2. *
|
||||
**`next` = next + "\n" + item**
|
||||
**`items` = next**
|
||||
**`cur_id` = value**
|
||||
2. *
|
||||
1. `items` == ""
|
||||
**`items` = value**
|
||||
2. *
|
||||
**`items` = items + "\n" + value**
|
||||
**`cur_id` = value**
|
||||
**`path` = "/item"**
|
||||
*> spa_render*
|
||||
2. *
|
||||
*> browser.set_text sel="#log" text="title required"*
|
||||
|
||||
## spa_render
|
||||
*> spa_paint*
|
||||
|
||||
## spa_paint
|
||||
**`hide` = > table.put in=None at="hidden" value=""**
|
||||
**`show` = > table.put in=None at="hidden" value=False**
|
||||
1. `path` == "/item"
|
||||
`attrs` =
|
||||
|
||||
| #view-detail | #view-list | #view-edit |
|
||||
|--------------|------------|------------|
|
||||
| `show` | `hide` | `hide` |
|
||||
**`title` = "Detail"**
|
||||
**`body` = cur_id**
|
||||
2. *
|
||||
1. `path` == "/edit"
|
||||
`attrs` =
|
||||
|
||||
| #view-edit | #view-list | #view-detail |
|
||||
|------------|------------|--------------|
|
||||
| `show` | `hide` | `hide` |
|
||||
**`title` = "Edit"**
|
||||
**`body` = cur_id**
|
||||
2. *
|
||||
`attrs` =
|
||||
|
||||
| #view-list | #view-detail | #view-edit |
|
||||
|------------|--------------|------------|
|
||||
| `show` | `hide` | `hide` |
|
||||
**`title` = "Items"**
|
||||
**`body` = ""**
|
||||
**`parts` = > text.str_split s=items sep="\n"**
|
||||
**`html` = ""**
|
||||
- [item](parts)
|
||||
1. `item` != ""
|
||||
**`html` = html + "<li data-id=\"" + item + "\">" + item + "</li>"**
|
||||
`persist` =
|
||||
|
||||
| op | key | value | scope |
|
||||
|----|-----|-------|-------|
|
||||
| set | spa-items | `items` | memory |
|
||||
|
||||
**`t` = > browser.set_text sel="#title" text=title**
|
||||
**`a` = > browser.wrap key="set_attr" value=attrs**
|
||||
**`ret` = > browser.merge a=t b=a**
|
||||
**`list` = > browser.set_html sel="#items" html=html**
|
||||
**`ret` = > browser.merge a=ret b=list**
|
||||
**`d` = > browser.set_text sel="#detail-body" text=body**
|
||||
**`ret` = > browser.merge a=ret b=d**
|
||||
1. `path` == "/edit"
|
||||
**`v` = > browser.set_value sel="#edit-title" value=cur_id**
|
||||
**`ret` = > browser.merge a=ret b=v**
|
||||
2. *
|
||||
****
|
||||
**`nav` = > browser.spa_goto url=path**
|
||||
**`ret` = > browser.merge a=ret b=nav**
|
||||
**`log` = > browser.set_text sel="#log" text=path**
|
||||
**`ret` = > browser.merge a=ret b=log**
|
||||
**`sav` = > browser.storage spec=persist**
|
||||
*> browser.merge a=ret b=sav*
|
||||
@@ -0,0 +1,33 @@
|
||||
---
|
||||
title: web-tenant-saas demo
|
||||
description: Dual-tenant isolation via ?t= query + tenant_scope JSON API.
|
||||
import web:ext/web/web.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
`items_schema` =
|
||||
|
||||
| name | type | nullable |
|
||||
|------|------|----------|
|
||||
| id | integer | false |
|
||||
| title | text | false |
|
||||
| tenant_id | text | false |
|
||||
|
||||
`api` =
|
||||
|
||||
| path | method | table | order | limit | tenant_scope |
|
||||
|------|--------|-------|-------|-------|--------------|
|
||||
| api/items | GET | items | id | 50 | true |
|
||||
|
||||
**db = > web.db url="sqlite:data/tenant-saas.db"**
|
||||
> `db`.init name=items fields=`items_schema`
|
||||
> `db`.exec sql="DELETE FROM items"
|
||||
> `db`.exec sql="INSERT INTO items(title, tenant_id) VALUES('Acme note','acme')"
|
||||
> `db`.exec sql="INSERT INTO items(title, tenant_id) VALUES('Beta note','beta')"
|
||||
|
||||
**page = > web.page title="Tenant SaaS" intro="<p>Try <a href='/api/items?t=acme'>/api/items?t=acme</a> vs <a href='/api/items?t=beta'>/api/items?t=beta</a>.</p>"**
|
||||
**app = > web.app page=`page` db=`db` host="127.0.0.1" port=18092 admin=False**
|
||||
**app = > `app`.tenant mode="path" param="t" default_scope=False**
|
||||
**app = > `app`.configure json=`api`**
|
||||
> `app`.listen
|
||||
@@ -0,0 +1,12 @@
|
||||
---
|
||||
title: web-ws-room demo
|
||||
description: Dynamic room WS with presence (G-WS1/2 bag). Open / and connect via bridge or wscat.
|
||||
import web:ext/web/web.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
**page = > web.page title="WS room" intro="<p class='lede'>Chat room <code>lobby</code> via <code>/chat/lobby</code>. Presence joins <code>chat.room.lobby.presence</code>.</p><pre id='log'></pre>"**
|
||||
**app = > web.app page=`page` host="127.0.0.1" port=18091 admin=False**
|
||||
**app = > `app`.route_ws path="/chat/{id}" mode="room" room_key="chat.room.{id}" presence=True**
|
||||
> `app`.listen
|
||||
+1
-1
@@ -1 +1 @@
|
||||
1.0.3
|
||||
1.0.4
|
||||
+73
-6
@@ -733,10 +733,13 @@ Serve `/`, routed pages, `/_part/{id}` (home) and `{path}/_part/{id}` (routes),
|
||||
+ `path`
|
||||
+ `echo`=True
|
||||
+ `mode`=None
|
||||
+ `room_key`=None
|
||||
+ `on_message`=None
|
||||
+ `presence`=False
|
||||
|
||||
Register a WebSocket endpoint at `path` (e.g. `/live`). `mode` is `echo` (default), `broadcast` (fan-out text to all sockets on this path), or `drain`. Legacy `echo=False` maps to `drain`. Connect from a client with `web.ws.connect`.
|
||||
Register a WebSocket endpoint at `path` (e.g. `/live` or `/chat/{id}`). `mode` is `echo` (default), `broadcast` (fan-out text to all sockets on this path), `room` (named room via `room_key`, supports `{id}` from the path), or `drain`. Legacy `echo=False` maps to `drain`. `on_message` is an optional `lib.member` hook (G-WS2): called before fan-out with `message`/`room`/`user`; return `{skip:true}` to drop or `{message:…}` to rewrite. `presence=True` also joins `room.presence` and emits join/leave JSON. Connect from a client with `web.ws.connect`.
|
||||
|
||||
*> web_app_route_ws app=`self` path=`path` echo=`echo` mode=`mode`*
|
||||
*> web_app_route_ws app=`self` path=`path` echo=`echo` mode=`mode` room_key=`room_key` on_message=`on_message` presence=`presence`*
|
||||
|
||||
## auth
|
||||
+ `users`
|
||||
@@ -745,21 +748,42 @@ Register a WebSocket endpoint at `path` (e.g. `/live`). `mode` is `echo` (defaul
|
||||
+ `login_redirect`=None
|
||||
+ `logout_redirect`=None
|
||||
+ `login_path`=None
|
||||
+ `register`=False
|
||||
+ `register_path`=/register
|
||||
+ `default_role`="member"
|
||||
|
||||
Keep the app's `admin=True`, and gate `{admin_prefix}` (segment-boundary prefix) behind a login page (default `/admin`). Unauthenticated requests redirect to `login_path` (default `{admin_prefix}/login`, auto-excluded). Does not match `/admin-publish`-style siblings.
|
||||
Keep the app's `admin=True`, and gate `{admin_prefix}` (segment-boundary prefix) behind a login page (default `/admin`). Unauthenticated requests redirect to `login_path` (default `{admin_prefix}/login`, auto-excluded). Does not match `/admin-publish`-style siblings. With `register=True` and `enable_rbac`, exposes `register_path` (writes `web_users` + default role).
|
||||
|
||||
*> web_app_auth app=`self` users=`users` session_ttl=`session_ttl` admin_prefix=`admin_prefix` login_redirect=`login_redirect` logout_redirect=`logout_redirect` login_path=`login_path`*
|
||||
*> web_app_auth app=`self` users=`users` session_ttl=`session_ttl` admin_prefix=`admin_prefix` login_redirect=`login_redirect` logout_redirect=`logout_redirect` login_path=`login_path` register=`register` register_path=`register_path` default_role=`default_role`*
|
||||
|
||||
## gate
|
||||
+ `path`
|
||||
+ `roles`=admin
|
||||
+ `permissions`=""
|
||||
+ `match`=prefix
|
||||
+ `on_deny`=forbid
|
||||
+ `exclude`=None
|
||||
|
||||
Require one of `roles` (CSV) for `path`. `match=prefix` uses segment boundaries; `exact` is equality. Trailing `*` on `path` means prefix. `on_deny=redirect` sends visitors to `login_path` (with `?next=`); `forbid` returns 403. `exclude` is CSV or list of open paths.
|
||||
Require access for `path`. Prefer `permissions` (CSV of `resource:action` codes such as `desk:access`); when non-empty, authorization uses the session permission set. Otherwise require one of `roles` (legacy). `match=prefix` uses segment boundaries; `exact` is equality. Trailing `*` on `path` means prefix. `on_deny=redirect` sends visitors to `login_path` (with `?next=`); `forbid` returns 403. `exclude` is CSV or list of open paths.
|
||||
|
||||
*> web_app_gate app=`self` path=`path` roles=`roles` match=`match` on_deny=`on_deny` exclude=`exclude`*
|
||||
*> web_app_gate app=`self` path=`path` roles=`roles` permissions=`permissions` match=`match` on_deny=`on_deny` exclude=`exclude`*
|
||||
|
||||
## enable_rbac
|
||||
+ `catalog`=None
|
||||
|
||||
Enable database-backed RBAC (role ⊥ permission). On listen, ensures `web_permissions` / `web_roles` / `web_role_permissions` / `web_users` / `web_user_roles` and seeds system roles `superadmin` and `member`. See `doc/design/ext-web-rbac.md`. Management UI: `GET /_rbac/desk` (needs `roles:manage`).
|
||||
|
||||
*> web_app_rbac app=`self` catalog=`catalog`*
|
||||
|
||||
## tenant
|
||||
+ `mode`
|
||||
+ `param`=None
|
||||
+ `column`=tenant_id
|
||||
+ `default_scope`=False
|
||||
|
||||
Enable multi-tenant resolution: `mode` is `path` (query/`/t/{id}/…`), `subdomain`, or `header`. `param` is the path/query key or header name. When `default_scope=True`, JSON routes and form inserts auto-filter/stamp `column` (default `tenant_id`). Per-route override: JSON table column `tenant_scope` / `租户作用域`.
|
||||
|
||||
*> web_app_tenant app=`self` mode=`mode` param=`param` column=`column` default_scope=`default_scope`*
|
||||
|
||||
## gallery
|
||||
+ `path`=/gallery
|
||||
@@ -843,6 +867,49 @@ Mount `GET path` to stream an object. Path must capture `key` (use `{*key}` for
|
||||
|
||||
*> web_app_download app=`self` path=`path` storage=`storage` disposition=`disposition`*
|
||||
|
||||
# rbac
|
||||
|
||||
Offline helpers for role ⊥ permission. Prefer `app.enable_rbac` + gates for HTTP; use these for scripts/tests.
|
||||
|
||||
## can
|
||||
+ `permissions`
|
||||
+ `needed`
|
||||
|
||||
Return `{ok, allowed}` — whether held permission CSV includes any of `needed` (CSV). Held `*` allows all.
|
||||
|
||||
> ensure_plugin
|
||||
*> web_rbac_can permissions=`permissions` needed=`needed`*
|
||||
|
||||
## assign_role
|
||||
+ `url`
|
||||
+ `username`
|
||||
+ `role`
|
||||
|
||||
Bind `username` (in `web_users`) to role name.
|
||||
|
||||
> ensure_plugin
|
||||
*> web_rbac_assign_role url=`url` username=`username` role=`role`*
|
||||
|
||||
## create_role
|
||||
+ `url`
|
||||
+ `name`
|
||||
|
||||
Create a non-system role; returns `{ok, id, name}`.
|
||||
|
||||
> ensure_plugin
|
||||
*> web_rbac_create_role url=`url` name=`name`*
|
||||
|
||||
## set_role_permissions
|
||||
+ `url`
|
||||
+ `role`
|
||||
+ `permissions`
|
||||
+ `grantable`=""
|
||||
|
||||
Replace permissions on a non-system role (CSV). `grantable` restricts grants (anti-escalation); empty = full catalog.
|
||||
|
||||
> ensure_plugin
|
||||
*> web_rbac_set_role_permissions url=`url` role=`role` permissions=`permissions` grantable=`grantable`*
|
||||
|
||||
# auth
|
||||
+ `users`
|
||||
+ `session_ttl`=3600
|
||||
|
||||
+73
-6
@@ -699,10 +699,13 @@ SEO / OpenGraph 元数据表(`|键|值|`)。如 `title`、`description`、`c
|
||||
+ `路径`
|
||||
+ `回显`=真
|
||||
+ `模式`=None
|
||||
+ `房间`=None
|
||||
+ `消息钩子`=None
|
||||
+ `在场`=假
|
||||
|
||||
在 `路径`(如 `/live`)注册 WebSocket 端点。`模式` 为 `echo`(默认)、`broadcast`(同路径全体广播)或 `drain`。旧参数 `回显=假` 等价于 `drain`。客户端用 `网页.实时` 的 `连接` 接入。
|
||||
在 `路径`(如 `/live` 或 `/chat/{id}`)注册 WebSocket。`模式` 为 `echo`(默认)、`broadcast`、`room`(需 `房间` 键,可含 `{id}`)或 `drain`。旧参数 `回显=假` 等价于 `drain`。`消息钩子` 为可选 `库.成员`(G-WS2):广播前调用,入参含 `message`/`room`/`user`;返回 `{skip:真}` 丢弃或 `{message:…}` 改写。`在场=真` 时另进 `房间.presence` 并推送 join/leave。客户端用 `网页.实时` 的 `连接` 接入。
|
||||
|
||||
*> web_app_route_ws app=`self` path=`路径` echo=`回显` mode=`模式`*
|
||||
*> web_app_route_ws app=`self` path=`路径` echo=`回显` mode=`模式` room_key=`房间` on_message=`消息钩子` presence=`在场`*
|
||||
|
||||
## 鉴权
|
||||
+ `用户表`
|
||||
@@ -711,21 +714,42 @@ SEO / OpenGraph 元数据表(`|键|值|`)。如 `title`、`description`、`c
|
||||
+ `登录回跳`=None
|
||||
+ `登出回跳`=None
|
||||
+ `登录路径`=None
|
||||
+ `注册`=假
|
||||
+ `注册路径`=/register
|
||||
+ `默认角色`="member"
|
||||
|
||||
在保持 `后台=真` 的同时,为 `{后台前缀}` 加段边界前缀门禁(默认 `/admin`)。未登录 重定向 到 `登录路径`(默认 `{前缀}/login`,自动排除)。不会匹配 `/admin-publish` 这类旁系路径。
|
||||
在保持 `后台=真` 的同时,为 `{后台前缀}` 加段边界前缀门禁(默认 `/admin`)。未登录 重定向 到 `登录路径`(默认 `{前缀}/login`,自动排除)。不会匹配 `/admin-publish` 这类旁系路径。`注册=真` 且已 `启用权限` 时开放 `注册路径`(写入 `web_users` 并赋默认角色)。
|
||||
|
||||
*> web_app_auth app=`self` users=`用户表` session_ttl=`会话时长` admin_prefix=`后台前缀` login_redirect=`登录回跳` logout_redirect=`登出回跳` login_path=`登录路径`*
|
||||
*> web_app_auth app=`self` users=`用户表` session_ttl=`会话时长` admin_prefix=`后台前缀` login_redirect=`登录回跳` logout_redirect=`登出回跳` login_path=`登录路径` register=`注册` register_path=`注册路径` default_role=`默认角色`*
|
||||
|
||||
## 门禁
|
||||
+ `路径`
|
||||
+ `角色`=admin
|
||||
+ `权限`=""
|
||||
+ `匹配`=prefix
|
||||
+ `拒绝`=forbid
|
||||
+ `排除`=None
|
||||
|
||||
要求会话角色落在 `角色`(CSV)之一。`匹配=prefix` 为段边界前缀;`exact` 为精确路径。路径末尾 `*` 亦表示前缀。`拒绝=redirect` 时访客跳转登录页(带 `?next=`);`forbid` 返回 403。`排除` 为 CSV/列表(如登录页)。
|
||||
为 `路径` 要求访问权。优先使用 `权限`(CSV,如 `desk:access`);非空时按会话权限集判定。否则要求会话角色落在 `角色`(CSV)之一。`匹配=prefix` 为段边界前缀;`exact` 为精确路径。路径末尾 `*` 亦表示前缀。`拒绝=redirect` 时访客跳转登录页(带 `?next=`);`forbid` 返回 403。`排除` 为 CSV/列表(如登录页)。
|
||||
|
||||
*> web_app_gate app=`self` path=`路径` roles=`角色` match=`匹配` on_deny=`拒绝` exclude=`排除`*
|
||||
*> web_app_gate app=`self` path=`路径` roles=`角色` permissions=`权限` match=`匹配` on_deny=`拒绝` exclude=`排除`*
|
||||
|
||||
## 启用权限
|
||||
+ `目录`=None
|
||||
|
||||
启用库表 RBAC(角色 ⊥ 权限)。listen 时确保五表并种子 `superadmin` / `member`。见 `doc/design/ext-web-rbac.md`。管理台:`GET /_rbac/desk`(需 `roles:manage`)。
|
||||
|
||||
*> web_app_rbac app=`self` catalog=`目录`*
|
||||
|
||||
## 租户
|
||||
+ `模式`
|
||||
+ `参数`=None
|
||||
+ `列`=tenant_id
|
||||
+ `默认作用域`=假
|
||||
|
||||
启用多租户解析:`模式` 为 `path`(查询参数或 `/t/{id}/…`)、`subdomain` 或 `header`。`参数` 为路径/查询键或请求头名。`默认作用域=真` 时 JSON 路由与表单插入自动按 `列`(默认 `tenant_id`)过滤/盖戳。单路由可用表列 `租户作用域` 覆盖。
|
||||
|
||||
*> web_app_tenant app=`self` mode=`模式` param=`参数` column=`列` default_scope=`默认作用域`*
|
||||
|
||||
## 相册
|
||||
+ `路径`=/gallery
|
||||
@@ -809,6 +833,49 @@ SEO / OpenGraph 元数据表(`|键|值|`)。如 `title`、`description`、`c
|
||||
|
||||
*> web_app_download app=`self` path=`路径` storage=`存储` disposition=`处置`*
|
||||
|
||||
# 权限
|
||||
|
||||
角色 ⊥ 权限的离线助手。HTTP 侧优先 `应用.启用权限` + 门禁;脚本/测试可用本类。
|
||||
|
||||
## 可否
|
||||
+ `权限`
|
||||
+ `需要`
|
||||
|
||||
返回 `{ok, allowed}`:持有权限 CSV 是否包含 `需要`(CSV)中任一码。持有 `*` 则全允许。
|
||||
|
||||
> 确保插件
|
||||
*> web_rbac_can permissions=`权限` needed=`需要`*
|
||||
|
||||
## 赋角色
|
||||
+ `数据库`
|
||||
+ `用户名`
|
||||
+ `角色`
|
||||
|
||||
将 `用户名`(须已在 `web_users`)绑定到角色名。
|
||||
|
||||
> 确保插件
|
||||
*> web_rbac_assign_role url=`数据库` username=`用户名` role=`角色`*
|
||||
|
||||
## 建角色
|
||||
+ `数据库`
|
||||
+ `名称`
|
||||
|
||||
新建非系统角色;返回 `{ok, id, name}`。
|
||||
|
||||
> 确保插件
|
||||
*> web_rbac_create_role url=`数据库` name=`名称`*
|
||||
|
||||
## 设角色权限
|
||||
+ `数据库`
|
||||
+ `角色`
|
||||
+ `权限`
|
||||
+ `可授`=""
|
||||
|
||||
覆盖非系统角色的权限(CSV)。`可授` 限制可授予码(防提权);空则允许整份目录。
|
||||
|
||||
> 确保插件
|
||||
*> web_rbac_set_role_permissions url=`数据库` role=`角色` permissions=`权限` grantable=`可授`*
|
||||
|
||||
# 鉴权
|
||||
+ `用户表`
|
||||
+ `会话时长`=3600
|
||||
|
||||
@@ -154,6 +154,50 @@ focus.
|
||||
|
||||
*> table.put in=None at="navigate" value=spec*
|
||||
|
||||
## store_set
|
||||
+ `key`
|
||||
+ `value`
|
||||
+ `scope`="memory"
|
||||
|
||||
In-memory (or local/session) key write for SPA client state. Prefer `scope=memory` for tab-local app state.
|
||||
|
||||
`spec` =
|
||||
|
||||
| op | key | value | scope |
|
||||
|----|-----|-------|-------|
|
||||
| set | `key` | `value` | `scope` |
|
||||
|
||||
*> table.put in=None at="storage" value=spec*
|
||||
|
||||
## store_get
|
||||
+ `key`
|
||||
+ `then`
|
||||
+ `scope`="memory"
|
||||
|
||||
Read a key then call `then` with `{ok, value, found, key, scope}`.
|
||||
|
||||
`spec` =
|
||||
|
||||
| op | key | then | scope |
|
||||
|----|-----|------|-------|
|
||||
| get | `key` | `then` | `scope` |
|
||||
|
||||
*> table.put in=None at="storage" value=spec*
|
||||
|
||||
## spa_goto
|
||||
+ `url`
|
||||
+ `replace`=False
|
||||
|
||||
SPA navigation: `history.pushState` / `replaceState` via bridge `navigate` effect.
|
||||
|
||||
`spec` =
|
||||
|
||||
| url | replace |
|
||||
|-----|---------|
|
||||
| `url` | `replace` |
|
||||
|
||||
*> table.put in=None at="navigate" value=spec*
|
||||
|
||||
## storage
|
||||
+ `spec`
|
||||
|
||||
|
||||
@@ -153,6 +153,50 @@ import table:lib/table.mq.md
|
||||
|
||||
*> table.put in=None at="navigate" value=spec*
|
||||
|
||||
## 存设
|
||||
+ `键`
|
||||
+ `值`
|
||||
+ `作用域`="memory"
|
||||
|
||||
SPA 客户端状态写入。优先 `作用域=memory`(页内内存)。
|
||||
|
||||
`spec` =
|
||||
|
||||
| op | key | value | scope |
|
||||
|----|-----|-------|-------|
|
||||
| set | `键` | `值` | `作用域` |
|
||||
|
||||
*> table.put in=None at="storage" value=spec*
|
||||
|
||||
## 存取
|
||||
+ `键`
|
||||
+ `然后`
|
||||
+ `作用域`="memory"
|
||||
|
||||
读取键并回调 `然后`,参数含 `{ok, value, found, key, scope}`。
|
||||
|
||||
`spec` =
|
||||
|
||||
| op | key | then | scope |
|
||||
|----|-----|------|-------|
|
||||
| get | `键` | `然后` | `作用域` |
|
||||
|
||||
*> table.put in=None at="storage" value=spec*
|
||||
|
||||
## 页跳
|
||||
+ `url`
|
||||
+ `替换`=False
|
||||
|
||||
SPA 导航(bridge `navigate`)。
|
||||
|
||||
`spec` =
|
||||
|
||||
| url | replace |
|
||||
|-----|---------|
|
||||
| `url` | `替换` |
|
||||
|
||||
*> table.put in=None at="navigate" value=spec*
|
||||
|
||||
## 存储
|
||||
+ `规格`
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@ import (
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/httpx"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/middleware"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/password"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/rbac"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/session"
|
||||
)
|
||||
|
||||
@@ -493,3 +494,154 @@ func web_app_gate(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
out, err := app.Gate(asPageMap(args["app"]), path, args)
|
||||
return replyJSON(outJSON, errMsg, out, err)
|
||||
}
|
||||
|
||||
//export web_app_rbac
|
||||
func web_app_rbac(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
out, err := app.Rbac(asPageMap(args["app"]), args)
|
||||
return replyJSON(outJSON, errMsg, out, err)
|
||||
}
|
||||
|
||||
//export web_app_tenant
|
||||
func web_app_tenant(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
out, err := app.Tenant(asPageMap(args["app"]), args)
|
||||
return replyJSON(outJSON, errMsg, out, err)
|
||||
}
|
||||
|
||||
//export web_rbac_can
|
||||
func web_rbac_can(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
heldRaw, _ := argStrReq(args, "permissions", "权限", "held")
|
||||
neededRaw, _ := argStrReq(args, "needed", "需要")
|
||||
if neededRaw == "" {
|
||||
neededRaw, _ = argStrReq(args, "permission", "权限码")
|
||||
}
|
||||
ok := rbac.HasAny(rbac.ParseCSV(heldRaw), rbac.ParseCSV(neededRaw))
|
||||
return replyJSON(outJSON, errMsg, map[string]any{"ok": true, "allowed": ok}, nil)
|
||||
}
|
||||
|
||||
//export web_rbac_ensure
|
||||
func web_rbac_ensure(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
url, err := dbURLOf(args)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
if err := rbac.EnsureSchema(url); err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
return replyJSON(outJSON, errMsg, map[string]any{"ok": true}, nil)
|
||||
}
|
||||
|
||||
//export web_rbac_assign_role
|
||||
func web_rbac_assign_role(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
url, err := dbURLOf(args)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
user, err := argStrReq(args, "username", "用户名", "user")
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
role, err := argStrReq(args, "role", "角色")
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
err = rbac.AssignRole(url, user, role)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
return replyJSON(outJSON, errMsg, map[string]any{"ok": true}, nil)
|
||||
}
|
||||
|
||||
//export web_rbac_create_role
|
||||
func web_rbac_create_role(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
url, err := dbURLOf(args)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
name, err := argStrReq(args, "name", "名称")
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
id, err := rbac.CreateRole(url, name)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
return replyJSON(outJSON, errMsg, map[string]any{"ok": true, "id": id, "name": name}, nil)
|
||||
}
|
||||
|
||||
//export web_rbac_set_role_permissions
|
||||
func web_rbac_set_role_permissions(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
url, err := dbURLOf(args)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
roleName, _ := argStrReq(args, "role", "角色")
|
||||
permsRaw, _ := argStrReq(args, "permissions", "权限")
|
||||
grantRaw, _ := argStrReq(args, "grantable", "可授")
|
||||
err = rbac.SetRolePermissionsByName(url, roleName, rbac.ParseCSV(permsRaw), rbac.ParseCSV(grantRaw))
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
return replyJSON(outJSON, errMsg, map[string]any{"ok": true}, nil)
|
||||
}
|
||||
|
||||
//export web_rbac_list_roles
|
||||
func web_rbac_list_roles(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
url, err := dbURLOf(args)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
roles, err := rbac.ListRoles(url)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
return replyJSON(outJSON, errMsg, map[string]any{"ok": true, "roles": roles}, nil)
|
||||
}
|
||||
|
||||
//export web_rbac_list_permissions
|
||||
func web_rbac_list_permissions(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
url, err := dbURLOf(args)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
perms, err := rbac.ListPermissions(url)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
return replyJSON(outJSON, errMsg, map[string]any{"ok": true, "permissions": perms}, nil)
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/assets"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/session"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/tenant"
|
||||
)
|
||||
|
||||
// New builds an app bag matching Rust web_app_new defaults used by zh-smoke.
|
||||
@@ -194,10 +195,25 @@ func Auth(appBag map[string]any, users any, opts map[string]any) (map[string]any
|
||||
loginPath = prefix + "/login"
|
||||
}
|
||||
out["login_path"] = loginPath
|
||||
out["auth"] = map[string]any{
|
||||
"users": users,
|
||||
"session_ttl": float64(sessionTTL),
|
||||
authBag, _ := out["auth"].(map[string]any)
|
||||
if authBag == nil {
|
||||
authBag = map[string]any{}
|
||||
} else {
|
||||
authBag = clone(authBag)
|
||||
}
|
||||
authBag["users"] = users
|
||||
authBag["session_ttl"] = float64(sessionTTL)
|
||||
if v, ok := first(opts, "register", "注册"); ok {
|
||||
authBag["register"] = boolish(v)
|
||||
}
|
||||
if v := firstStr(opts, "register_path", "注册路径"); v != "" {
|
||||
authBag["register_path"] = v
|
||||
out["register_path"] = v
|
||||
}
|
||||
if v := firstStr(opts, "default_role", "默认角色"); v != "" {
|
||||
authBag["default_role"] = v
|
||||
}
|
||||
out["auth"] = authBag
|
||||
gates := gatesOf(out)
|
||||
if !hasAdminGate(gates, prefix) {
|
||||
gates = append(gates, map[string]any{
|
||||
@@ -214,8 +230,15 @@ func Auth(appBag map[string]any, users any, opts map[string]any) (map[string]any
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// Tenant configures multi-tenant resolution on the app bag (path|subdomain|header).
|
||||
func Tenant(appBag map[string]any, opts map[string]any) (map[string]any, error) {
|
||||
return tenant.Configure(appBag, opts)
|
||||
}
|
||||
|
||||
// Gate appends an RBAC gate (Rust web_app_gate).
|
||||
// opts: roles/角色, match/匹配, on_deny/拒绝, exclude/排除.
|
||||
// opts: roles/角色, permissions/权限, match/匹配, on_deny/拒绝, exclude/排除.
|
||||
// When permissions is non-empty, the HTTP middleware authorizes by permission codes;
|
||||
// otherwise it falls back to roles (legacy).
|
||||
func Gate(appBag map[string]any, path string, opts map[string]any) (map[string]any, error) {
|
||||
if opts == nil {
|
||||
opts = map[string]any{}
|
||||
@@ -225,7 +248,8 @@ func Gate(appBag map[string]any, path string, opts map[string]any) (map[string]a
|
||||
return nil, fmt.Errorf("missing `path`")
|
||||
}
|
||||
rolesRaw := firstStr(opts, "roles", "角色")
|
||||
if rolesRaw == "" {
|
||||
permsRaw := firstStr(opts, "permissions", "权限")
|
||||
if rolesRaw == "" && permsRaw == "" {
|
||||
rolesRaw = "admin"
|
||||
}
|
||||
roles := session.ParseRolesCSV(rolesRaw)
|
||||
@@ -233,6 +257,11 @@ func Gate(appBag map[string]any, path string, opts map[string]any) (map[string]a
|
||||
for i, r := range roles {
|
||||
roleAny[i] = r
|
||||
}
|
||||
perms := session.ParseRolesCSV(permsRaw)
|
||||
permAny := make([]any, len(perms))
|
||||
for i, p := range perms {
|
||||
permAny[i] = p
|
||||
}
|
||||
matchMode := firstStr(opts, "match", "匹配")
|
||||
if matchMode == "" {
|
||||
matchMode = "prefix"
|
||||
@@ -247,6 +276,9 @@ func Gate(appBag map[string]any, path string, opts map[string]any) (map[string]a
|
||||
"match": matchMode,
|
||||
"on_deny": onDeny,
|
||||
}
|
||||
if len(permAny) > 0 {
|
||||
entry["permissions"] = permAny
|
||||
}
|
||||
if v, ok := first(opts, "exclude", "排除"); ok && v != nil {
|
||||
entry["exclude"] = v
|
||||
}
|
||||
@@ -257,6 +289,26 @@ func Gate(appBag map[string]any, path string, opts map[string]any) (map[string]a
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// Rbac enables DB-backed RBAC on the app (ensure schema at listen).
|
||||
// opts may include catalog table (unused beyond flag for now).
|
||||
func Rbac(appBag map[string]any, opts map[string]any) (map[string]any, error) {
|
||||
out := clone(appBag)
|
||||
authBag, _ := out["auth"].(map[string]any)
|
||||
if authBag == nil {
|
||||
authBag = map[string]any{}
|
||||
} else {
|
||||
authBag = clone(authBag)
|
||||
}
|
||||
authBag["rbac"] = true
|
||||
if opts != nil {
|
||||
if v, ok := first(opts, "catalog", "目录"); ok && v != nil {
|
||||
authBag["permission_catalog"] = v
|
||||
}
|
||||
}
|
||||
out["auth"] = authBag
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// NormalizeAdminPrefix cleans and validates admin_prefix.
|
||||
func NormalizeAdminPrefix(raw string) (string, error) {
|
||||
path, err := cleanMountPath(raw)
|
||||
|
||||
@@ -86,7 +86,7 @@ func cellStr(v any) string {
|
||||
}
|
||||
|
||||
// Login validates credentials and creates a session.
|
||||
// Success: {"ok":true,"session_id":…,"username":…,"role":…}
|
||||
// Success: {"ok":true,"session_id":…,"username":…,"role":…,"permissions":…}
|
||||
// Failure: {"ok":false}
|
||||
func Login(username, pass string, users any, sessionTTL uint64) map[string]any {
|
||||
u, role, ok := CheckCredentials(users, username, pass)
|
||||
@@ -104,6 +104,14 @@ func Login(username, pass string, users any, sessionTTL uint64) map[string]any {
|
||||
}
|
||||
}
|
||||
|
||||
// AttachPermissions writes permission codes onto an existing login session.
|
||||
func AttachPermissions(sessionID string, codes []string) {
|
||||
if sessionID == "" {
|
||||
return
|
||||
}
|
||||
session.SetPermissions(sessionID, codes)
|
||||
}
|
||||
|
||||
// Check returns session auth state (web_auth_check).
|
||||
func Check(sessionID string) map[string]any {
|
||||
v, ok := session.GetValue(sessionID, "username")
|
||||
@@ -120,7 +128,12 @@ func Check(sessionID string) map[string]any {
|
||||
role = s
|
||||
}
|
||||
}
|
||||
return map[string]any{"ok": true, "username": u, "role": role}
|
||||
perms := session.PermissionsFromSession(sessionID)
|
||||
out := map[string]any{"ok": true, "username": u, "role": role}
|
||||
if len(perms) > 0 {
|
||||
out["permissions"] = perms
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// Logout destroys the session (web_auth_logout).
|
||||
|
||||
@@ -78,6 +78,12 @@ func open(url string) (*sql.DB, error) {
|
||||
return db, nil
|
||||
}
|
||||
|
||||
// OpenSQL returns a pooled *sql.DB for sqlite: (and existing) URLs.
|
||||
// Used by packages that need raw SQL beyond CRUD helpers (e.g. rbac).
|
||||
func OpenSQL(url string) (*sql.DB, error) {
|
||||
return open(url)
|
||||
}
|
||||
|
||||
// ResetPool closes pooled connections and open transactions (tests).
|
||||
func ResetPool() {
|
||||
resetTxns()
|
||||
|
||||
@@ -1,15 +1,19 @@
|
||||
package httpx
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/app"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/auth"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/password"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/ratelimit"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/rbac"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/session"
|
||||
)
|
||||
|
||||
@@ -28,23 +32,28 @@ const (
|
||||
)
|
||||
|
||||
type gate struct {
|
||||
path string
|
||||
roles []string
|
||||
matchMode gateMatch
|
||||
onDeny onDeny
|
||||
exclude []string
|
||||
path string
|
||||
roles []string
|
||||
permissions []string
|
||||
matchMode gateMatch
|
||||
onDeny onDeny
|
||||
exclude []string
|
||||
}
|
||||
|
||||
type authConfig struct {
|
||||
users any
|
||||
sessionTTL uint64
|
||||
cookieSecure bool
|
||||
admin bool
|
||||
adminPrefix string
|
||||
loginPath string
|
||||
loginRedirect string
|
||||
logoutRedirect string
|
||||
gates []gate
|
||||
users any
|
||||
sessionTTL uint64
|
||||
cookieSecure bool
|
||||
admin bool
|
||||
adminPrefix string
|
||||
loginPath string
|
||||
loginRedirect string
|
||||
logoutRedirect string
|
||||
gates []gate
|
||||
rbac bool
|
||||
register bool
|
||||
registerPath string
|
||||
defaultRole string
|
||||
}
|
||||
|
||||
func authConfigOf(appBag map[string]any) authConfig {
|
||||
@@ -68,6 +77,7 @@ func authConfigOf(appBag map[string]any) authConfig {
|
||||
if v, ok := appBag["cookie_secure"].(bool); ok {
|
||||
cfg.cookieSecure = v
|
||||
}
|
||||
cfg.registerPath = strOpt(appBag, "register_path", "")
|
||||
if authBag, ok := appBag["auth"].(map[string]any); ok {
|
||||
cfg.users = authBag["users"]
|
||||
if n, ok := asUint64(authBag["session_ttl"]); ok && n > 0 {
|
||||
@@ -75,6 +85,18 @@ func authConfigOf(appBag map[string]any) authConfig {
|
||||
} else if n, ok := asUint64(authBag["ttl"]); ok && n > 0 {
|
||||
cfg.sessionTTL = n
|
||||
}
|
||||
cfg.rbac = boolish(authBag["rbac"])
|
||||
cfg.register = boolish(authBag["register"])
|
||||
if p := strOpt(authBag, "register_path", ""); p != "" {
|
||||
cfg.registerPath = p
|
||||
}
|
||||
cfg.defaultRole = strOpt(authBag, "default_role", "")
|
||||
if cfg.defaultRole == "" {
|
||||
cfg.defaultRole = "member"
|
||||
}
|
||||
}
|
||||
if cfg.registerPath == "" {
|
||||
cfg.registerPath = "/register"
|
||||
}
|
||||
cfg.gates = parseGates(appBag["gates"])
|
||||
return cfg
|
||||
@@ -106,7 +128,11 @@ func parseGates(v any) []gate {
|
||||
if roles == nil {
|
||||
roles = parseGateRoles(m["角色"])
|
||||
}
|
||||
if len(roles) == 0 {
|
||||
perms := parseGateRoles(m["permissions"])
|
||||
if perms == nil {
|
||||
perms = parseGateRoles(m["权限"])
|
||||
}
|
||||
if len(roles) == 0 && len(perms) == 0 {
|
||||
roles = []string{"admin"}
|
||||
}
|
||||
matchS := strings.ToLower(strings.TrimSpace(strOpt(m, "match", "")))
|
||||
@@ -136,11 +162,12 @@ func parseGates(v any) []gate {
|
||||
on = onDenyForbid
|
||||
}
|
||||
out = append(out, gate{
|
||||
path: path,
|
||||
roles: roles,
|
||||
matchMode: matchMode,
|
||||
onDeny: on,
|
||||
exclude: parseExclude(m["exclude"], m["排除"]),
|
||||
path: path,
|
||||
roles: roles,
|
||||
permissions: perms,
|
||||
matchMode: matchMode,
|
||||
onDeny: on,
|
||||
exclude: parseExclude(m["exclude"], m["排除"]),
|
||||
})
|
||||
}
|
||||
return out
|
||||
@@ -245,7 +272,17 @@ func withRBAC(next http.Handler, gates []gate, loginPath string) http.Handler {
|
||||
break
|
||||
}
|
||||
role := session.RoleFromCookie(cookie)
|
||||
if !session.RoleAllowed(role, g.roles) {
|
||||
allowed := false
|
||||
if len(g.permissions) > 0 {
|
||||
held := session.PermissionsFromCookie(cookie)
|
||||
if len(held) == 0 && role != "visitor" {
|
||||
held = expandLegacyRole(role)
|
||||
}
|
||||
allowed = session.PermissionAllowed(held, g.permissions)
|
||||
} else {
|
||||
allowed = session.RoleAllowed(role, g.roles)
|
||||
}
|
||||
if !allowed {
|
||||
if role == "visitor" && g.onDeny == onDenyRedirect {
|
||||
nextQ := urlEncodePath(path)
|
||||
dest := loginPath
|
||||
@@ -268,6 +305,22 @@ func withRBAC(next http.Handler, gates []gate, loginPath string) http.Handler {
|
||||
})
|
||||
}
|
||||
|
||||
func expandLegacyRole(role string) []string {
|
||||
switch strings.ToLower(strings.TrimSpace(role)) {
|
||||
case "superadmin", "admin":
|
||||
return []string{
|
||||
"comments:create", "comments:delete", "comments:delete_own",
|
||||
"desk:access", "roles:manage", "posts:edit", "users:manage",
|
||||
}
|
||||
case "member", "user":
|
||||
return []string{"comments:create", "comments:delete_own"}
|
||||
case "editor", "author":
|
||||
return []string{"comments:create", "comments:delete_own", "posts:edit", "desk:access"}
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func urlEncodePath(path string) string {
|
||||
var out strings.Builder
|
||||
for _, b := range []byte(path) {
|
||||
@@ -303,20 +356,34 @@ func withNavAuth(page map[string]any, cookieHeader string) {
|
||||
}
|
||||
|
||||
func (st *state) mountAuthRoutes(mux *http.ServeMux) {
|
||||
if st.auth.users == nil {
|
||||
if st.auth.users == nil && !(st.auth.rbac && st.auth.register) {
|
||||
return
|
||||
}
|
||||
lp := st.auth.loginPath
|
||||
mux.HandleFunc("GET "+lp, st.handleLoginGet)
|
||||
mux.HandleFunc("POST "+lp, st.handleLoginPost)
|
||||
altLogin := strings.TrimRight(st.auth.adminPrefix, "/") + "/login"
|
||||
if altLogin != lp {
|
||||
mux.HandleFunc("GET "+altLogin, st.handleLoginGet)
|
||||
mux.HandleFunc("POST "+altLogin, st.handleLoginPost)
|
||||
if st.auth.users != nil || st.auth.rbac {
|
||||
lp := st.auth.loginPath
|
||||
mux.HandleFunc("GET "+lp, st.handleLoginGet)
|
||||
mux.HandleFunc("POST "+lp, st.handleLoginPost)
|
||||
altLogin := strings.TrimRight(st.auth.adminPrefix, "/") + "/login"
|
||||
if altLogin != lp {
|
||||
mux.HandleFunc("GET "+altLogin, st.handleLoginGet)
|
||||
mux.HandleFunc("POST "+altLogin, st.handleLoginPost)
|
||||
}
|
||||
logoutPath := strings.TrimRight(st.auth.adminPrefix, "/") + "/logout"
|
||||
mux.HandleFunc("GET "+logoutPath, st.handleLogout)
|
||||
}
|
||||
if st.auth.register && st.auth.rbac {
|
||||
rp := st.auth.registerPath
|
||||
mux.HandleFunc("GET "+rp, st.handleRegisterGet)
|
||||
mux.HandleFunc("POST "+rp, st.handleRegisterPost)
|
||||
}
|
||||
if st.auth.rbac && st.dbURL != "" {
|
||||
mux.HandleFunc("GET /_rbac/roles", st.handleRbacListRoles)
|
||||
mux.HandleFunc("GET /_rbac/permissions", st.handleRbacListPermissions)
|
||||
mux.HandleFunc("POST /_rbac/roles", st.handleRbacCreateRole)
|
||||
mux.HandleFunc("POST /_rbac/roles/{id}/permissions", st.handleRbacSetRolePerms)
|
||||
mux.HandleFunc("POST /_rbac/assign", st.handleRbacAssign)
|
||||
mux.HandleFunc("GET /_rbac/desk", st.handleRbacDesk)
|
||||
}
|
||||
// Logout is part of session auth, not only built-in admin=True chrome.
|
||||
logoutPath := strings.TrimRight(st.auth.adminPrefix, "/") + "/logout"
|
||||
mux.HandleFunc("GET "+logoutPath, st.handleLogout)
|
||||
if st.auth.admin {
|
||||
adminHome := strings.TrimRight(st.auth.adminPrefix, "/")
|
||||
if adminHome == "" {
|
||||
@@ -327,7 +394,7 @@ func (st *state) mountAuthRoutes(mux *http.ServeMux) {
|
||||
}
|
||||
|
||||
func (st *state) handleLoginGet(w http.ResponseWriter, r *http.Request) {
|
||||
if st.auth.users == nil {
|
||||
if st.auth.users == nil && !st.auth.rbac {
|
||||
http.Redirect(w, r, st.auth.loginRedirect, http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
@@ -344,7 +411,7 @@ func (st *state) handleLoginGet(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
func (st *state) handleLoginPost(w http.ResponseWriter, r *http.Request) {
|
||||
if st.auth.users == nil {
|
||||
if st.auth.users == nil && !st.auth.rbac {
|
||||
http.Redirect(w, r, st.auth.loginRedirect, http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
@@ -374,7 +441,7 @@ func (st *state) handleLoginPost(w http.ResponseWriter, r *http.Request) {
|
||||
_, _ = io.WriteString(w, loginPageHTML(st.auth.loginPath, &msg, csrf, r.FormValue("next")))
|
||||
return
|
||||
}
|
||||
res := auth.Login(username, password, st.auth.users, st.auth.sessionTTL)
|
||||
res := st.tryLogin(username, password)
|
||||
if ok, _ := res["ok"].(bool); !ok {
|
||||
ratelimit.RecordFailure(ip, username)
|
||||
errMsg := "Invalid username or password."
|
||||
@@ -385,11 +452,54 @@ func (st *state) handleLoginPost(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
ratelimit.ClearSuccess(ip, username)
|
||||
sessID, _ := res["session_id"].(string)
|
||||
role, _ := res["role"].(string)
|
||||
st.attachLoginPermissions(sessID, username, role)
|
||||
dest := loginDest(r, st.auth.loginRedirect)
|
||||
w.Header().Add("Set-Cookie", session.IssueCookie(sessID))
|
||||
http.Redirect(w, r, dest, http.StatusSeeOther)
|
||||
}
|
||||
|
||||
// tryLogin: GFM users first, then web_users when RBAC is on.
|
||||
func (st *state) tryLogin(username, password string) map[string]any {
|
||||
if st.auth.users != nil {
|
||||
res := auth.Login(username, password, st.auth.users, st.auth.sessionTTL)
|
||||
if ok, _ := res["ok"].(bool); ok {
|
||||
u, _ := res["username"].(string)
|
||||
role, _ := res["role"].(string)
|
||||
st.seedGFMUserIntoRBAC(u, password, role)
|
||||
return res
|
||||
}
|
||||
}
|
||||
if st.auth.rbac && st.dbURL != "" {
|
||||
role, ok, err := rbac.Authenticate(st.dbURL, username, password, passwordVerify)
|
||||
if err == nil && ok {
|
||||
id := session.NewID(st.auth.sessionTTL)
|
||||
session.SetValue(id, "username", username)
|
||||
session.SetValue(id, "role", role)
|
||||
return map[string]any{
|
||||
"ok": true, "session_id": id, "username": username, "role": role,
|
||||
}
|
||||
}
|
||||
}
|
||||
return map[string]any{"ok": false}
|
||||
}
|
||||
|
||||
func (st *state) attachLoginPermissions(sessID, username, role string) {
|
||||
var perms []string
|
||||
if st.dbURL != "" && st.auth.rbac {
|
||||
if dbPerms, err := rbac.PermissionsForUser(st.dbURL, username); err == nil && len(dbPerms) > 0 {
|
||||
perms = dbPerms
|
||||
}
|
||||
}
|
||||
if len(perms) == 0 {
|
||||
perms = rbac.ExpandRole(role)
|
||||
}
|
||||
if len(perms) == 0 {
|
||||
perms = expandLegacyRole(role)
|
||||
}
|
||||
auth.AttachPermissions(sessID, perms)
|
||||
}
|
||||
|
||||
func (st *state) handleLogout(w http.ResponseWriter, r *http.Request) {
|
||||
if sid, ok := session.IDFromCookie(r.Header.Get("Cookie")); ok {
|
||||
auth.Logout(sid)
|
||||
@@ -469,6 +579,307 @@ a.back:hover { color:#f5e6c8; }
|
||||
</body></html>`, errHTML, esc(loginAction), csrfField, nextField)
|
||||
}
|
||||
|
||||
func passwordVerify(pass, encoded string) bool {
|
||||
return password.Verify(pass, encoded)
|
||||
}
|
||||
|
||||
func (st *state) seedGFMUserIntoRBAC(username, plaintext, role string) {
|
||||
if !st.auth.rbac || st.dbURL == "" || username == "" {
|
||||
return
|
||||
}
|
||||
exists, err := rbac.UserExists(st.dbURL, username)
|
||||
if err != nil || exists {
|
||||
return
|
||||
}
|
||||
hash, err := password.Hash(plaintext)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
target := "member"
|
||||
switch strings.ToLower(role) {
|
||||
case "admin", "superadmin":
|
||||
target = "superadmin"
|
||||
case "editor", "author":
|
||||
// custom roles may not exist yet; fall back to member + ExpandRole at session
|
||||
target = "member"
|
||||
}
|
||||
_ = rbac.EnsureUserWithRole(st.dbURL, username, hash, target)
|
||||
}
|
||||
|
||||
func (st *state) handleRegisterGet(w http.ResponseWriter, r *http.Request) {
|
||||
_, csrf, setCookie := resolveSession(r)
|
||||
html := registerPageHTML(st.auth.registerPath, nil, csrf)
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
appendSetCookie(w, setCookie)
|
||||
_, _ = io.WriteString(w, html)
|
||||
}
|
||||
|
||||
func (st *state) handleRegisterPost(w http.ResponseWriter, r *http.Request) {
|
||||
if err := r.ParseForm(); err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
sid, csrf, setCookie := resolveSession(r)
|
||||
csrfToken := r.FormValue("_csrf")
|
||||
if csrfToken != "" {
|
||||
if !session.ValidateCSRF(sid, csrfToken) {
|
||||
msg := "Invalid CSRF token."
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
appendSetCookie(w, setCookie)
|
||||
_, _ = io.WriteString(w, registerPageHTML(st.auth.registerPath, &msg, csrf))
|
||||
return
|
||||
}
|
||||
}
|
||||
username := strings.TrimSpace(r.FormValue("username"))
|
||||
pass := r.FormValue("password")
|
||||
if len(username) < 2 || len(pass) < 4 {
|
||||
msg := "Username (≥2) and password (≥4) required."
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
appendSetCookie(w, setCookie)
|
||||
_, _ = io.WriteString(w, registerPageHTML(st.auth.registerPath, &msg, csrf))
|
||||
return
|
||||
}
|
||||
hash, err := password.Hash(pass)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
if err := rbac.RegisterUser(st.dbURL, username, hash, st.auth.defaultRole); err != nil {
|
||||
msg := err.Error()
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
appendSetCookie(w, setCookie)
|
||||
_, _ = io.WriteString(w, registerPageHTML(st.auth.registerPath, &msg, csrf))
|
||||
return
|
||||
}
|
||||
res := st.tryLogin(username, pass)
|
||||
if ok, _ := res["ok"].(bool); ok {
|
||||
sessID, _ := res["session_id"].(string)
|
||||
role, _ := res["role"].(string)
|
||||
st.attachLoginPermissions(sessID, username, role)
|
||||
w.Header().Add("Set-Cookie", session.IssueCookie(sessID))
|
||||
dest := st.auth.loginRedirect
|
||||
held := session.PermissionsFromSession(sessID)
|
||||
if !session.PermissionAllowed(held, []string{"desk:access"}) {
|
||||
dest = "/"
|
||||
}
|
||||
http.Redirect(w, r, dest, http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
http.Redirect(w, r, st.auth.loginPath, http.StatusSeeOther)
|
||||
}
|
||||
|
||||
func registerPageHTML(action string, errMsg *string, csrf string) string {
|
||||
errHTML := ""
|
||||
if errMsg != nil && *errMsg != "" {
|
||||
errHTML = fmt.Sprintf("<p class=\"flash err\">%s</p>", esc(*errMsg))
|
||||
}
|
||||
csrfField := ""
|
||||
if csrf != "" {
|
||||
csrfField = fmt.Sprintf("<input type=\"hidden\" name=\"_csrf\" value=\"%s\"/>", esc(csrf))
|
||||
}
|
||||
return fmt.Sprintf(`<!DOCTYPE html>
|
||||
<html lang="en"><head>
|
||||
<meta charset="utf-8"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||
<title>Register</title>
|
||||
<style>
|
||||
:root { --ink:#0a0809; --paper:#f5e6c8; --gold:#d4af37; --err:#b91c1c; }
|
||||
* { box-sizing:border-box; }
|
||||
body { margin:0; min-height:100vh; display:grid; place-items:center; color:var(--paper); font-family:"Noto Sans SC","IBM Plex Sans",system-ui,sans-serif;
|
||||
background: radial-gradient(ellipse 90%% 55%% at 50%% -15%%, rgba(107,30,58,.5), transparent 58%%), linear-gradient(180deg,#0a0809,#120c10 45%%,#0a0809); }
|
||||
.login { background:rgba(0,0,0,.45); border:1px solid rgba(212,175,55,.28); border-radius:12px; padding:2rem 2.25rem; width:min(92vw,22rem); }
|
||||
.login h1 { margin:0 0 .25rem; font-size:1.55rem; color:var(--gold); }
|
||||
.login .sub { color:rgba(245,230,200,.72); margin:0 0 1.25rem; font-size:.9rem; }
|
||||
.login form { display:grid; gap:.9rem; }
|
||||
.login label { display:grid; gap:.25rem; font-size:.85rem; }
|
||||
.login input { padding:.6rem .75rem; border:1px solid rgba(212,175,55,.35); border-radius:8px; font:inherit; color:var(--paper); background:rgba(10,8,9,.7); }
|
||||
.login button { background:linear-gradient(135deg,#f5e6c8,var(--gold)); color:var(--ink); border:0; padding:.65rem 1rem; border-radius:999px; cursor:pointer; font:inherit; font-weight:600; }
|
||||
.flash.err { background:rgba(185,28,28,.15); color:#fecaca; border:1px solid rgba(185,28,28,.45); padding:.6rem .8rem; border-radius:8px; margin:0 0 .9rem; font-size:.9rem; }
|
||||
a.back { color:var(--gold); text-decoration:none; font-size:.85rem; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="login">
|
||||
<h1>Create account</h1>
|
||||
<p class="sub">New members get the default role (comments).</p>
|
||||
%s
|
||||
<form method="post" action="%s">
|
||||
%s
|
||||
<label>Username<input name="username" autocomplete="username" required autofocus/></label>
|
||||
<label>Password<input name="password" type="password" autocomplete="new-password" required/></label>
|
||||
<button type="submit">Register</button>
|
||||
</form>
|
||||
<p style="margin:1.1rem 0 0"><a class="back" href="/login">← Sign in</a></p>
|
||||
</div>
|
||||
</body></html>`, errHTML, esc(action), csrfField)
|
||||
}
|
||||
|
||||
func (st *state) requireRolesManage(w http.ResponseWriter, r *http.Request) bool {
|
||||
held := session.PermissionsFromCookie(r.Header.Get("Cookie"))
|
||||
if !session.PermissionAllowed(held, []string{"roles:manage"}) {
|
||||
http.Error(w, "forbidden", http.StatusForbidden)
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func (st *state) writeJSON(w http.ResponseWriter, status int, v any) {
|
||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||
w.WriteHeader(status)
|
||||
_ = json.NewEncoder(w).Encode(v)
|
||||
}
|
||||
|
||||
func (st *state) handleRbacListRoles(w http.ResponseWriter, r *http.Request) {
|
||||
if !st.requireRolesManage(w, r) {
|
||||
return
|
||||
}
|
||||
roles, err := rbac.ListRoles(st.dbURL)
|
||||
if err != nil {
|
||||
st.writeJSON(w, http.StatusInternalServerError, map[string]any{"ok": false, "error": err.Error()})
|
||||
return
|
||||
}
|
||||
st.writeJSON(w, http.StatusOK, map[string]any{"ok": true, "roles": roles})
|
||||
}
|
||||
|
||||
func (st *state) handleRbacListPermissions(w http.ResponseWriter, r *http.Request) {
|
||||
if !st.requireRolesManage(w, r) {
|
||||
return
|
||||
}
|
||||
perms, err := rbac.ListPermissions(st.dbURL)
|
||||
if err != nil {
|
||||
st.writeJSON(w, http.StatusInternalServerError, map[string]any{"ok": false, "error": err.Error()})
|
||||
return
|
||||
}
|
||||
st.writeJSON(w, http.StatusOK, map[string]any{"ok": true, "permissions": perms})
|
||||
}
|
||||
|
||||
func (st *state) handleRbacCreateRole(w http.ResponseWriter, r *http.Request) {
|
||||
if !st.requireRolesManage(w, r) {
|
||||
return
|
||||
}
|
||||
var body struct {
|
||||
Name string `json:"name"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&body); err != nil || strings.TrimSpace(body.Name) == "" {
|
||||
st.writeJSON(w, http.StatusBadRequest, map[string]any{"ok": false, "error": "name required"})
|
||||
return
|
||||
}
|
||||
id, err := rbac.CreateRole(st.dbURL, strings.TrimSpace(body.Name))
|
||||
if err != nil {
|
||||
st.writeJSON(w, http.StatusBadRequest, map[string]any{"ok": false, "error": err.Error()})
|
||||
return
|
||||
}
|
||||
st.writeJSON(w, http.StatusOK, map[string]any{"ok": true, "id": id, "name": body.Name})
|
||||
}
|
||||
|
||||
func (st *state) handleRbacSetRolePerms(w http.ResponseWriter, r *http.Request) {
|
||||
if !st.requireRolesManage(w, r) {
|
||||
return
|
||||
}
|
||||
idStr := r.PathValue("id")
|
||||
roleID, err := strconv.ParseInt(idStr, 10, 64)
|
||||
if err != nil {
|
||||
st.writeJSON(w, http.StatusBadRequest, map[string]any{"ok": false, "error": "bad id"})
|
||||
return
|
||||
}
|
||||
var body struct {
|
||||
Permissions []string `json:"permissions"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
||||
st.writeJSON(w, http.StatusBadRequest, map[string]any{"ok": false, "error": "bad json"})
|
||||
return
|
||||
}
|
||||
grantable := session.PermissionsFromCookie(r.Header.Get("Cookie"))
|
||||
if err := rbac.SetRolePermissions(st.dbURL, roleID, body.Permissions, grantable); err != nil {
|
||||
st.writeJSON(w, http.StatusBadRequest, map[string]any{"ok": false, "error": err.Error()})
|
||||
return
|
||||
}
|
||||
st.writeJSON(w, http.StatusOK, map[string]any{"ok": true})
|
||||
}
|
||||
|
||||
func (st *state) handleRbacAssign(w http.ResponseWriter, r *http.Request) {
|
||||
if !st.requireRolesManage(w, r) {
|
||||
return
|
||||
}
|
||||
var body struct {
|
||||
Username string `json:"username"`
|
||||
Role string `json:"role"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
||||
st.writeJSON(w, http.StatusBadRequest, map[string]any{"ok": false, "error": "bad json"})
|
||||
return
|
||||
}
|
||||
if err := rbac.AssignRole(st.dbURL, body.Username, body.Role); err != nil {
|
||||
st.writeJSON(w, http.StatusBadRequest, map[string]any{"ok": false, "error": err.Error()})
|
||||
return
|
||||
}
|
||||
st.writeJSON(w, http.StatusOK, map[string]any{"ok": true})
|
||||
}
|
||||
|
||||
func (st *state) handleRbacDesk(w http.ResponseWriter, r *http.Request) {
|
||||
if !st.requireRolesManage(w, r) {
|
||||
return
|
||||
}
|
||||
roles, _ := rbac.ListRoles(st.dbURL)
|
||||
perms, _ := rbac.ListPermissions(st.dbURL)
|
||||
var roleOpts, permChecks strings.Builder
|
||||
for _, role := range roles {
|
||||
name, _ := role["name"].(string)
|
||||
id := role["id"]
|
||||
sys, _ := role["is_system"].(bool)
|
||||
tag := ""
|
||||
if sys {
|
||||
tag = " (system)"
|
||||
}
|
||||
fmt.Fprintf(&roleOpts, `<option value="%v">%s%s</option>`, id, esc(name), tag)
|
||||
}
|
||||
for _, p := range perms {
|
||||
code, _ := p["code"].(string)
|
||||
desc, _ := p["description"].(string)
|
||||
fmt.Fprintf(&permChecks, `<label style="display:block;margin:.25rem 0"><input type="checkbox" name="perm" value="%s"/> %s — %s</label>`,
|
||||
esc(code), esc(code), esc(desc))
|
||||
}
|
||||
html := fmt.Sprintf(`<!DOCTYPE html>
|
||||
<html lang="zh"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||
<title>Roles · RBAC</title>
|
||||
<style>
|
||||
body{font-family:"Noto Sans SC",system-ui,sans-serif;max-width:42rem;margin:2rem auto;padding:0 1rem;line-height:1.5}
|
||||
h1{font-size:1.4rem} section{margin:1.5rem 0;padding:1rem;border:1px solid #ddd;border-radius:8px}
|
||||
button{padding:.5rem 1rem;cursor:pointer} input,select{padding:.4rem;margin:.25rem 0;width:100%%;max-width:20rem}
|
||||
#msg{min-height:1.2rem;color:#b91c1c}
|
||||
</style></head><body>
|
||||
<h1>角色与权限</h1>
|
||||
<p>需 <code>roles:manage</code>。系统角色权限不可在此改写;可新建角色并勾选权限,或给用户赋角色。</p>
|
||||
<p id="msg"></p>
|
||||
<section>
|
||||
<h2>新建角色</h2>
|
||||
<input id="new-role" placeholder="角色名"/><button type="button" id="btn-create">创建</button>
|
||||
</section>
|
||||
<section>
|
||||
<h2>设置角色权限</h2>
|
||||
<select id="role-sel">%s</select>
|
||||
<div>%s</div>
|
||||
<button type="button" id="btn-set">保存权限</button>
|
||||
</section>
|
||||
<section>
|
||||
<h2>赋角色给用户</h2>
|
||||
<input id="assign-user" placeholder="用户名"/>
|
||||
<input id="assign-role" placeholder="角色名(如 member)"/>
|
||||
<button type="button" id="btn-assign">赋权</button>
|
||||
</section>
|
||||
<p><a href="/desk">← 后台</a></p>
|
||||
<script>
|
||||
const msg=document.getElementById('msg');
|
||||
async function j(url,opt){const r=await fetch(url,Object.assign({credentials:'same-origin',headers:{'Content-Type':'application/json'}},opt||{}));const d=await r.json();if(!d.ok)throw new Error(d.error||r.status);return d;}
|
||||
document.getElementById('btn-create').onclick=async()=>{try{const name=document.getElementById('new-role').value.trim();await j('/_rbac/roles',{method:'POST',body:JSON.stringify({name})});msg.textContent='已创建 '+name;location.reload();}catch(e){msg.textContent=e.message;}};
|
||||
document.getElementById('btn-set').onclick=async()=>{try{const id=document.getElementById('role-sel').value;const permissions=[...document.querySelectorAll('input[name=perm]:checked')].map(x=>x.value);await j('/_rbac/roles/'+id+'/permissions',{method:'POST',body:JSON.stringify({permissions})});msg.textContent='权限已保存';}catch(e){msg.textContent=e.message;}};
|
||||
document.getElementById('btn-assign').onclick=async()=>{try{const username=document.getElementById('assign-user').value.trim();const role=document.getElementById('assign-role').value.trim();await j('/_rbac/assign',{method:'POST',body:JSON.stringify({username,role})});msg.textContent='已赋 '+role+' → '+username;}catch(e){msg.textContent=e.message;}};
|
||||
</script>
|
||||
</body></html>`, roleOpts.String(), permChecks.String())
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
_, _ = io.WriteString(w, html)
|
||||
}
|
||||
|
||||
func clientIP(r *http.Request) string {
|
||||
if xff := r.Header.Get("X-Forwarded-For"); xff != "" {
|
||||
if i := strings.Index(xff, ","); i >= 0 {
|
||||
|
||||
@@ -22,9 +22,11 @@ import (
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/form"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/middleware"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/ratelimit"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/rbac"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/render"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/session"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/sitemap"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/tenant"
|
||||
)
|
||||
|
||||
// NewHandler builds the HTTP handler for an app bag (no listen).
|
||||
@@ -35,6 +37,11 @@ func NewHandler(appBag map[string]any, entryDir string) (http.Handler, error) {
|
||||
}
|
||||
authCfg := authConfigOf(appBag)
|
||||
dbURL := dbURLOf(appBag)
|
||||
if authCfg.rbac && dbURL != "" {
|
||||
if err := rbac.EnsureSchema(dbURL); err != nil {
|
||||
return nil, fmt.Errorf("rbac ensure: %w", err)
|
||||
}
|
||||
}
|
||||
session.Configure(session.Config{
|
||||
DBURL: dbURL,
|
||||
TTLSec: authCfg.sessionTTL,
|
||||
@@ -99,6 +106,7 @@ func NewHandler(appBag map[string]any, entryDir string) (http.Handler, error) {
|
||||
proxyRoutes: routeMapOf(appBag, "proxy_routes"),
|
||||
invokeRoutes: routeMapOf(appBag, "invoke_routes"),
|
||||
auth: authCfg,
|
||||
tenant: tenant.FromBag(appBag),
|
||||
}
|
||||
|
||||
mux := http.NewServeMux()
|
||||
@@ -132,7 +140,7 @@ func NewHandler(appBag map[string]any, entryDir string) (http.Handler, error) {
|
||||
route := jr
|
||||
pattern := route.Method + " " + route.Path
|
||||
mux.HandleFunc(pattern, func(w http.ResponseWriter, r *http.Request) {
|
||||
st.handleJSON(w, route)
|
||||
st.handleJSON(w, r, route)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -217,6 +225,7 @@ func NewHandler(appBag map[string]any, entryDir string) (http.Handler, error) {
|
||||
|
||||
handler := withMiddleware(mux, mw)
|
||||
handler = withRBAC(handler, authCfg.gates, authCfg.loginPath)
|
||||
handler = withTenant(handler, st.tenant)
|
||||
return handler, nil
|
||||
}
|
||||
|
||||
@@ -280,6 +289,7 @@ type state struct {
|
||||
proxyRoutes map[string]any
|
||||
invokeRoutes map[string]any
|
||||
auth authConfig
|
||||
tenant tenant.Config
|
||||
}
|
||||
|
||||
func (st *state) handleHome(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -432,6 +442,11 @@ func (st *state) handleFormPost(w http.ResponseWriter, r *http.Request) {
|
||||
data[k] = vs[0]
|
||||
}
|
||||
}
|
||||
if st.tenant.Enabled() && st.tenant.DefaultScope {
|
||||
if tid := tenant.FromContext(r.Context()); tid != "" {
|
||||
data = tenant.StampRow(data, st.tenant.Column, tid)
|
||||
}
|
||||
}
|
||||
res, err := form.Submit(frm, data, st.dbURL)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
@@ -447,12 +462,21 @@ func (st *state) handleFormPost(w http.ResponseWriter, r *http.Request) {
|
||||
_, _ = io.WriteString(w, html)
|
||||
}
|
||||
|
||||
func (st *state) handleJSON(w http.ResponseWriter, route middleware.JSONRouteMount) {
|
||||
func (st *state) handleJSON(w http.ResponseWriter, r *http.Request, route middleware.JSONRouteMount) {
|
||||
if st.dbURL == "" {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]any{"error": "no database"})
|
||||
return
|
||||
}
|
||||
opts := db.SelectOpts{Where: route.Where, Order: route.Order}
|
||||
where := route.Where
|
||||
if (route.TenantScope || st.tenant.DefaultScope) && st.tenant.Enabled() {
|
||||
tid := tenant.FromContext(r.Context())
|
||||
if tid == "" {
|
||||
writeJSON(w, http.StatusBadRequest, map[string]any{"error": "tenant required"})
|
||||
return
|
||||
}
|
||||
where = tenant.MergeWhere(where, st.tenant.Column, tid)
|
||||
}
|
||||
opts := db.SelectOpts{Where: where, Order: route.Order}
|
||||
out, err := db.Select(st.dbURL, route.Table, route.Limit, opts)
|
||||
if err != nil {
|
||||
writeJSON(w, http.StatusInternalServerError, map[string]any{"error": err.Error()})
|
||||
@@ -461,6 +485,17 @@ func (st *state) handleJSON(w http.ResponseWriter, route middleware.JSONRouteMou
|
||||
writeJSON(w, http.StatusOK, out)
|
||||
}
|
||||
|
||||
func withTenant(next http.Handler, cfg tenant.Config) http.Handler {
|
||||
if !cfg.Enabled() {
|
||||
return next
|
||||
}
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
id := tenant.Resolve(r, cfg)
|
||||
ctx := tenant.WithContext(r.Context(), id)
|
||||
next.ServeHTTP(w, r.WithContext(ctx))
|
||||
})
|
||||
}
|
||||
|
||||
func withMiddleware(next http.Handler, mw middleware.Config) http.Handler {
|
||||
h := next
|
||||
if mw.BodyLimit != nil && *mw.BodyLimit > 0 {
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
package httpx
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"github.com/gorilla/websocket"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/plugin"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/session"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/ws"
|
||||
)
|
||||
|
||||
@@ -13,14 +18,44 @@ var wsUpgrader = websocket.Upgrader{
|
||||
|
||||
func (st *state) mountWSRoutes(mux *http.ServeMux) {
|
||||
for _, path := range sortedKeys(st.wsRoutes) {
|
||||
spec := ws.ParseRouteSpec(st.wsRoutes[path]) // mode + optional room_key
|
||||
spec := ws.ParseRouteSpec(st.wsRoutes[path]) // mode + optional room_key / on_message
|
||||
routePath := path
|
||||
mux.HandleFunc("GET "+routePath, func(w http.ResponseWriter, r *http.Request) {
|
||||
pattern := routePath
|
||||
if strings.Contains(routePath, "{") {
|
||||
pattern = goMuxPattern(routePath)
|
||||
}
|
||||
mux.HandleFunc("GET "+pattern, func(w http.ResponseWriter, r *http.Request) {
|
||||
st.handleWS(w, r, routePath, spec)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func pathValuesOf(r *http.Request, routePath string) map[string]string {
|
||||
out := map[string]string{}
|
||||
// Collect {name} tokens from the route template.
|
||||
rest := routePath
|
||||
for {
|
||||
i := strings.Index(rest, "{")
|
||||
if i < 0 {
|
||||
break
|
||||
}
|
||||
rest = rest[i+1:]
|
||||
j := strings.Index(rest, "}")
|
||||
if j < 0 {
|
||||
break
|
||||
}
|
||||
name := rest[:j]
|
||||
name = strings.TrimPrefix(name, "*")
|
||||
if name != "" {
|
||||
if v := r.PathValue(name); v != "" {
|
||||
out[name] = v
|
||||
}
|
||||
}
|
||||
rest = rest[j+1:]
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func (st *state) handleWS(w http.ResponseWriter, r *http.Request, path string, spec ws.RouteSpec) {
|
||||
conn, err := wsUpgrader.Upgrade(w, r, nil)
|
||||
if err != nil {
|
||||
@@ -28,6 +63,7 @@ func (st *state) handleWS(w http.ResponseWriter, r *http.Request, path string, s
|
||||
}
|
||||
defer conn.Close()
|
||||
|
||||
vals := pathValuesOf(r, path)
|
||||
switch spec.Mode {
|
||||
case ws.ModeEcho:
|
||||
for {
|
||||
@@ -53,11 +89,26 @@ func (st *state) handleWS(w http.ResponseWriter, r *http.Request, path string, s
|
||||
case ws.ModeBroadcast, ws.ModeRoom:
|
||||
room := path
|
||||
if spec.RoomKey != "" {
|
||||
room = spec.RoomKey
|
||||
room = ws.ExpandTemplate(spec.RoomKey, vals)
|
||||
} else if len(vals) > 0 {
|
||||
room = ws.ExpandTemplate(path, vals)
|
||||
}
|
||||
user := session.UsernameFromCookie(r.Header.Get("Cookie"))
|
||||
if user == "" {
|
||||
user = "anon"
|
||||
}
|
||||
ch := ws.JoinRoom(room)
|
||||
defer ws.LeaveRoom(room, ch)
|
||||
|
||||
presenceRoom := room + ".presence"
|
||||
var presenceCh chan string
|
||||
if spec.Presence {
|
||||
presenceCh = ws.JoinRoom(presenceRoom)
|
||||
defer ws.LeaveRoom(presenceRoom, presenceCh)
|
||||
ws.PublishRoom(presenceRoom, presenceJSON("join", user, room))
|
||||
defer ws.PublishRoom(presenceRoom, presenceJSON("leave", user, room))
|
||||
}
|
||||
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
defer close(done)
|
||||
@@ -67,7 +118,25 @@ func (st *state) handleWS(w http.ResponseWriter, r *http.Request, path string, s
|
||||
return
|
||||
}
|
||||
if mt == websocket.TextMessage {
|
||||
ws.PublishRoom(room, string(data))
|
||||
text := string(data)
|
||||
if spec.OnMessage != "" {
|
||||
out, err := plugin.CallLibPath(spec.OnMessage, map[string]any{
|
||||
"message": text,
|
||||
"room": room,
|
||||
"path": path,
|
||||
"user": user,
|
||||
})
|
||||
if err != nil {
|
||||
_ = conn.WriteMessage(websocket.TextMessage, []byte(`{"error":`+jsonQuote(err.Error())+`}`))
|
||||
continue
|
||||
}
|
||||
skip, rewritten := interpretOnMessage(out, text)
|
||||
if skip {
|
||||
continue
|
||||
}
|
||||
text = rewritten
|
||||
}
|
||||
ws.PublishRoom(room, text)
|
||||
} else if mt == websocket.CloseMessage {
|
||||
return
|
||||
}
|
||||
@@ -85,9 +154,66 @@ func (st *state) handleWS(w http.ResponseWriter, r *http.Request, path string, s
|
||||
if err := conn.WriteMessage(websocket.TextMessage, []byte(text)); err != nil {
|
||||
return
|
||||
}
|
||||
case text, ok := <-presenceOrNil(presenceCh):
|
||||
if presenceCh == nil {
|
||||
continue
|
||||
}
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
if err := conn.WriteMessage(websocket.TextMessage, []byte(text)); err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
default:
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func presenceOrNil(ch chan string) <-chan string {
|
||||
if ch == nil {
|
||||
return nil
|
||||
}
|
||||
return ch
|
||||
}
|
||||
|
||||
func presenceJSON(event, user, room string) string {
|
||||
b, _ := json.Marshal(map[string]any{
|
||||
"type": "presence",
|
||||
"event": event,
|
||||
"user": user,
|
||||
"room": room,
|
||||
})
|
||||
return string(b)
|
||||
}
|
||||
|
||||
func jsonQuote(s string) string {
|
||||
b, _ := json.Marshal(s)
|
||||
return string(b)
|
||||
}
|
||||
|
||||
func interpretOnMessage(out any, original string) (skip bool, text string) {
|
||||
text = original
|
||||
m, ok := out.(map[string]any)
|
||||
if !ok {
|
||||
if s, ok := out.(string); ok && s != "" {
|
||||
return false, s
|
||||
}
|
||||
return false, original
|
||||
}
|
||||
if v, ok := m["skip"]; ok && boolish(v) {
|
||||
return true, ""
|
||||
}
|
||||
if v, ok := m["drop"]; ok && boolish(v) {
|
||||
return true, ""
|
||||
}
|
||||
if v, ok := m["message"]; ok {
|
||||
text = fmt.Sprint(v)
|
||||
} else if v, ok := m["消息"]; ok {
|
||||
text = fmt.Sprint(v)
|
||||
} else if v, ok := m["text"]; ok {
|
||||
text = fmt.Sprint(v)
|
||||
}
|
||||
return false, text
|
||||
}
|
||||
@@ -34,12 +34,13 @@ type CORSConfig struct {
|
||||
|
||||
// JSONRouteMount is one JSON API route with leading-slash path.
|
||||
type JSONRouteMount struct {
|
||||
Path string
|
||||
Method string
|
||||
Table string
|
||||
Where any
|
||||
Order string
|
||||
Limit int64
|
||||
Path string
|
||||
Method string
|
||||
Table string
|
||||
Where any
|
||||
Order string
|
||||
Limit int64
|
||||
TenantScope bool
|
||||
}
|
||||
|
||||
// Configure merges configure tables into app.middleware (Rust web_app_middleware).
|
||||
@@ -178,6 +179,11 @@ func parseJSONRoute(path string, spec any) (JSONRouteMount, bool) {
|
||||
if w, ok := m["where"]; ok && w != nil {
|
||||
r.Where = w
|
||||
}
|
||||
if v, ok := m["tenant_scope"]; ok {
|
||||
r.TenantScope = boolish(v)
|
||||
} else if v, ok := m["租户作用域"]; ok {
|
||||
r.TenantScope = boolish(v)
|
||||
}
|
||||
return r, true
|
||||
}
|
||||
|
||||
@@ -255,7 +261,7 @@ func SecurityFromTable(tableV any) map[string]any {
|
||||
return out
|
||||
}
|
||||
|
||||
// JSONRoutesFromTable normalizes `|路径|方法|表|条件|排序|上限|` into json_routes.
|
||||
// JSONRoutesFromTable normalizes `|路径|方法|表|条件|排序|上限|租户作用域|` into json_routes.
|
||||
func JSONRoutesFromTable(tableV any) map[string]any {
|
||||
rows, _ := table.AsRows(tableV).([]any)
|
||||
out := map[string]any{}
|
||||
@@ -291,6 +297,9 @@ func JSONRoutesFromTable(tableV any) map[string]any {
|
||||
if order != "" {
|
||||
spec["order"] = order
|
||||
}
|
||||
if scope := col(m, "租户作用域", "tenant_scope", "TenantScope"); scope != "" {
|
||||
spec["tenant_scope"] = boolish(scope)
|
||||
}
|
||||
out[path] = spec
|
||||
}
|
||||
return out
|
||||
|
||||
@@ -0,0 +1,510 @@
|
||||
// Package rbac implements configurable role ⊥ permission for ext/web.
|
||||
package rbac
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/db"
|
||||
)
|
||||
|
||||
// Perm is one catalog entry.
|
||||
type Perm struct {
|
||||
Code string
|
||||
Resource string
|
||||
Action string
|
||||
Description string
|
||||
}
|
||||
|
||||
// DefaultCatalog is seeded when EnsureSchema runs.
|
||||
func DefaultCatalog() []Perm {
|
||||
return []Perm{
|
||||
{"comments:create", "comments", "create", "Create a comment"},
|
||||
{"comments:delete", "comments", "delete", "Delete any comment"},
|
||||
{"comments:delete_own", "comments", "delete_own", "Delete own comment"},
|
||||
{"desk:access", "desk", "access", "Access writing desk / admin chrome"},
|
||||
{"roles:manage", "roles", "manage", "Create roles and assign permissions"},
|
||||
{"posts:edit", "posts", "edit", "Create or edit posts"},
|
||||
{"users:manage", "users", "manage", "Manage user accounts"},
|
||||
}
|
||||
}
|
||||
|
||||
// AllCodes returns every default permission code.
|
||||
func AllCodes() []string {
|
||||
cat := DefaultCatalog()
|
||||
out := make([]string, len(cat))
|
||||
for i, p := range cat {
|
||||
out[i] = p.Code
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// ExpandRole maps legacy/system role names to permission codes when DB grants are empty.
|
||||
func ExpandRole(role string) []string {
|
||||
switch strings.ToLower(strings.TrimSpace(role)) {
|
||||
case "superadmin", "admin":
|
||||
return AllCodes()
|
||||
case "member", "user":
|
||||
return []string{"comments:create", "comments:delete_own"}
|
||||
case "editor", "author":
|
||||
return []string{"comments:create", "comments:delete_own", "posts:edit", "desk:access"}
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// ParseCSV splits a CSV of permission or role tokens.
|
||||
func ParseCSV(s string) []string {
|
||||
var out []string
|
||||
for _, part := range strings.Split(s, ",") {
|
||||
part = strings.ToLower(strings.TrimSpace(part))
|
||||
if part != "" {
|
||||
out = append(out, part)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// HasAny reports whether held contains any of needed (case-insensitive).
|
||||
// Empty needed → false. Held containing "*" → true.
|
||||
func HasAny(held, needed []string) bool {
|
||||
if len(needed) == 0 {
|
||||
return false
|
||||
}
|
||||
set := map[string]struct{}{}
|
||||
for _, h := range held {
|
||||
h = strings.ToLower(strings.TrimSpace(h))
|
||||
if h == "*" {
|
||||
return true
|
||||
}
|
||||
if h != "" {
|
||||
set[h] = struct{}{}
|
||||
}
|
||||
}
|
||||
for _, n := range needed {
|
||||
n = strings.ToLower(strings.TrimSpace(n))
|
||||
if _, ok := set[n]; ok {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// MergeUnique concatenates permission lists.
|
||||
func MergeUnique(lists ...[]string) []string {
|
||||
seen := map[string]struct{}{}
|
||||
var out []string
|
||||
for _, list := range lists {
|
||||
for _, p := range list {
|
||||
p = strings.ToLower(strings.TrimSpace(p))
|
||||
if p == "" {
|
||||
continue
|
||||
}
|
||||
if _, ok := seen[p]; ok {
|
||||
continue
|
||||
}
|
||||
seen[p] = struct{}{}
|
||||
out = append(out, p)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
const schemaSQL = `
|
||||
CREATE TABLE IF NOT EXISTS web_permissions (
|
||||
code TEXT PRIMARY KEY,
|
||||
resource TEXT NOT NULL,
|
||||
action TEXT NOT NULL,
|
||||
description TEXT
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS web_roles (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
name TEXT NOT NULL UNIQUE,
|
||||
is_system INTEGER NOT NULL DEFAULT 0,
|
||||
tenant_id TEXT
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS web_role_permissions (
|
||||
role_id INTEGER NOT NULL,
|
||||
permission_code TEXT NOT NULL,
|
||||
PRIMARY KEY (role_id, permission_code),
|
||||
FOREIGN KEY (role_id) REFERENCES web_roles(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY (permission_code) REFERENCES web_permissions(code) ON DELETE CASCADE
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS web_users (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
username TEXT NOT NULL UNIQUE,
|
||||
password_hash TEXT NOT NULL,
|
||||
created_at TEXT
|
||||
);
|
||||
CREATE TABLE IF NOT EXISTS web_user_roles (
|
||||
user_id INTEGER NOT NULL,
|
||||
role_id INTEGER NOT NULL,
|
||||
tenant_id TEXT NOT NULL DEFAULT '',
|
||||
PRIMARY KEY (user_id, role_id, tenant_id),
|
||||
FOREIGN KEY (user_id) REFERENCES web_users(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY (role_id) REFERENCES web_roles(id) ON DELETE CASCADE
|
||||
);
|
||||
`
|
||||
|
||||
// EnsureSchema creates RBAC tables and seeds default catalog + system roles.
|
||||
func EnsureSchema(dbURL string) error {
|
||||
if strings.TrimSpace(dbURL) == "" {
|
||||
return fmt.Errorf("rbac: empty db url")
|
||||
}
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := sqlDB.Exec(schemaSQL); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, p := range DefaultCatalog() {
|
||||
_, _ = sqlDB.Exec(
|
||||
`INSERT OR IGNORE INTO web_permissions(code, resource, action, description) VALUES(?,?,?,?)`,
|
||||
p.Code, p.Resource, p.Action, p.Description,
|
||||
)
|
||||
}
|
||||
if err := ensureSystemRole(sqlDB, "superadmin", true, AllCodes()); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ensureSystemRole(sqlDB, "member", true, []string{"comments:create", "comments:delete_own"}); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func ensureSystemRole(sqlDB *sql.DB, name string, isSystem bool, perms []string) error {
|
||||
var id int64
|
||||
err := sqlDB.QueryRow(`SELECT id FROM web_roles WHERE name = ?`, name).Scan(&id)
|
||||
if err == sql.ErrNoRows {
|
||||
sys := 0
|
||||
if isSystem {
|
||||
sys = 1
|
||||
}
|
||||
res, err := sqlDB.Exec(`INSERT INTO web_roles(name, is_system) VALUES(?,?)`, name, sys)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
id, err = res.LastInsertId()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
} else if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, code := range perms {
|
||||
_, _ = sqlDB.Exec(
|
||||
`INSERT OR IGNORE INTO web_role_permissions(role_id, permission_code) VALUES(?,?)`,
|
||||
id, code,
|
||||
)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// PermissionsForUser returns permission codes granted via user_roles for username.
|
||||
func PermissionsForUser(dbURL, username string) ([]string, error) {
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rows, err := sqlDB.Query(`
|
||||
SELECT DISTINCT rp.permission_code
|
||||
FROM web_users u
|
||||
JOIN web_user_roles ur ON ur.user_id = u.id
|
||||
JOIN web_role_permissions rp ON rp.role_id = ur.role_id
|
||||
WHERE u.username = ?`, username)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var out []string
|
||||
for rows.Next() {
|
||||
var code string
|
||||
if err := rows.Scan(&code); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, strings.ToLower(code))
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// AssignRole binds username to role name (creates user row link only; user must exist in web_users).
|
||||
func AssignRole(dbURL, username, roleName string) error {
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var uid, rid int64
|
||||
if err := sqlDB.QueryRow(`SELECT id FROM web_users WHERE username = ?`, username).Scan(&uid); err != nil {
|
||||
return fmt.Errorf("rbac assign: user %q: %w", username, err)
|
||||
}
|
||||
if err := sqlDB.QueryRow(`SELECT id FROM web_roles WHERE name = ?`, roleName).Scan(&rid); err != nil {
|
||||
return fmt.Errorf("rbac assign: role %q: %w", roleName, err)
|
||||
}
|
||||
_, err = sqlDB.Exec(
|
||||
`INSERT OR IGNORE INTO web_user_roles(user_id, role_id, tenant_id) VALUES(?,?,?)`,
|
||||
uid, rid, "",
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
// CreateRole inserts a non-system role; returns role id.
|
||||
func CreateRole(dbURL, name string) (int64, error) {
|
||||
if err := EnsureSchema(dbURL); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
res, err := sqlDB.Exec(`INSERT INTO web_roles(name, is_system) VALUES(?,0)`, name)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return res.LastInsertId()
|
||||
}
|
||||
|
||||
// SetRolePermissions replaces role's permissions. grantable restricts what can be set (anti-escalation);
|
||||
// empty grantable means allow all catalog codes.
|
||||
func SetRolePermissions(dbURL string, roleID int64, codes, grantable []string) error {
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var isSystem int
|
||||
if err := sqlDB.QueryRow(`SELECT is_system FROM web_roles WHERE id = ?`, roleID).Scan(&isSystem); err != nil {
|
||||
return err
|
||||
}
|
||||
if isSystem == 1 {
|
||||
return fmt.Errorf("rbac: cannot rewrite system role permissions via set")
|
||||
}
|
||||
allow := map[string]struct{}{}
|
||||
if len(grantable) == 0 {
|
||||
for _, c := range AllCodes() {
|
||||
allow[c] = struct{}{}
|
||||
}
|
||||
} else {
|
||||
for _, c := range grantable {
|
||||
allow[strings.ToLower(c)] = struct{}{}
|
||||
}
|
||||
}
|
||||
tx, err := sqlDB.Begin()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer func() { _ = tx.Rollback() }()
|
||||
if _, err := tx.Exec(`DELETE FROM web_role_permissions WHERE role_id = ?`, roleID); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, code := range codes {
|
||||
code = strings.ToLower(strings.TrimSpace(code))
|
||||
if code == "" {
|
||||
continue
|
||||
}
|
||||
if _, ok := allow[code]; !ok {
|
||||
return fmt.Errorf("rbac: cannot grant permission %q (not held by actor)", code)
|
||||
}
|
||||
if _, err := tx.Exec(
|
||||
`INSERT INTO web_role_permissions(role_id, permission_code) VALUES(?,?)`,
|
||||
roleID, code,
|
||||
); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
// CreateUser inserts a web_users row with hashed password; returns user id.
|
||||
func CreateUser(dbURL, username, passwordHash string) (int64, error) {
|
||||
username = strings.TrimSpace(username)
|
||||
if username == "" || passwordHash == "" {
|
||||
return 0, fmt.Errorf("rbac: username and password_hash required")
|
||||
}
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
res, err := sqlDB.Exec(
|
||||
`INSERT INTO web_users(username, password_hash, created_at) VALUES(?,?,datetime('now'))`,
|
||||
username, passwordHash,
|
||||
)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return res.LastInsertId()
|
||||
}
|
||||
|
||||
// UserExists reports whether username is in web_users.
|
||||
func UserExists(dbURL, username string) (bool, error) {
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
var id int64
|
||||
err = sqlDB.QueryRow(`SELECT id FROM web_users WHERE username = ?`, username).Scan(&id)
|
||||
if err == sql.ErrNoRows {
|
||||
return false, nil
|
||||
}
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
return true, nil
|
||||
}
|
||||
|
||||
// Authenticate checks username/password against web_users; returns primary role name.
|
||||
func Authenticate(dbURL, username, pass string, verify func(password, encoded string) bool) (role string, ok bool, err error) {
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return "", false, err
|
||||
}
|
||||
var hash string
|
||||
var uid int64
|
||||
err = sqlDB.QueryRow(`SELECT id, password_hash FROM web_users WHERE username = ?`, username).Scan(&uid, &hash)
|
||||
if err == sql.ErrNoRows {
|
||||
return "", false, nil
|
||||
}
|
||||
if err != nil {
|
||||
return "", false, err
|
||||
}
|
||||
if verify == nil || !verify(pass, hash) {
|
||||
return "", false, nil
|
||||
}
|
||||
var roleName string
|
||||
err = sqlDB.QueryRow(`
|
||||
SELECT r.name FROM web_user_roles ur
|
||||
JOIN web_roles r ON r.id = ur.role_id
|
||||
WHERE ur.user_id = ?
|
||||
ORDER BY r.is_system DESC, r.name
|
||||
LIMIT 1`, uid).Scan(&roleName)
|
||||
if err == sql.ErrNoRows {
|
||||
return "member", true, nil
|
||||
}
|
||||
if err != nil {
|
||||
return "", false, err
|
||||
}
|
||||
return strings.ToLower(roleName), true, nil
|
||||
}
|
||||
|
||||
// RegisterUser creates web_users + assigns defaultRole (default member).
|
||||
func RegisterUser(dbURL, username, passwordHash, defaultRole string) error {
|
||||
if defaultRole == "" {
|
||||
defaultRole = "member"
|
||||
}
|
||||
exists, err := UserExists(dbURL, username)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if exists {
|
||||
return fmt.Errorf("rbac: username already taken")
|
||||
}
|
||||
if _, err := CreateUser(dbURL, username, passwordHash); err != nil {
|
||||
return err
|
||||
}
|
||||
return AssignRole(dbURL, username, defaultRole)
|
||||
}
|
||||
|
||||
// EnsureUserWithRole creates user if missing (hash may be empty → skip create) and assigns role.
|
||||
func EnsureUserWithRole(dbURL, username, passwordHash, roleName string) error {
|
||||
exists, err := UserExists(dbURL, username)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !exists {
|
||||
if passwordHash == "" {
|
||||
return fmt.Errorf("rbac: cannot create user %q without hash", username)
|
||||
}
|
||||
if _, err := CreateUser(dbURL, username, passwordHash); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return AssignRole(dbURL, username, roleName)
|
||||
}
|
||||
|
||||
// ListRoles returns [{id,name,is_system}, …].
|
||||
func ListRoles(dbURL string) ([]map[string]any, error) {
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rows, err := sqlDB.Query(`SELECT id, name, is_system FROM web_roles ORDER BY name`)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var out []map[string]any
|
||||
for rows.Next() {
|
||||
var id int64
|
||||
var name string
|
||||
var sys int
|
||||
if err := rows.Scan(&id, &name, &sys); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, map[string]any{"id": id, "name": name, "is_system": sys == 1})
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// ListPermissions returns catalog rows.
|
||||
func ListPermissions(dbURL string) ([]map[string]any, error) {
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rows, err := sqlDB.Query(`SELECT code, resource, action, description FROM web_permissions ORDER BY code`)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var out []map[string]any
|
||||
for rows.Next() {
|
||||
var code, resource, action, desc string
|
||||
if err := rows.Scan(&code, &resource, &action, &desc); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, map[string]any{
|
||||
"code": code, "resource": resource, "action": action, "description": desc,
|
||||
})
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// RolePermissionCodes returns permission codes for a role id.
|
||||
func RolePermissionCodes(dbURL string, roleID int64) ([]string, error) {
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rows, err := sqlDB.Query(`SELECT permission_code FROM web_role_permissions WHERE role_id = ? ORDER BY permission_code`, roleID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var out []string
|
||||
for rows.Next() {
|
||||
var code string
|
||||
if err := rows.Scan(&code); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, code)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// SetRolePermissionsByName looks up role by name then SetRolePermissions.
|
||||
func SetRolePermissionsByName(dbURL, roleName string, codes, grantable []string) error {
|
||||
sqlDB, err := openDB(dbURL)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var id int64
|
||||
if err := sqlDB.QueryRow(`SELECT id FROM web_roles WHERE name = ?`, roleName).Scan(&id); err != nil {
|
||||
return fmt.Errorf("rbac role %q: %w", roleName, err)
|
||||
}
|
||||
return SetRolePermissions(dbURL, id, codes, grantable)
|
||||
}
|
||||
|
||||
func openDB(dbURL string) (*sql.DB, error) {
|
||||
// Reuse db package pool via a no-op select path: open through Ensure-compatible helper.
|
||||
return db.OpenSQL(dbURL)
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package rbac_test
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/db"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/rbac"
|
||||
)
|
||||
|
||||
func TestHasAnyAndExpandRole(t *testing.T) {
|
||||
if !rbac.HasAny([]string{"desk:access", "comments:create"}, []string{"desk:access"}) {
|
||||
t.Fatal("expected desk:access held")
|
||||
}
|
||||
if rbac.HasAny([]string{"comments:create"}, []string{"desk:access"}) {
|
||||
t.Fatal("member should not have desk")
|
||||
}
|
||||
if !rbac.HasAny([]string{"*"}, []string{"roles:manage"}) {
|
||||
t.Fatal("star should allow all")
|
||||
}
|
||||
admin := rbac.ExpandRole("admin")
|
||||
if !rbac.HasAny(admin, []string{"roles:manage", "desk:access"}) {
|
||||
t.Fatalf("admin expand incomplete: %v", admin)
|
||||
}
|
||||
member := rbac.ExpandRole("member")
|
||||
if rbac.HasAny(member, []string{"desk:access"}) {
|
||||
t.Fatal("member must not get desk:access")
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureSchemaAndAssign(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
url := "sqlite:" + filepath.Join(dir, "rbac.db")
|
||||
if err := rbac.EnsureSchema(url); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sqlDB, err := db.OpenSQL(url)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
_, err = sqlDB.Exec(`INSERT INTO web_users(username, password_hash, created_at) VALUES('alice','x','now')`)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := rbac.AssignRole(url, "alice", "member"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
perms, err := rbac.PermissionsForUser(url, "alice")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !rbac.HasAny(perms, []string{"comments:create"}) {
|
||||
t.Fatalf("alice perms=%v", perms)
|
||||
}
|
||||
if rbac.HasAny(perms, []string{"roles:manage"}) {
|
||||
t.Fatal("member should not manage roles")
|
||||
}
|
||||
}
|
||||
@@ -612,6 +612,20 @@ func RoleFromCookie(cookieHeader string) string {
|
||||
return "visitor"
|
||||
}
|
||||
|
||||
// UsernameFromCookie returns the session username or empty string.
|
||||
func UsernameFromCookie(cookieHeader string) string {
|
||||
sid, ok := IDFromCookie(cookieHeader)
|
||||
if !ok {
|
||||
return ""
|
||||
}
|
||||
if v, ok := GetValue(sid, "username"); ok {
|
||||
if s, ok := v.(string); ok {
|
||||
return s
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// RoleAllowed reports whether role is in allowed (empty allowed = all).
|
||||
func RoleAllowed(role string, allowed []string) bool {
|
||||
if len(allowed) == 0 {
|
||||
@@ -625,3 +639,51 @@ func RoleAllowed(role string, allowed []string) bool {
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// PermissionsFromCookie returns session permission codes (empty if anonymous).
|
||||
func PermissionsFromCookie(cookieHeader string) []string {
|
||||
sid, ok := IDFromCookie(cookieHeader)
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
return PermissionsFromSession(sid)
|
||||
}
|
||||
|
||||
// PermissionsFromSession reads the permissions CSV from a session id.
|
||||
func PermissionsFromSession(sid string) []string {
|
||||
if v, ok := GetValue(sid, "permissions"); ok {
|
||||
if s, ok := v.(string); ok && s != "" {
|
||||
return ParseRolesCSV(s)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// SetPermissions stores permission codes on the session.
|
||||
func SetPermissions(sid string, codes []string) {
|
||||
SetValue(sid, "permissions", strings.Join(codes, ","))
|
||||
}
|
||||
|
||||
// PermissionAllowed reports whether the session holds any of needed.
|
||||
func PermissionAllowed(held, needed []string) bool {
|
||||
if len(needed) == 0 {
|
||||
return true
|
||||
}
|
||||
set := map[string]struct{}{}
|
||||
for _, h := range held {
|
||||
h = strings.ToLower(strings.TrimSpace(h))
|
||||
if h == "*" {
|
||||
return true
|
||||
}
|
||||
if h != "" {
|
||||
set[h] = struct{}{}
|
||||
}
|
||||
}
|
||||
for _, n := range needed {
|
||||
n = strings.ToLower(strings.TrimSpace(n))
|
||||
if _, ok := set[n]; ok {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
@@ -0,0 +1,252 @@
|
||||
// Package tenant resolves multi-tenant request context for ext/web.
|
||||
package tenant
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type ctxKey int
|
||||
|
||||
const requestKey ctxKey = 1
|
||||
|
||||
// Config is stored on the app bag under key "tenant".
|
||||
type Config struct {
|
||||
Mode string // path | subdomain | header
|
||||
Param string // path capture / query / header name
|
||||
Column string // DB column (default tenant_id)
|
||||
DefaultScope bool // auto-scope all selects/inserts when true
|
||||
}
|
||||
|
||||
// FromBag reads tenant config from an app bag.
|
||||
func FromBag(appBag map[string]any) Config {
|
||||
cfg := Config{Column: "tenant_id"}
|
||||
raw, ok := appBag["tenant"].(map[string]any)
|
||||
if !ok {
|
||||
return cfg
|
||||
}
|
||||
cfg.Mode = strings.ToLower(strings.TrimSpace(str(raw, "mode", "模式")))
|
||||
cfg.Param = strings.TrimSpace(str(raw, "param", "参数", "tenant_param"))
|
||||
if c := str(raw, "column", "列", "tenant_column"); c != "" {
|
||||
cfg.Column = c
|
||||
}
|
||||
if v, ok := raw["default_scope"]; ok {
|
||||
cfg.DefaultScope = boolish(v)
|
||||
} else if v, ok := raw["默认作用域"]; ok {
|
||||
cfg.DefaultScope = boolish(v)
|
||||
} else if v, ok := raw["scope"]; ok {
|
||||
cfg.DefaultScope = boolish(v)
|
||||
}
|
||||
return cfg
|
||||
}
|
||||
|
||||
// Enabled reports whether tenant resolution is configured.
|
||||
func (c Config) Enabled() bool {
|
||||
return c.Mode != ""
|
||||
}
|
||||
|
||||
// Configure merges tenant options onto the app bag.
|
||||
func Configure(appBag map[string]any, opts map[string]any) (map[string]any, error) {
|
||||
if opts == nil {
|
||||
opts = map[string]any{}
|
||||
}
|
||||
mode := strings.ToLower(strings.TrimSpace(str(opts, "mode", "模式")))
|
||||
if mode == "" {
|
||||
return nil, fmt.Errorf("tenant: mode required (path|subdomain|header)")
|
||||
}
|
||||
switch mode {
|
||||
case "path", "路径", "subdomain", "子域", "header", "头":
|
||||
default:
|
||||
return nil, fmt.Errorf("tenant: unknown mode %q", mode)
|
||||
}
|
||||
if mode == "路径" {
|
||||
mode = "path"
|
||||
}
|
||||
if mode == "子域" {
|
||||
mode = "subdomain"
|
||||
}
|
||||
if mode == "头" {
|
||||
mode = "header"
|
||||
}
|
||||
param := strings.TrimSpace(str(opts, "param", "参数", "tenant_param"))
|
||||
if param == "" {
|
||||
switch mode {
|
||||
case "path":
|
||||
param = "t"
|
||||
case "header":
|
||||
param = "X-Tenant-Id"
|
||||
case "subdomain":
|
||||
param = ""
|
||||
}
|
||||
}
|
||||
col := strings.TrimSpace(str(opts, "column", "列", "tenant_column"))
|
||||
if col == "" {
|
||||
col = "tenant_id"
|
||||
}
|
||||
entry := map[string]any{
|
||||
"mode": mode,
|
||||
"param": param,
|
||||
"column": col,
|
||||
}
|
||||
if v, ok := first(opts, "default_scope", "默认作用域", "scope"); ok {
|
||||
entry["default_scope"] = boolish(v)
|
||||
}
|
||||
out := clone(appBag)
|
||||
out["tenant"] = entry
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// Resolve extracts tenant id from the HTTP request.
|
||||
func Resolve(r *http.Request, cfg Config) string {
|
||||
if !cfg.Enabled() {
|
||||
return ""
|
||||
}
|
||||
switch cfg.Mode {
|
||||
case "path":
|
||||
if cfg.Param != "" {
|
||||
if v := r.PathValue(cfg.Param); v != "" {
|
||||
return sanitize(v)
|
||||
}
|
||||
if v := r.URL.Query().Get(cfg.Param); v != "" {
|
||||
return sanitize(v)
|
||||
}
|
||||
// /t/{tenant}/… when param is t: take segment after /t/
|
||||
parts := strings.Split(strings.Trim(r.URL.Path, "/"), "/")
|
||||
if cfg.Param == "t" && len(parts) >= 2 && parts[0] == "t" {
|
||||
return sanitize(parts[1])
|
||||
}
|
||||
for i, p := range parts {
|
||||
if p == cfg.Param && i+1 < len(parts) {
|
||||
return sanitize(parts[i+1])
|
||||
}
|
||||
}
|
||||
}
|
||||
case "subdomain":
|
||||
host := r.Host
|
||||
if h, _, ok := strings.Cut(host, ":"); ok {
|
||||
host = h
|
||||
}
|
||||
labels := strings.Split(host, ".")
|
||||
if len(labels) >= 3 {
|
||||
return sanitize(labels[0])
|
||||
}
|
||||
case "header":
|
||||
name := cfg.Param
|
||||
if name == "" {
|
||||
name = "X-Tenant-Id"
|
||||
}
|
||||
return sanitize(r.Header.Get(name))
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// WithContext stores tenant id on the request context.
|
||||
func WithContext(ctx context.Context, id string) context.Context {
|
||||
return context.WithValue(ctx, requestKey, id)
|
||||
}
|
||||
|
||||
// FromContext reads tenant id (empty if unset).
|
||||
func FromContext(ctx context.Context) string {
|
||||
if ctx == nil {
|
||||
return ""
|
||||
}
|
||||
if s, ok := ctx.Value(requestKey).(string); ok {
|
||||
return s
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// MergeWhere adds tenant_id equality to a where value (map or list of maps).
|
||||
func MergeWhere(where any, column, tenantID string) any {
|
||||
if tenantID == "" || column == "" {
|
||||
return where
|
||||
}
|
||||
clause := map[string]any{"字段": column, "field": column, "操作": "=", "op": "=", "值": tenantID, "value": tenantID}
|
||||
switch t := where.(type) {
|
||||
case nil:
|
||||
return []any{clause}
|
||||
case []any:
|
||||
out := make([]any, 0, len(t)+1)
|
||||
out = append(out, t...)
|
||||
out = append(out, clause)
|
||||
return out
|
||||
case map[string]any:
|
||||
out := cloneMap(t)
|
||||
out[column] = tenantID
|
||||
return out
|
||||
default:
|
||||
return []any{where, clause}
|
||||
}
|
||||
}
|
||||
|
||||
// StampRow sets tenant column on an insert/update row map if missing.
|
||||
func StampRow(row map[string]any, column, tenantID string) map[string]any {
|
||||
if row == nil || tenantID == "" || column == "" {
|
||||
return row
|
||||
}
|
||||
if _, ok := row[column]; ok {
|
||||
return row
|
||||
}
|
||||
out := cloneMap(row)
|
||||
out[column] = tenantID
|
||||
return out
|
||||
}
|
||||
|
||||
func sanitize(s string) string {
|
||||
s = strings.TrimSpace(strings.ToLower(s))
|
||||
var b strings.Builder
|
||||
for _, r := range s {
|
||||
if (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') || r == '-' || r == '_' {
|
||||
b.WriteRune(r)
|
||||
}
|
||||
}
|
||||
return b.String()
|
||||
}
|
||||
|
||||
func str(m map[string]any, keys ...string) string {
|
||||
for _, k := range keys {
|
||||
if v, ok := m[k]; ok && v != nil {
|
||||
if s, ok := v.(string); ok {
|
||||
return s
|
||||
}
|
||||
return fmt.Sprint(v)
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func first(m map[string]any, keys ...string) (any, bool) {
|
||||
for _, k := range keys {
|
||||
if v, ok := m[k]; ok && v != nil {
|
||||
return v, true
|
||||
}
|
||||
}
|
||||
return nil, false
|
||||
}
|
||||
|
||||
func boolish(v any) bool {
|
||||
switch t := v.(type) {
|
||||
case bool:
|
||||
return t
|
||||
case string:
|
||||
switch strings.TrimSpace(t) {
|
||||
case "true", "True", "1", "yes", "on", "真":
|
||||
return true
|
||||
}
|
||||
case float64:
|
||||
return t != 0
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func clone(m map[string]any) map[string]any {
|
||||
out := make(map[string]any, len(m))
|
||||
for k, v := range m {
|
||||
out[k] = v
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func cloneMap(m map[string]any) map[string]any { return clone(m) }
|
||||
@@ -0,0 +1,58 @@
|
||||
package tenant_test
|
||||
|
||||
import (
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/tenant"
|
||||
)
|
||||
|
||||
func TestResolvePathQuery(t *testing.T) {
|
||||
cfg := tenant.Config{Mode: "path", Param: "t", Column: "tenant_id"}
|
||||
r := httptest.NewRequest("GET", "/api/items?t=acme", nil)
|
||||
if got := tenant.Resolve(r, cfg); got != "acme" {
|
||||
t.Fatalf("got %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolvePathPrefix(t *testing.T) {
|
||||
cfg := tenant.Config{Mode: "path", Param: "t"}
|
||||
r := httptest.NewRequest("GET", "/t/beta/items", nil)
|
||||
if got := tenant.Resolve(r, cfg); got != "beta" {
|
||||
t.Fatalf("got %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveHeader(t *testing.T) {
|
||||
cfg := tenant.Config{Mode: "header", Param: "X-Tenant-Id"}
|
||||
r := httptest.NewRequest("GET", "/", nil)
|
||||
r.Header.Set("X-Tenant-Id", "Gamma")
|
||||
if got := tenant.Resolve(r, cfg); got != "gamma" {
|
||||
t.Fatalf("got %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMergeWhereAndStamp(t *testing.T) {
|
||||
w := tenant.MergeWhere(nil, "tenant_id", "acme")
|
||||
arr, ok := w.([]any)
|
||||
if !ok || len(arr) != 1 {
|
||||
t.Fatalf("where=%v", w)
|
||||
}
|
||||
row := tenant.StampRow(map[string]any{"title": "x"}, "tenant_id", "acme")
|
||||
if row["tenant_id"] != "acme" {
|
||||
t.Fatalf("row=%v", row)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConfigure(t *testing.T) {
|
||||
out, err := tenant.Configure(map[string]any{}, map[string]any{
|
||||
"mode": "path", "param": "org", "default_scope": true,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
cfg := tenant.FromBag(out)
|
||||
if cfg.Mode != "path" || cfg.Param != "org" || !cfg.DefaultScope {
|
||||
t.Fatalf("%+v", cfg)
|
||||
}
|
||||
}
|
||||
@@ -7,13 +7,15 @@ import (
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/app"
|
||||
)
|
||||
|
||||
// RouteSpec is one ws_routes entry (mode + optional room_key template).
|
||||
// RouteSpec is one ws_routes entry (mode + optional room_key / on_message / presence).
|
||||
type RouteSpec struct {
|
||||
Mode Mode
|
||||
RoomKey string
|
||||
Mode Mode
|
||||
RoomKey string
|
||||
OnMessage string
|
||||
Presence bool
|
||||
}
|
||||
|
||||
// RouteWS registers path → {mode, room_key?} on app.ws_routes (Rust web_app_route_ws).
|
||||
// RouteWS registers path → {mode, room_key?, on_message?, presence?} on app.ws_routes.
|
||||
func RouteWS(appBag map[string]any, path string, args map[string]any) (map[string]any, error) {
|
||||
path, err := app.NormalizeRoutePath(path, appBag)
|
||||
if err != nil {
|
||||
@@ -24,6 +26,8 @@ func RouteWS(appBag map[string]any, path string, args map[string]any) (map[strin
|
||||
if mode == ModeRoom && roomKey == "" {
|
||||
return nil, fmt.Errorf("mode=room requires room_key")
|
||||
}
|
||||
onMsg := OnMessageFromArgs(args)
|
||||
presence := PresenceFromArgs(args)
|
||||
out := clone(appBag)
|
||||
wsRoutes := map[string]any{}
|
||||
if r, ok := out["ws_routes"].(map[string]any); ok {
|
||||
@@ -33,6 +37,12 @@ func RouteWS(appBag map[string]any, path string, args map[string]any) (map[strin
|
||||
if roomKey != "" {
|
||||
spec["room_key"] = roomKey
|
||||
}
|
||||
if onMsg != "" {
|
||||
spec["on_message"] = onMsg
|
||||
}
|
||||
if presence {
|
||||
spec["presence"] = true
|
||||
}
|
||||
wsRoutes[path] = spec
|
||||
out["ws_routes"] = wsRoutes
|
||||
return out, nil
|
||||
@@ -46,6 +56,34 @@ func RoomKeyFromArgs(args map[string]any) string {
|
||||
return ""
|
||||
}
|
||||
|
||||
// OnMessageFromArgs reads on_message / 消息钩子 (lib.member path).
|
||||
func OnMessageFromArgs(args map[string]any) string {
|
||||
if v, ok := first(args, "on_message", "消息钩子", "钩子"); ok {
|
||||
return strings.TrimSpace(fmt.Sprint(v))
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// PresenceFromArgs reads presence / 在场 flag.
|
||||
func PresenceFromArgs(args map[string]any) bool {
|
||||
if v, ok := first(args, "presence", "在场"); ok {
|
||||
return boolish(v)
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// ExpandTemplate replaces `{name}` tokens using values from PathValue-style map.
|
||||
func ExpandTemplate(tmpl string, values map[string]string) string {
|
||||
if tmpl == "" || len(values) == 0 {
|
||||
return tmpl
|
||||
}
|
||||
out := tmpl
|
||||
for k, v := range values {
|
||||
out = strings.ReplaceAll(out, "{"+k+"}", v)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// RoutesOf reads ws_routes from an app bag.
|
||||
func RoutesOf(appBag map[string]any) map[string]Mode {
|
||||
out := map[string]Mode{}
|
||||
@@ -117,6 +155,16 @@ func parseRouteSpec(spec any) RouteSpec {
|
||||
if rk, ok := t["room_key"]; ok {
|
||||
out.RoomKey = strings.TrimSpace(fmt.Sprint(rk))
|
||||
}
|
||||
if om, ok := t["on_message"]; ok {
|
||||
out.OnMessage = strings.TrimSpace(fmt.Sprint(om))
|
||||
} else if om, ok := t["消息钩子"]; ok {
|
||||
out.OnMessage = strings.TrimSpace(fmt.Sprint(om))
|
||||
}
|
||||
if p, ok := t["presence"]; ok {
|
||||
out.Presence = boolish(p)
|
||||
} else if p, ok := t["在场"]; ok {
|
||||
out.Presence = boolish(p)
|
||||
}
|
||||
case string:
|
||||
out.Mode = ParseMode(t)
|
||||
default:
|
||||
|
||||
@@ -113,6 +113,33 @@ func TestRouteWSRoomRequiresKey(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestExpandTemplate(t *testing.T) {
|
||||
got := ws.ExpandTemplate("chat.room.{id}", map[string]string{"id": "lobby"})
|
||||
if got != "chat.room.lobby" {
|
||||
t.Fatalf("got %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRouteWSOnMessageAndPresence(t *testing.T) {
|
||||
a := app.New(nil)
|
||||
out, err := ws.RouteWS(a, "/chat/{id}", map[string]any{
|
||||
"mode": "room",
|
||||
"room_key": "chat.room.{id}",
|
||||
"on_message": "chat.persist",
|
||||
"presence": true,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
spec, err := ws.RouteSpecOf(out, "/chat/{id}")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if spec.OnMessage != "chat.persist" || !spec.Presence {
|
||||
t.Fatalf("spec=%+v", spec)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConnectRefusesBadURL(t *testing.T) {
|
||||
out := ws.Connect("http://127.0.0.1:1", "hi", nil, 1)
|
||||
if out["ok"] == true {
|
||||
|
||||
+27
-7
@@ -106,6 +106,15 @@ extern int web_auth_logout(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_auth_new(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_app_auth(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_app_gate(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_app_rbac(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_app_tenant(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_rbac_can(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_rbac_ensure(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_rbac_assign_role(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_rbac_create_role(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_rbac_set_role_permissions(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_rbac_list_roles(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_rbac_list_permissions(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_storage_new(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_storage_put(char *args_json, char **out_json, char **err_msg);
|
||||
extern int web_storage_get(char *args_json, char **out_json, char **err_msg);
|
||||
@@ -199,8 +208,17 @@ static int register_core(void) {
|
||||
if (host_register((char *)"web_auth_check", (char *)"session_id", web_auth_check) != 0) return 1;
|
||||
if (host_register((char *)"web_auth_logout", (char *)"session_id", web_auth_logout) != 0) return 1;
|
||||
if (host_register((char *)"web_auth_new", (char *)"users,session_ttl", web_auth_new) != 0) return 1;
|
||||
if (host_register((char *)"web_app_auth", (char *)"app,users,session_ttl,admin_prefix,login_redirect,logout_redirect,login_path", web_app_auth) != 0) return 1;
|
||||
if (host_register((char *)"web_app_gate", (char *)"app,path,roles,match,on_deny,exclude", web_app_gate) != 0) return 1;
|
||||
if (host_register((char *)"web_app_auth", (char *)"app,users,session_ttl,admin_prefix,login_redirect,logout_redirect,login_path,register,register_path,default_role", web_app_auth) != 0) return 1;
|
||||
if (host_register((char *)"web_app_gate", (char *)"app,path,roles,permissions,match,on_deny,exclude", web_app_gate) != 0) return 1;
|
||||
if (host_register((char *)"web_app_rbac", (char *)"app,catalog", web_app_rbac) != 0) return 1;
|
||||
if (host_register((char *)"web_app_tenant", (char *)"app,mode,param,column,default_scope", web_app_tenant) != 0) return 1;
|
||||
if (host_register((char *)"web_rbac_can", (char *)"permissions,needed", web_rbac_can) != 0) return 1;
|
||||
if (host_register((char *)"web_rbac_ensure", (char *)"url", web_rbac_ensure) != 0) return 1;
|
||||
if (host_register((char *)"web_rbac_assign_role", (char *)"url,username,role", web_rbac_assign_role) != 0) return 1;
|
||||
if (host_register((char *)"web_rbac_create_role", (char *)"url,name", web_rbac_create_role) != 0) return 1;
|
||||
if (host_register((char *)"web_rbac_set_role_permissions", (char *)"url,role,permissions,grantable", web_rbac_set_role_permissions) != 0) return 1;
|
||||
if (host_register((char *)"web_rbac_list_roles", (char *)"url", web_rbac_list_roles) != 0) return 1;
|
||||
if (host_register((char *)"web_rbac_list_permissions", (char *)"url", web_rbac_list_permissions) != 0) return 1;
|
||||
if (host_register((char *)"web_storage_new", (char *)"url", web_storage_new) != 0) return 1;
|
||||
if (host_register((char *)"web_storage_put", (char *)"url,key,body,path,content_type", web_storage_put) != 0) return 1;
|
||||
if (host_register((char *)"web_storage_get", (char *)"url,key", web_storage_get) != 0) return 1;
|
||||
@@ -226,7 +244,7 @@ static int register_core(void) {
|
||||
if (host_register((char *)"web_app_sitemap", (char *)"app,path,base,table,loc,limit,items", web_app_sitemap) != 0) return 1;
|
||||
if (host_register((char *)"web_app_robots", (char *)"app,body,sitemap", web_app_robots) != 0) return 1;
|
||||
if (host_register((char *)"web_sitemap_build", (char *)"base,items", web_sitemap_build) != 0) return 1;
|
||||
if (host_register((char *)"web_app_route_ws", (char *)"app,path,echo,mode", web_app_route_ws) != 0) return 1;
|
||||
if (host_register((char *)"web_app_route_ws", (char *)"app,path,echo,mode,room_key,on_message,presence", web_app_route_ws) != 0) return 1;
|
||||
if (host_register((char *)"web_ws_connect", (char *)"url,message,headers,timeout_sec", web_ws_connect) != 0) return 1;
|
||||
if (host_register((char *)"web_cache_new", (char *)"url", web_cache_new) != 0) return 1;
|
||||
if (host_register((char *)"web_cache_get", (char *)"url,key", web_cache_get) != 0) return 1;
|
||||
@@ -424,12 +442,14 @@ func resolveDbURL(url string) string {
|
||||
}
|
||||
|
||||
func dbURLOf(args map[string]any) (string, error) {
|
||||
if s, ok := argStr(args, "url", "db_url"); ok && s != "" {
|
||||
if s, ok := argStr(args, "url", "db_url", "数据库"); ok && s != "" {
|
||||
return resolveDbURL(s), nil
|
||||
}
|
||||
if dbObj, ok := args["db"].(map[string]any); ok {
|
||||
if s, ok := argStr(dbObj, "url"); ok && s != "" {
|
||||
return resolveDbURL(s), nil
|
||||
for _, key := range []string{"url", "db", "数据库"} {
|
||||
if dbObj, ok := args[key].(map[string]any); ok {
|
||||
if s, ok := argStr(dbObj, "url"); ok && s != "" {
|
||||
return resolveDbURL(s), nil
|
||||
}
|
||||
}
|
||||
}
|
||||
return "", fmt.Errorf("missing db url")
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
---
|
||||
title: web collab bag smoke
|
||||
description: route_ws room+presence for collab doc
|
||||
import web:ext/web/web.mq.md
|
||||
import json:lib/json.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
**首页 = > web.page title="c"**
|
||||
**应用 = > web.app page=`首页` admin=False**
|
||||
**应用 = > `应用`.route_ws path="/live/{id}" mode="room" room_key="doc.{id}" presence=True**
|
||||
**routes = > json.get value=`应用` key="ws_routes"**
|
||||
**spec = > json.get value=`routes` key="/live/{id}"**
|
||||
**mode = > json.get value=`spec` key="mode"**
|
||||
**pr = > json.get value=`spec` key="presence"**
|
||||
1. `mode` == "room"
|
||||
1. `pr` == True
|
||||
> print text=collab-ws-bag-ok
|
||||
2. *
|
||||
> print text=presence-fail
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=mode-fail
|
||||
> sys.exit code=1
|
||||
@@ -0,0 +1,56 @@
|
||||
---
|
||||
title: web RBAC smoke
|
||||
description: app.rbac flag + gate permissions CSV stored on app bag
|
||||
import web:ext/web/web.mq.md
|
||||
import json:lib/json.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
> print text=rbac-smoke-start
|
||||
|
||||
**首页 = > web.page title="home"**
|
||||
`用户表` =
|
||||
| 用户名 | 密码 | 角色 |
|
||||
|--------|------|------|
|
||||
| admin | secret | admin |
|
||||
|
||||
**应用 = > web.app page=`首页` admin=False**
|
||||
**应用 = > `应用`.enable_rbac**
|
||||
**authbag = > json.get value=`应用` key="auth"**
|
||||
**rbac_on = > json.get value=`authbag` key="rbac"**
|
||||
1. `rbac_on` == True
|
||||
> print text=rbac-flag-ok
|
||||
2. *
|
||||
> print text=rbac-flag-fail
|
||||
|
||||
**应用 = > `应用`.auth users=`用户表` login_path="/login"**
|
||||
**authbag2 = > json.get value=`应用` key="auth"**
|
||||
**rbac_kept = > json.get value=`authbag2` key="rbac"**
|
||||
1. `rbac_kept` == True
|
||||
> print text=rbac-survives-auth-ok
|
||||
2. *
|
||||
> print text=rbac-survives-auth-fail
|
||||
|
||||
**应用 = > `应用`.gate path="/desk" permissions="desk:access" match="prefix" on_deny="redirect" exclude="/login"**
|
||||
**gates = > json.get value=`应用` key="gates"**
|
||||
**g1 = > at value=`gates` index=1**
|
||||
**perms = > json.get value=`g1` key="permissions"**
|
||||
**p0 = > at value=`perms` index=0**
|
||||
1. `p0` == "desk:access"
|
||||
> print text=gate-perm-ok
|
||||
2. *
|
||||
> print text=gate-perm-fail
|
||||
|
||||
**应用2 = > web.app page=`首页` admin=False**
|
||||
**应用2 = > `应用2`.gate path="/desk/roles" permissions="roles:manage" roles="editor" match="exact"**
|
||||
**gates2 = > json.get value=`应用2` key="gates"**
|
||||
**g0 = > at value=`gates2` index=0**
|
||||
**perms2 = > json.get value=`g0` key="permissions"**
|
||||
**p1 = > at value=`perms2` index=0**
|
||||
1. `p1` == "roles:manage"
|
||||
> print text=gate-roles-manage-ok
|
||||
2. *
|
||||
> print text=gate-roles-manage-fail
|
||||
|
||||
> print text=rbac-smoke-done
|
||||
@@ -0,0 +1,49 @@
|
||||
---
|
||||
title: web RBAC db register/assign smoke
|
||||
description: EnsureSchema path via create_role + assign + can
|
||||
import web:ext/web/web.mq.md
|
||||
import json:lib/json.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
> print text=rbac-db-start
|
||||
|
||||
**db = > web.db url="sqlite::memory:"**
|
||||
**url = > json.get value=`db` key="url"**
|
||||
**rbac = > web.rbac**
|
||||
|
||||
**seed = > `rbac`.create_role url=`db` name="reviewer"**
|
||||
**ok1 = > json.get value=`seed` key="ok"**
|
||||
1. `ok1` == True
|
||||
> print text=create-role-ok
|
||||
2. *
|
||||
> print text=create-role-fail
|
||||
> sys.exit code=1
|
||||
|
||||
**setp = > `rbac`.set_role_permissions url=`db` role="reviewer" permissions="comments:create,desk:access"**
|
||||
**ok2 = > json.get value=`setp` key="ok"**
|
||||
1. `ok2` == True
|
||||
> print text=set-perms-ok
|
||||
2. *
|
||||
> print text=set-perms-fail
|
||||
> sys.exit code=1
|
||||
|
||||
**can = > `rbac`.can permissions="comments:create,desk:access" needed="desk:access"**
|
||||
**allowed = > json.get value=`can` key="allowed"**
|
||||
1. `allowed` == True
|
||||
> print text=can-ok
|
||||
2. *
|
||||
> print text=can-fail
|
||||
> sys.exit code=1
|
||||
|
||||
**deny = > `rbac`.can permissions="comments:create" needed="roles:manage"**
|
||||
**denied = > json.get value=`deny` key="allowed"**
|
||||
1. `denied` == False
|
||||
> print text=can-deny-ok
|
||||
2. *
|
||||
> print text=can-deny-fail
|
||||
> sys.exit code=1
|
||||
|
||||
> print text=rbac-db-done
|
||||
@@ -0,0 +1,34 @@
|
||||
---
|
||||
title: browser spa helpers smoke
|
||||
description: store_set / spa_goto effect bags
|
||||
import browser:lib/browser.mq.md
|
||||
import json:lib/json.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
**set = > browser.store_set key="k" value="v" scope="memory"**
|
||||
**op = > json.get value=`set` key="storage"**
|
||||
**op_name = > json.get value=`op` key="op"**
|
||||
**scope = > json.get value=`op` key="scope"**
|
||||
1. `op_name` == "set"
|
||||
1. `scope` == "memory"
|
||||
> print text=store-set-ok
|
||||
2. *
|
||||
> print text=scope-fail
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=op-fail
|
||||
> sys.exit code=1
|
||||
|
||||
**nav = > browser.spa_goto url="/item" replace=False**
|
||||
**n = > json.get value=`nav` key="navigate"**
|
||||
**url = > json.get value=`n` key="url"**
|
||||
1. `url` == "/item"
|
||||
> print text=spa-goto-ok
|
||||
2. *
|
||||
> print text=spa-goto-fail
|
||||
> sys.exit code=1
|
||||
|
||||
> print text=spa-helpers-ok
|
||||
@@ -0,0 +1,30 @@
|
||||
---
|
||||
title: web tenant bag smoke
|
||||
description: app.tenant mode=path stores config
|
||||
import web:ext/web/web.mq.md
|
||||
import json:lib/json.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
**首页 = > web.page title="t"**
|
||||
**应用 = > web.app page=`首页` admin=False**
|
||||
**应用 = > `应用`.tenant mode="path" param="t" column="tenant_id" default_scope=True**
|
||||
**bag = > json.get value=`应用` key="tenant"**
|
||||
**mode = > json.get value=`bag` key="mode"**
|
||||
**param = > json.get value=`bag` key="param"**
|
||||
**scope = > json.get value=`bag` key="default_scope"**
|
||||
1. `mode` == "path"
|
||||
1. `param` == "t"
|
||||
1. `scope` == True
|
||||
> print text=tenant-bag-ok
|
||||
2. *
|
||||
> print text=scope-fail
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=param-fail
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=mode-fail
|
||||
> sys.exit code=1
|
||||
@@ -0,0 +1,36 @@
|
||||
---
|
||||
title: web WS room + on_message bag smoke
|
||||
description: route_ws mode=room stores room_key, on_message, presence
|
||||
import web:ext/web/web.mq.md
|
||||
import json:lib/json.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
**首页 = > web.page title="ws"**
|
||||
**应用 = > web.app page=`首页` admin=False**
|
||||
**应用 = > `应用`.route_ws path="/chat/{id}" mode="room" room_key="chat.room.{id}" on_message="chat.persist" presence=True**
|
||||
**routes = > json.get value=`应用` key="ws_routes"**
|
||||
**spec = > json.get value=`routes` key="/chat/{id}"**
|
||||
**mode = > json.get value=`spec` key="mode"**
|
||||
**rk = > json.get value=`spec` key="room_key"**
|
||||
**om = > json.get value=`spec` key="on_message"**
|
||||
**pr = > json.get value=`spec` key="presence"**
|
||||
1. `mode` == "room"
|
||||
1. `rk` == "chat.room.{id}"
|
||||
1. `om` == "chat.persist"
|
||||
1. `pr` == True
|
||||
> print text=ws-room-bag-ok
|
||||
2. *
|
||||
> print text=presence-fail
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=on-message-fail
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=room-key-fail
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=mode-fail
|
||||
> sys.exit code=1
|
||||
Reference in new issue
Block a user