Compare commits
41
Commits
v1.0.1
..
ext-v1.0.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8e23a5395a | ||
|
|
cab609ee91 | ||
|
|
b752cd49b7 | ||
|
|
2c91b5cc7b | ||
|
|
453321c8c2 | ||
|
|
981d754133 | ||
|
|
410f36f719 | ||
|
|
bd06aedb90 | ||
|
|
42ddeb14e7 | ||
|
|
6bd127a313 | ||
|
|
4b7643d833 | ||
|
|
3f96592c99 | ||
|
|
98018fc63b | ||
|
|
aeac4d6d20 | ||
|
|
9e9a80df31 | ||
|
|
5f07b1c3b1 | ||
|
|
bfea2204eb | ||
|
|
fb30cd3db3 | ||
|
|
584cb9ac9d | ||
|
|
428ee141e1 | ||
|
|
ec9718466d | ||
|
|
c5bb08022a | ||
|
|
b710745e88 | ||
|
|
5cf84fe9b7 | ||
|
|
27991a7822 | ||
|
|
d1e2f0ced0 | ||
|
|
e848306187 | ||
|
|
2ee9d7e66d | ||
|
|
e31585842d | ||
|
|
f068b4ab75 | ||
|
|
26e29409a9 | ||
|
|
4923129d10 | ||
|
|
8ab55e2193 | ||
|
|
9bc7ef3b5a | ||
|
|
9431ad835c | ||
|
|
2984d7d4f8 | ||
|
|
6324036e41 | ||
|
|
3287799959 | ||
|
|
f95e5d3339 | ||
|
|
52b4bae423 | ||
|
|
037592087c |
No files matched your search
@@ -1,16 +1,14 @@
|
||||
---
|
||||
name: marqdo-release
|
||||
description: >-
|
||||
Run a full Marqdo product release: detect latest version and ask the user for
|
||||
the next tag, update CHANGELOG/README/skills/public docs, bump Cargo versions,
|
||||
sync VS Code extension on branch vscode-extension when needed, build or
|
||||
trigger install assets (Windows CLI + **required Linux native/CLI zips**,
|
||||
stdlib, ext, public zip, VSIX), push via origin or
|
||||
https://proxy.cflmy.top/github.com/cflmy/marqdo.git, publish GitHub Release
|
||||
with detailed notes, and recover from network failures via that proxy or HK
|
||||
SSH jump (scripts/push-via-hk-jump.py). Use when the user asks to release,
|
||||
cut a version, publish vX.Y.Z, ship a GitHub release, 发版, 发布新版本, or tag
|
||||
marqdo.
|
||||
Run a Marqdo product release: detect latest version and ask the user for the
|
||||
next tag (or confirm mode), update CHANGELOG/README/skills/public docs, bump
|
||||
Cargo and/or ext/VERSION, sync VS Code extension when needed, publish GitHub
|
||||
Release assets, upload extension packs to Cloudflare R2 (ext.marqdo.com) and
|
||||
GitHub, ship Ubuntu CLI via PPA (scripts/ppa-ship.sh), and print manual
|
||||
commands when sudo/GPG/network steps need the user. Use when the user asks to
|
||||
release, cut a version, publish vX.Y.Z, ext-only pack, PPA, 发版, 发布新版本,
|
||||
or tag marqdo.
|
||||
---
|
||||
|
||||
# Marqdo release
|
||||
@@ -19,166 +17,193 @@ Canonical release playbook for **cflmy/marqdo**. Read this skill **before** tagg
|
||||
|
||||
## Hard rules
|
||||
|
||||
1. **Never invent the next version.** Detect current versions → **stop and ask the user** for the next SemVer (`X.Y.Z`). Do not proceed until they confirm.
|
||||
1. **Never invent the next version.** Detect current versions → **stop and ask the user** for the next SemVer (`X.Y.Z`) and **release mode** if unclear. Do not proceed until they confirm (unless they already stated both in the same message).
|
||||
2. **Never force-push** `main` / tags. **Never** `--no-verify` unless the user explicitly orders it.
|
||||
3. **Never commit `vscode-extension/` on `main`** (gitignored). Extension source lives only on branch **`vscode-extension`**. See `doc/design/vscode-extension-commit.md`.
|
||||
4. **Do not release from a dirty tree** (except intentional release commits you create in this flow).
|
||||
5. **Tag format** is always `vX.Y.Z` matching root `Cargo.toml` `version = "X.Y.Z"`.
|
||||
6. Prefer **tag push → GitHub Actions** (`.github/workflows/release.yml`) for **both** Windows and **Linux** install assets. Local packaging is fallback / verification.
|
||||
7. After network errors: apply [reference.md § Proxy](reference.md). **First try** `https://proxy.cflmy.top/github.com/cflmy/marqdo.git` (this clone’s usual `origin`). Retry; do not silently skip uploads. If the reverse-proxy still drops long pushes, use **HK jump** (`hk.cflmy.de`) via `scripts/push-via-hk-jump.py` — see reference § **Proxy** / **HK SSH jump**.
|
||||
8. **Do not ship a GitHub Release without the Linux extension/native zip.** Job `linux` must attach `marqdo-VER-native-x86_64-unknown-linux-gnu.zip` (and the Linux CLI bundle). Missing Linux packages = release incomplete.
|
||||
5. **Tag format:** CLI/full → `vX.Y.Z` matching root `Cargo.toml`. Ext-only → `ext-vX.Y.Z` matching `ext/VERSION` (Cargo may stay unchanged).
|
||||
6. Prefer **tag push → GitHub Actions** (`.github/workflows/release.yml`) for Windows/Linux install assets. Local packaging is fallback / verification.
|
||||
7. After network errors: apply [reference.md § Proxy](reference.md). **First try** `https://proxy.cflmy.top/github.com/cflmy/marqdo.git`. Retry; do not silently skip uploads. If needed: **HK jump** (`scripts/push-via-hk-jump.py`).
|
||||
8. **Do not ship a full GitHub Release without the Linux extension/native zip** when the mode includes ext packs. Missing Linux packages = incomplete for that mode.
|
||||
9. **Extension packs always publish to both** Cloudflare R2 (`https://ext.marqdo.com` via `scripts/upload-ext-r2.py`) **and** GitHub (Release assets / `ext-v*` tag). Credentials only in `~/.marqdo/r2.env` / CI — **never** commit. See [ext-cdn.md](../../../doc/design/ext-cdn.md).
|
||||
10. **CLI Ubuntu package = PPA** (`ppa:cflmy/marqdo`) via `./scripts/ppa-ship.sh` / `ppa-build-source.sh`. GitHub zips remain for Windows and non-apt Linux.
|
||||
11. **When a step needs the user** (sudo password, GPG passphrase, Launchpad UI, interactive `dput`): **stop, state what failed, and give the exact commands** to run in their terminal. Do not pretend the step succeeded.
|
||||
|
||||
## Defaults (after version is confirmed)
|
||||
## Release modes
|
||||
|
||||
Unless the user overrides, apply these automatically — **do not re-ask**:
|
||||
Ask (or take from user message) which mode:
|
||||
|
||||
| Mode | Bumps | Git tag | GitHub assets | R2 CDN | Ubuntu PPA |
|
||||
|------|-------|---------|---------------|--------|------------|
|
||||
| **full** (default) | `Cargo.toml` + `ext/VERSION` (same SemVer) | `vX.Y.Z` | CLI + ext + native + VSIX + … | yes | yes |
|
||||
| **cli** | `Cargo.toml` only | `vX.Y.Z` | CLI (+ optional attach prior ext) | no (unless user asks) | yes |
|
||||
| **ext** | `ext/VERSION` only | `ext-vX.Y.Z` (or attach to latest CLI release) | ext.zip + native-*.zip | **required** | no |
|
||||
|
||||
Defaults after version+mode confirmed — **do not re-ask**:
|
||||
|
||||
| Setting | Default |
|
||||
|---------|---------|
|
||||
| Sync / bump `vscode-extension` to same `VER` | **yes** |
|
||||
| Push `main`, create annotated tag, push tag immediately (trigger CI) | **yes** |
|
||||
| Release notes language | **中英双语** (Chinese first, then English section, or paired ZH/EN under each heading) |
|
||||
| Skip VSIX | **no** |
|
||||
| Docs-only release | **no** (full asset pipeline via CI) |
|
||||
| Sync / bump `vscode-extension` to same `VER` | **yes** for full/cli; **no** for ext-only |
|
||||
| Push `main`, create annotated tag, push tag (trigger CI) | **yes** for full/cli |
|
||||
| Ext packs → R2 **and** GitHub | **yes** whenever ext ships |
|
||||
| Ubuntu PPA upload after CLI tag | **yes** for full/cli |
|
||||
| Release notes language | **中英双语** |
|
||||
| Deploy gh-pages after release | **no** (only if user asks) |
|
||||
|
||||
Phase 0 asks **only** for the next version (and optional overrides). Example ask:
|
||||
Phase 0 ask example:
|
||||
|
||||
> 当前最新是 **vA.B.C**。请指定下一个版本号(如 `0.3.2`)。其余按默认:同步扩展、立刻打 tag 发布、中英双语说明。
|
||||
> 当前最新 CLI **vA.B.C**,扩展包 **E.F.G**。请指定下一个版本号与模式(`full` / `cli` / `ext`,如 `1.0.3 full`)。
|
||||
|
||||
## Phase 0 — Detect versions (mandatory stop)
|
||||
|
||||
Run in repo root (parallel OK):
|
||||
|
||||
```bash
|
||||
python3 .cursor/skills/marqdo-release/scripts/detect_version.py
|
||||
# or: rg / git tag / gh release list — see reference.md
|
||||
```
|
||||
|
||||
Report briefly, then **ask only for the next SemVer** (defaults above). Wait for confirmation. Normalize to `VER=X.Y.Z` and `TAG=vX.Y.Z`.
|
||||
Report briefly, then **ask for SemVer + mode** (unless already given). Normalize `VER` / `TAG`.
|
||||
|
||||
## Phase 1 — Preflight
|
||||
|
||||
Copy and track:
|
||||
|
||||
```
|
||||
Release progress:
|
||||
- [ ] Phase 0: version confirmed by user (TAG=…)
|
||||
- [ ] Phase 0: version + mode confirmed
|
||||
- [ ] Phase 1: preflight green
|
||||
- [ ] Phase 2: docs + version bumps committed
|
||||
- [ ] Phase 3: extension branch (if needed)
|
||||
- [ ] Phase 3: extension branch (full/cli)
|
||||
- [ ] Phase 4: main pushed; tag created & pushed
|
||||
- [ ] Phase 5: CI / assets / release notes verified
|
||||
- [ ] Phase 6: post-release checks
|
||||
- [ ] Phase 5: CI / GitHub assets / notes
|
||||
- [ ] Phase 6: R2 upload (if ext ships)
|
||||
- [ ] Phase 7: Ubuntu PPA (full/cli)
|
||||
- [ ] Phase 8: post-release checks
|
||||
```
|
||||
|
||||
Checks:
|
||||
|
||||
1. `git status` clean or only release WIP you control.
|
||||
2. `git checkout main && git pull --ff-only origin main`.
|
||||
3. Quick gate: `cargo test --test gold structure_hello` (and any release-critical tests the user named). Full gold suite if time allows.
|
||||
4. `CHANGELOG.md` has meaningful **Unreleased** notes; if empty, draft from `git log vLAST..HEAD --oneline` and confirm with user.
|
||||
5. Confirm no secrets in the commit (`*.env`, credentials).
|
||||
Checks: clean tree; `main` ff-only; smoke tests; CHANGELOG Unreleased; no secrets.
|
||||
|
||||
## Phase 2 — Docs & version bumps (main)
|
||||
|
||||
Bump **in lockstep**:
|
||||
|
||||
| File | Change |
|
||||
|------|--------|
|
||||
| `Cargo.toml` | `version = "VER"` |
|
||||
| `crates/marqdo-wasm/Cargo.toml` | same `VER` |
|
||||
| `CHANGELOG.md` | Move `## Unreleased` → `## vVER — YYYY-MM-DD`; leave fresh empty `## Unreleased` |
|
||||
| `README.md` | 「现状 / 如何使用最新」version strings, checkout tag, release URL |
|
||||
| `.cursor/skills/marqdo/SKILL.md` | Version-sensitive bullets if any (WASM/web status); keep rules accurate |
|
||||
| `public/**` | User-facing tutorials if features shipped (welcome, features/*, extensions). Prefer small factual updates over rewrites |
|
||||
| `doc/roadmap/*.md` | Mark shipped waves done if this release closes them |
|
||||
| `.github/workflows/release.yml` | Update **Highlights** body template to this release (CI still uses hardcoded blurb—keep in sync) |
|
||||
|
||||
Public HTML: regenerate before packaging / pages deploy:
|
||||
| File | full | cli | ext |
|
||||
|------|------|-----|-----|
|
||||
| `Cargo.toml` + `crates/marqdo-wasm/Cargo.toml` | bump | bump | — |
|
||||
| `ext/VERSION` | bump | — | bump |
|
||||
| `CHANGELOG.md` | `## vVER` | `## vVER` | `## Ext pack vVER` |
|
||||
| `README.md` / `public/**` install + download table | update | update | update ext notes |
|
||||
| `.cursor/skills/marqdo/SKILL.md` | if surface changed | same | rare |
|
||||
| `.github/workflows/release.yml` Highlights stub | yes | yes | — |
|
||||
|
||||
```bash
|
||||
./scripts/build-public.sh
|
||||
# outputs under public/ (gitignored HTML); used by release zip / gh-pages
|
||||
./scripts/build-public.sh # when public/ sources changed
|
||||
```
|
||||
|
||||
Commit on `main` (HEREDOC message), e.g.:
|
||||
|
||||
```text
|
||||
release: vVER — <one-line highlight>
|
||||
|
||||
EOF
|
||||
```
|
||||
|
||||
Push `main` (this repo’s `origin` is usually the reverse proxy):
|
||||
Commit + push `main` (proxy origin). On push failure → reference § Proxy; if still blocked, **print** for the user:
|
||||
|
||||
```bash
|
||||
# origin typically: https://proxy.cflmy.top/github.com/cflmy/marqdo.git
|
||||
git push origin main
|
||||
# one-shot if origin still points at github.com:
|
||||
git push https://proxy.cflmy.top/github.com/cflmy/marqdo.git HEAD:main
|
||||
# or: python3 scripts/push-via-hk-jump.py
|
||||
```
|
||||
|
||||
If that times out: [reference § HK SSH jump](reference.md).
|
||||
## Phase 3 — VS Code / Cursor extension (full/cli only)
|
||||
|
||||
## Phase 3 — VS Code / Cursor extension
|
||||
Default: bump `vscode-extension` package.json to `VER`, compile, push branch `vscode-extension`, return to `main`.
|
||||
|
||||
**Default: always** bump extension to `VER` on branch `vscode-extension` (skip only if user said so).
|
||||
|
||||
1. `git fetch origin vscode-extension`
|
||||
2. Work on `vscode-extension` branch (not main):
|
||||
- Bump `vscode-extension/package.json` `version` to `VER`.
|
||||
- Update `engines` / CLI version hints in extension README if present.
|
||||
- `npm ci && npm run compile`
|
||||
3. Commit & `git push origin vscode-extension`.
|
||||
4. Return to `main`. **Do not** add `vscode-extension/` to main.
|
||||
|
||||
## Phase 4 — Tag & trigger CI
|
||||
## Phase 4 — Tag & trigger CI (full/cli)
|
||||
|
||||
```bash
|
||||
git tag -a "TAG" -m "TAG"
|
||||
git push origin "TAG"
|
||||
git tag -a "vVER" -m "vVER"
|
||||
git push origin "vVER"
|
||||
```
|
||||
|
||||
This runs `.github/workflows/release.yml`:
|
||||
Ext-only:
|
||||
|
||||
- **windows** — CLI exe/zip, stdlib zip, ext zip, source zip, public zip, VSIX, Windows native zip
|
||||
- **linux** (`needs: windows`) — **required** Linux native plugins zip + Linux CLI bundle (`ext/` + `native/*.so`)
|
||||
```bash
|
||||
git tag -a "ext-vVER" -m "ext-vVER"
|
||||
git push origin "ext-vVER"
|
||||
```
|
||||
|
||||
If tag push fails: [reference.md § Proxy](reference.md) (`proxy.cflmy.top` first), retry once; then HK jump.
|
||||
(or build zips locally / via workflow and `gh release upload`).
|
||||
|
||||
## Phase 5 — Release notes & assets
|
||||
If tag push needs the user:
|
||||
|
||||
1. Wait for Actions success: `gh run list --workflow=Release --limit 3` / open the run URL. **Both** `windows` and `linux` jobs must be green.
|
||||
2. Ensure GitHub Release for `TAG` exists with assets (workflow uses `softprops/action-gh-release`).
|
||||
3. Confirm Linux assets exist: `marqdo-VER-native-x86_64-unknown-linux-gnu.zip` and `marqdo-VER-x86_64-unknown-linux-gnu.zip`. If missing, do **not** call the release done — re-run / upload.
|
||||
4. **Rewrite release body** (workflow body is a stub) with **中英双语** — see [reference.md § Notes template](reference.md). `gh release edit TAG --notes-file …`.
|
||||
4. Include: Highlights, Breaking, Install (`ext add`, plugins build), Downloads table, WASM (`marqdo wasm build`), links to CHANGELOG/README, extension branch note.
|
||||
5. Optional Linux local extras (not required if CI green): `marqdo wasm build` smoke; document in notes that wasm is built from source via CLI.
|
||||
```bash
|
||||
git push https://proxy.cflmy.top/github.com/cflmy/marqdo.git vVER
|
||||
```
|
||||
|
||||
Local Windows fallback: `scripts/release-full.ps1 -Tag TAG -Upload` (see script header).
|
||||
## Phase 5 — GitHub Release notes & assets
|
||||
|
||||
## Phase 6 — Post-release
|
||||
1. Wait for Actions (full/cli): both `windows` and `linux` green when ext natives required.
|
||||
2. Rewrite release body 中英双语 — [reference.md § Notes](reference.md).
|
||||
3. Confirm Linux `marqdo-VER-native-x86_64-unknown-linux-gnu.zip` when mode ships ext.
|
||||
|
||||
1. `gh release view TAG` — confirm assets + notes.
|
||||
2. `git status` clean; `main` synced.
|
||||
3. Tell user: release URL `https://github.com/cflmy/marqdo/releases/tag/TAG`.
|
||||
4. Optional: `./scripts/deploy-public.ps1` / pages workflow if user wants user-site refresh.
|
||||
5. Open fresh `## Unreleased` already done in Phase 2.
|
||||
## Phase 6 — Extension CDN (R2) — required when ext ships
|
||||
|
||||
```bash
|
||||
# credentials: ~/.marqdo/r2.env (never commit)
|
||||
python3 scripts/upload-ext-r2.py --version VER --from-dir dist/
|
||||
curl -fsS https://ext.marqdo.com/latest/VERSION
|
||||
```
|
||||
|
||||
Also ensure the **same** zips are on GitHub (`vVER` or `ext-vVER`). If R2 credentials missing, **tell the user**:
|
||||
|
||||
```bash
|
||||
# put keys in ~/.marqdo/r2.env then:
|
||||
python3 scripts/upload-ext-r2.py --version VER --from-dir dist/
|
||||
```
|
||||
|
||||
## Phase 7 — Ubuntu PPA (full/cli)
|
||||
|
||||
Linux CLI for apt users. After `Cargo.toml` is at `VER` and `debian/changelog` has a matching `VER-1ppaN` stanza:
|
||||
|
||||
```bash
|
||||
./scripts/ppa-ship.sh noble
|
||||
```
|
||||
|
||||
Packaging notes / noble Cargo.lock v4: [ubuntu-ppa.md](../../../doc/design/ubuntu-ppa.md).
|
||||
|
||||
**If the agent cannot sudo / sign / dput**, print exactly:
|
||||
|
||||
```bash
|
||||
cd ~/work/marqdo
|
||||
./scripts/ppa-ship.sh noble
|
||||
# or build then upload:
|
||||
./scripts/ppa-build-source.sh noble
|
||||
dput ppa:cflmy/marqdo ../build-area/marqdo_*~noble_source.changes
|
||||
```
|
||||
|
||||
Watch: https://launchpad.net/~cflmy/+archive/ubuntu/marqdo/+builds
|
||||
On Launchpad failure: read the build log, fix `debian/` or bundle script, bump `1ppaN`, re-upload. Tell the user the new `dput` command.
|
||||
|
||||
## Phase 8 — Post-release
|
||||
|
||||
1. `gh release view TAG` — assets + notes.
|
||||
2. CDN `https://ext.marqdo.com/vVER/` (if ext shipped).
|
||||
3. PPA build green (if cli shipped).
|
||||
4. Tell user URLs: GitHub release, CDN, PPA install one-liner.
|
||||
5. Optional gh-pages only if asked.
|
||||
|
||||
## Extension-only release (mode=ext)
|
||||
|
||||
1. User confirms **ext** SemVer (may differ from CLI).
|
||||
2. Bump `ext/VERSION`; CHANGELOG → `## Ext pack vVER`.
|
||||
3. Build/package `marqdo-VER-ext.zip` + `marqdo-VER-native-*.zip` (CI or local).
|
||||
4. Upload to **R2 and GitHub** (required both).
|
||||
5. Do **not** retag CLI / do **not** PPA unless user also asked for cli.
|
||||
|
||||
## Failure matrix (short)
|
||||
|
||||
| Failure | Action |
|
||||
|---------|--------|
|
||||
| `gh` / git TLS or Clash `7890` refused | Unset bad proxy; `required_permissions: ["all"]`; see [reference § Proxy](reference.md) |
|
||||
| GitHub blocked | **`origin` via proxy.cflmy.top** (see below), then HK jump |
|
||||
| Tag exists | Stop; ask user to bump or delete tag (no force on shared tags without explicit order) |
|
||||
| CI red | Fix on main, move tag only if user explicitly allows delete+re-push tag |
|
||||
| VSIX missing | Fetch `vscode-extension`, build locally, `gh release upload TAG dist/*.vsix` |
|
||||
| Linux native/CLI zip missing | Incomplete release — fix `linux` job or `gh release upload`; do not skip |
|
||||
| `gh` / git TLS or Clash `7890` refused | Unset bad proxy; see [reference § Proxy](reference.md) |
|
||||
| GitHub blocked | proxy.cflmy.top, then HK jump; **print commands** if agent cannot push |
|
||||
| Tag exists | Stop; ask user |
|
||||
| CI red | Fix on main; retag only if user allows |
|
||||
| R2 upload fails | Print `upload-ext-r2.py` command; do not skip silently |
|
||||
| PPA / sudo / GPG | Print `./scripts/ppa-ship.sh noble` (or `dput …`); do not skip silently |
|
||||
| Launchpad `Cargo.lock` v4 / old cargo | Ensure bundled `third_party/rust` via current `ppa-build-source.sh`; bump `1ppaN` |
|
||||
| Linux native zip missing (full/ext) | Incomplete — fix linux job or upload |
|
||||
|
||||
## Do not
|
||||
|
||||
- Ship without user-confirmed version.
|
||||
- Hardcode release highlights only in Actions YAML and forget CHANGELOG.
|
||||
- Commit `target/`, `dist/`, `*.wasm`, or `public/**/*.html` unless project policy changes.
|
||||
- Ship without user-confirmed version (and mode when ambiguous).
|
||||
- Ship ext packs to only one of R2 / GitHub.
|
||||
- Call a full/cli release done without attempting PPA **or** giving the user the PPA commands.
|
||||
- Commit `target/`, `dist/`, `*.wasm`, `third_party/rust/`, or `public/**/*.html` unless policy changes.
|
||||
- Merge extension tree into `main`.
|
||||
@@ -236,7 +236,25 @@ git push https://proxy.cflmy.top/github.com/cflmy/marqdo.git vVER
|
||||
|
||||
Short GETs via the proxy often work; **long `git push` may still time out**. If push hangs or drops, skip Clash retries and go to **HK SSH jump** below.
|
||||
|
||||
`gh` against `api.github.com` may still need a direct path or HK jump (the reverse proxy is for `github.com` git, not always the API).
|
||||
`gh` / Release API can use the same path reverse-proxy:
|
||||
|
||||
| Path prefix | Upstream |
|
||||
|-------------|----------|
|
||||
| `/github.com/` | `https://github.com/` |
|
||||
| `/api.github.com/` | `https://api.github.com/` |
|
||||
| `/uploads.github.com/` | `https://uploads.github.com/` (Release asset POST; OpenResty on HK) |
|
||||
|
||||
```bash
|
||||
# Upload a Release asset through proxy.cflmy.top (Content-Type: application/octet-stream)
|
||||
curl -X POST \
|
||||
-H "Authorization: Bearer $GH_TOKEN" \
|
||||
-H "Accept: application/vnd.github+json" \
|
||||
-H "Content-Type: application/octet-stream" \
|
||||
--data-binary @dist/FILE.zip \
|
||||
"https://proxy.cflmy.top/uploads.github.com/repos/cflmy/marqdo/releases/RELEASE_ID/assets?name=FILE.zip"
|
||||
```
|
||||
|
||||
Do **not** rewrite `Host: uploads.github.com` against `proxy.cflmy.top` without the `/uploads.github.com/` path prefix — that returns 404.
|
||||
|
||||
### Diagnose
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ Canonical design (repo): [`markdown-mapping-v0.3.md`](../../doc/design/markdown-
|
||||
|
||||
**Authoring / library craft** (GFM-first, no json glue, how to develop Marqdo): use **[marqdo-dev](../marqdo-dev/SKILL.md)** whenever writing or refactoring `.mq.md`, `lib/*`, or `ext/*`.
|
||||
|
||||
**Product release** (tag, CHANGELOG, README, public docs, VSIX, GitHub assets): use [marqdo-release](../marqdo-release/SKILL.md) — detect latest version, **ask the user for the next SemVer**, then follow that playbook. Do not invent a version number.
|
||||
**Product release** (tag, CHANGELOG, README, public docs, VSIX, GitHub assets, **ext → R2+GitHub**, **CLI → Ubuntu PPA**): use [marqdo-release](../marqdo-release/SKILL.md) — detect versions, **ask for SemVer + mode (`full` / `cli` / `ext`)**, then follow that playbook. Ext-only releases are allowed. If sudo/GPG/PPA steps need the user, print the exact commands.
|
||||
|
||||
## Hard rules (do not violate)
|
||||
|
||||
@@ -199,7 +199,7 @@ data/ # sqlite runtime (gitignore)
|
||||
|
||||
**Typical flow:** `db.init` → `page.compose_*` → `app` + `static` / `listen`. Client: `marqdo wasm build -o static` + `web.client_embed source="/static/client.mq.md"` — **no author JS**; bridge may implement rich host effects ([browser-wasm-e.md](../../doc/roadmap/browser-wasm-e.md) · [browser-app](../../examples/browser-app/)).
|
||||
|
||||
**Shipped surface (W0–W7 + P3 + W8 + route D mount):** middleware + JSON API (`app.configure`); transactions, pagination, FTS search (`db.migrate`, `db.fts`, `db.search`); security (argon2, CSRF, SQLite sessions, login rate limit); SEO / RSS / Markdown (`page.meta`, `route_rss`, `lib/net.markdown_parse`); upload / download / gallery; sitemap / robots / error pages / redirects; RBAC (`app.gate`, user `role`); audit timestamps + FK in `db.init`; ETag on downloads; **W8** site icons (`app.icons` → `/favicon.ico`), head resource tables (`page.head`), image assembly (`make_images` / `page.images`); **D** `client_embed` auto-mount + DOM effect helpers (`text_patch` / `dom_patch`).
|
||||
**Shipped surface (W0–W7 + P3 + W8 + route D mount):** middleware + JSON API (`app.configure`); transactions, pagination, FTS search (`db.migrate`, `db.fts`, `db.search`); security (argon2, CSRF, SQLite sessions, login rate limit); SEO / RSS / Markdown (`page.meta`, `route_rss`, `lib/net.markdown_parse`); upload / download / gallery; sitemap / robots / error pages / redirects; RBAC (`app.gate`, user `role`); audit timestamps + FK in `db.init`; ETag on downloads; **W8** site icons (`app.icons` → `/favicon.ico`), head resource tables (`page.head`), image assembly (`make_images` / `page.images`); **表驱动引言** `page.compose_intro` / `页面.引言装配`(属性/值/样式表 → `.main-intro`,避免手写 HTML 字符串);**D** `client_embed` auto-mount + DOM effect helpers (`text_patch` / `dom_patch`).
|
||||
|
||||
Design: [ext-web.md](../../doc/design/ext-web.md) · assets: [web-assets-and-images.md](../../doc/design/web-assets-and-images.md) · capability matrix: [web-net-capabilities.md](../../doc/design/web-net-capabilities.md) · example: [examples/marqdo-blog/](../../examples/marqdo-blog/) · client: [examples/web-client-site/](../../examples/web-client-site/).
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
# Ext CDN / R2 (Cloudflare) — copy to ~/.marqdo/r2.env and chmod 600
|
||||
# Never commit real keys. Public downloads: https://ext.marqdo.com
|
||||
|
||||
R2_ACCOUNT_ID=
|
||||
R2_BUCKET=marqdo
|
||||
R2_ENDPOINT=https://<accountid>.r2.cloudflarestorage.com
|
||||
R2_ACCESS_KEY_ID=
|
||||
R2_SECRET_ACCESS_KEY=
|
||||
R2_PUBLIC_BASE=https://ext.marqdo.com
|
||||
@@ -124,9 +124,9 @@ jobs:
|
||||
## Marqdo ${{ github.ref_name }}
|
||||
|
||||
### 亮点 / Highlights
|
||||
- **v1.0.1**:修复 Go `libweb` 动态路由 `{param}` 查询代入、详情 Markdown、CSS 数字误报、`/static/` ServeMux 冲突
|
||||
- **v1.0.1**: fix Go `libweb` dynamic-route `{param}` query resolve, article Markdown, CSS numeric false positives, `/static/` ServeMux conflict
|
||||
- **v1.0.0**:Markdown 语法映射 v0.3 为唯一运行时(`**` 代码 / `*` 返回 / 叙述 `` `名` ``)
|
||||
- **v1.0.3**:Ubuntu PPA + 扩展 CDN(ext.marqdo.com);CLI/扩展可分发;noble 捆绑 Rust 工具链
|
||||
- **v1.0.3**: Ubuntu PPA + extension CDN; independent CLI/ext packs; bundled Rust for noble
|
||||
- **v1.0.1**:修复 Go `libweb` 动态路由 `{param}` 查询代入、详情 Markdown、CSS 数字误报
|
||||
- **Linux 包必出**:`*-native-x86_64-unknown-linux-gnu.zip` + Linux CLI bundle
|
||||
- Details: [CHANGELOG](https://github.com/cflmy/marqdo/blob/main/CHANGELOG.md) · [mapping v0.3](https://github.com/cflmy/marqdo/blob/main/doc/design/markdown-mapping-v0.3.md)
|
||||
|
||||
|
||||
+6
-1
@@ -24,7 +24,8 @@
|
||||
.marqdo/
|
||||
**/.marqdo/
|
||||
.marqdo-ext/
|
||||
.env
|
||||
/vendor/
|
||||
/.cargo/config.toml
|
||||
|
||||
# Generated HTML beside tracked public/*.mq.md (sources stay in git)
|
||||
/public/index.html
|
||||
@@ -77,5 +78,9 @@ plugins/*/tmp/
|
||||
# Go web plugin c-shared build output (./scripts/build-web-plugin.sh)
|
||||
/plugins/web/build/
|
||||
|
||||
# PPA build: bundled Rust toolchain (packed into .orig by ppa-build-source.sh only)
|
||||
/third_party/rust/
|
||||
/third_party/
|
||||
|
||||
# ephemeral sqlite / test artifacts
|
||||
tests/ext/:memory:
|
||||
+119
@@ -8,6 +8,125 @@
|
||||
|
||||
### Changed
|
||||
|
||||
## Ext pack v1.0.6 — 2026-09-18
|
||||
|
||||
### Highlights
|
||||
|
||||
**ext/web OIDC、表单删除与安静管理台(CLI 仍为 v1.0.3)**:OIDC 登录/登出回首页、表单 `删除` 动作、默认关闭内置 admin/RBAC desk、独立 Redis 会话 URL、Postgres CRUD。安装:
|
||||
|
||||
```bash
|
||||
marqdo ext add web # CDN latest → 1.0.6
|
||||
```
|
||||
|
||||
### Added
|
||||
- **OIDC**:`auth.oidc` / 网页鉴权 OIDC;登录入口与 `next` 回跳。
|
||||
- **表单删除**:`form` 动作 `删除`/`delete`(通用 CRUD,无站点特判)。
|
||||
- **列表/路由**:请求上下文、列表装配延续;注销默认回 `/` 避免 IdP 再登录环。
|
||||
|
||||
### Fixed
|
||||
- 内置 admin / RBAC desk 默认安静,直至显式 `admin` / `enable_rbac`。
|
||||
- 静态资源缓存与 WASM 启动延迟;会话 CSRF 与 Postgres 方言。
|
||||
|
||||
### Changed
|
||||
- 扩展包 SemVer **1.0.6**(`ext/VERSION`);与 CLI **v1.0.3** 可独立安装。
|
||||
|
||||
## Ext pack v1.0.5 — 2026-09-18
|
||||
|
||||
### Highlights
|
||||
|
||||
**ext/web 请求上下文与表单来源(CLI 仍为 v1.0.3)**:字段 `来源`/`source`(session / route / now)、server-only 盖戳、页面 `列表装配`/`compose_list`;禁止按业务表特判。安装:
|
||||
|
||||
```bash
|
||||
marqdo ext add web # CDN latest → 1.0.5
|
||||
```
|
||||
|
||||
### Added
|
||||
- **Request context**:表单提交携带 `_mq_params` / `_mq_return`;`ApplySources` 从 session/route/now 写入。
|
||||
- **字段来源列**:`client`(默认)/ `session.username` / `route.NAME` / `now`;非 client 不渲染且覆盖客户端伪造。
|
||||
- **列表装配**:`compose_list` / `列表装配`(副绑定 + 条件/排序/插槽),详情页可同页渲染子列表。
|
||||
- 设计文:[ext-web-request-context.md](doc/design/ext-web-request-context.md);金样 `ext_web_form_source_live`。
|
||||
|
||||
### Changed
|
||||
- 扩展包 SemVer **1.0.5**(`ext/VERSION`);与 CLI **v1.0.3** 可独立安装。
|
||||
- 移除评论表名特判(`enrichCommentSubmit`)。
|
||||
|
||||
## 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
|
||||
|
||||
**分发渠道齐备**:Ubuntu PPA 装 CLI;扩展包走 CDN(`ext.marqdo.com`)与 GitHub;CLI 与扩展可分开发版。本版 CLI 与扩展包 **同步为 1.0.3**。
|
||||
|
||||
**语法**:未绑定的 GFM 表格是可丢弃的集合值,不再报 `unrecognized statement`(文档页可直接写安装表)。
|
||||
|
||||
```bash
|
||||
# Ubuntu
|
||||
sudo add-apt-repository ppa:cflmy/marqdo
|
||||
sudo apt update && sudo apt install marqdo
|
||||
marqdo ext add web
|
||||
|
||||
# 或源码 / Releases
|
||||
git checkout v1.0.3 && cargo build --release
|
||||
```
|
||||
|
||||
### Added
|
||||
- Ubuntu PPA packaging: `debian/` + `scripts/ppa-ship.sh` (一键装工具/打包/dput) + `ppa-build-source.sh` + [ubuntu-ppa.md](doc/design/ubuntu-ppa.md).
|
||||
- **Extension CDN** (`https://ext.marqdo.com` / Cloudflare R2):`ext add` 下载顺序改为 CDN → GitHub → proxy;独立包版本见 `ext/VERSION` 与 CDN `latest/VERSION`;上传脚本 `scripts/upload-ext-r2.py`(凭据 `~/.marqdo/r2.env`)。设计见 [ext-cdn.md](doc/design/ext-cdn.md)。
|
||||
- `ext add` 下载:GitHub 失败后自动回退 `https://proxy.cflmy.top/github.com/…`;可用 `MARQDO_EXT_DOWNLOAD_BASE` 指定首选镜像;加长读写超时。
|
||||
- 用户文档(README / `public/00-欢迎` / `features/05-扩展`)标明安装渠道:Ubuntu PPA、GitHub Releases、源码;扩展走 CDN。
|
||||
|
||||
### Fixed
|
||||
- `ext/` 导入默认搜索 `~/.marqdo/ext`(与 `marqdo ext add` 安装根一致),无需再手动 `export MARQDO_EXT`。
|
||||
- PPA/noble:捆绑 `third_party/rust`(现代 cargo)以构建 Cargo.lock v4;修复首次 Launchpad 构建失败(distro cargo 1.75)。
|
||||
- 未绑定的 GFM 表格不再报 `unrecognized statement`:作为集合值求值后丢弃(文档中可写表)。
|
||||
|
||||
### Changed
|
||||
- 允许 **CLI 与扩展包分开发版**:扩展包 SemVer 可与 `Cargo.toml` 不同(`MARQDO_EXT_VERSION` / `ext/VERSION` / CDN latest)。
|
||||
- 发版 skill:支持 `full` / `cli` / `ext`;扩展必传 R2+GitHub;CLI 走 PPA;需用户操作时打印确切命令。
|
||||
|
||||
## v1.0.2 — 2026-09-16
|
||||
|
||||
### Highlights
|
||||
|
||||
**表驱动页面引言(`compose_intro` / `引言装配`)**:英雄区用 GFM「属性 / 值 / 样式」表声明,不再手写 HTML 字符串;WWW Demo 样站与后台门禁一并加固。
|
||||
|
||||
```bash
|
||||
git checkout v1.0.2
|
||||
cargo build --release
|
||||
bash ./scripts/build-web-plugin.sh
|
||||
# 或:解压 Release 的 marqdo-1.0.2-*-native-*.zip / Linux CLI zip
|
||||
marqdo run examples/web-site-zh/index.mq.md
|
||||
```
|
||||
|
||||
### Added
|
||||
- Go `libweb`:`web_compose_intro` — 将引言表装配为 `.main-intro` HTML;中英 API `页面.引言装配` / `page.compose_intro`(`ext/web`)。
|
||||
- 验收样例:`tests/ext/web-intro-compose.mq.md`;`examples/web-site` / `web-site-zh` 升级为表驱动引言 + 文学风壳层 + 卡片→详情路由。
|
||||
|
||||
### Fixed
|
||||
- 后台样站:导航/侧栏/页脚槽位与门禁登录挂载对齐;表单字段加宽便于创建。
|
||||
|
||||
### Changed
|
||||
- Demo 叙述与种子数据面向 WWW Industry / 可复现演示;作者仍零业务 JS、零手写 `.css`。
|
||||
|
||||
## v1.0.1 — 2026-09-15
|
||||
|
||||
### Highlights
|
||||
|
||||
Generated
+2
-2
@@ -572,7 +572,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
|
||||
|
||||
[[package]]
|
||||
name = "marqdo"
|
||||
version = "1.0.1"
|
||||
version = "1.0.3"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assert_cmd",
|
||||
@@ -603,7 +603,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "marqdo-wasm"
|
||||
version = "1.0.1"
|
||||
version = "1.0.3"
|
||||
dependencies = [
|
||||
"marqdo",
|
||||
"serde_json",
|
||||
|
||||
+3
-2
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "marqdo"
|
||||
version = "1.0.1"
|
||||
version = "1.0.3"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Marqdo — Markdown markers as an interpreted programming language"
|
||||
@@ -50,8 +50,9 @@ include_dir = "0.7"
|
||||
libc = { version = "0.2", optional = true }
|
||||
|
||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||
# No `wasmbind`: keeps cdylib free of wasm-bindgen imports (raw mq_* ABI).
|
||||
# Custom entropy — no `js`/wasm-bindgen imports (raw mq_* ABI + marqdo-bridge.js).
|
||||
chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
|
||||
getrandom = { version = "=0.2.17", default-features = false, features = ["custom"] }
|
||||
|
||||
[workspace]
|
||||
members = [
|
||||
|
||||
@@ -98,7 +98,7 @@ marqdo catalog public -o .marqdo
|
||||
|
||||
---
|
||||
|
||||
## 现状(v1.0.1)
|
||||
## 现状(v1.0.3)
|
||||
|
||||
- 映射与解释器:**v0.3 语法宪法**(`**` 代码 / `*` 返回 / 叙述声明);Phase I 树遍历 + 字节码后端;金样例在 `tests/` 与 `tests/markup-v03/`
|
||||
- **对象**:`#` = 类型/构造,`##`+ = 函数/方法;见 [objects.md](doc/design/objects.md)
|
||||
@@ -108,7 +108,7 @@ marqdo catalog public -o .marqdo
|
||||
- **`marqdo version --check`**:与 GitHub 最新 release 对比
|
||||
- 标准库:**内置于二进制**(v0.1.2+);磁盘 `lib/` 或 `MARQDO_LIB` 可覆盖。模块含文本、表、**浏览器效应**、文件、系统、时间、JSON、网络、数学、外联、插件、**自写回**、**子任务**;**中层 Mid M1–M6** + **Mid2 M7–M10**(datetime/url/toml/html/fs++/stats/log.fields 等,见 [stdlib-mid.md](doc/design/stdlib-mid.md) · [stdlib-mid2.md](doc/design/stdlib-mid2.md))
|
||||
- **官方扩展库 `ext/`**(**非** stdlib,本版收口):
|
||||
- **`web`**:W0–W7 + P3 + **W8**;**定制 C0–C4**;**宿主 H1–H2**(`proxy`/`invoke`,见 [ext-hosting.md](doc/roadmap/ext-hosting.md));原生层默认 **Go `libweb`**([ADR 0004](doc/adr/0004-web-plugin-go.md),`scripts/build-web-plugin.sh`);示例 [marqdo-blog](examples/marqdo-blog/) · [anlian-mq](examples/anlian-mq/);生产路径见 [web-asgi-servers-and-marqdo.md](doc/design/web-asgi-servers-and-marqdo.md)
|
||||
- **`web`**:W0–W7 + P3 + **W8**;**定制 C0–C4**;**宿主 H1–H2**(`proxy`/`invoke`,见 [ext-hosting.md](doc/roadmap/ext-hosting.md));**表驱动引言**(`compose_intro` / `引言装配`);原生层默认 **Go `libweb`**([ADR 0004](doc/adr/0004-web-plugin-go.md),`scripts/build-web-plugin.sh`);示例 [web-site](examples/web-site/) · [web-site-zh](examples/web-site-zh/) · [marqdo-blog](examples/marqdo-blog/) · [anlian-mq](examples/anlian-mq/);生产路径见 [web-asgi-servers-and-marqdo.md](doc/design/web-asgi-servers-and-marqdo.md)
|
||||
- **`quantum`**:Q0–Q7 + Q8a/b 主题 SVG;示例 [quantum-entanglement](examples/quantum-entanglement/)
|
||||
- **`linalg`**:L0–L6 + 公式文档面(中缀 / `declare` / 展示化简);示例 [linalg-transpose](examples/linalg-transpose/) · [linalg-svd](examples/linalg-svd/) · [linalg-least-squares](examples/linalg-least-squares/)
|
||||
- **`agent`**:A1–A4 + **MCP Server stdio**(`mcp_server`);宿主缺口见 [ext-hosting.md](doc/roadmap/ext-hosting.md) · [agent-framework-gaps-after-a4.md](doc/research/agent-framework-gaps-after-a4.md)
|
||||
@@ -120,12 +120,22 @@ marqdo catalog public -o .marqdo
|
||||
- **浏览器 Marqdo(WASM)**:`marqdo wasm build` + 官方 bridge 自启(作者零业务 JS;桥内可含列表/路由/storage/ws/文件/Canvas/音频/Observer/拖放);`lib/browser` + GFM;`web.client_embed`;示例 [browser-hello](examples/browser-hello/) · [browser-app](examples/browser-app/) · [browser-media](examples/browser-media/) · [web-client-site](examples/web-client-site/)([ADR 0002](doc/adr/0002-browser-marqdo-wasm.md) · [D](doc/roadmap/browser-wasm-d.md) · [E](doc/roadmap/browser-wasm-e.md) · [F](doc/roadmap/browser-wasm-f.md))
|
||||
- 选型:[ADR 0001 — Rust](doc/adr/0001-implementation-language.md) · [ADR 0002 — 浏览器 WASM](doc/adr/0002-browser-marqdo-wasm.md)(C0–C5 完结,见 [roadmap/browser-wasm.md](doc/roadmap/browser-wasm.md))· [ADR 0003 — 异步效应](doc/adr/0003-browser-async-effects.md)
|
||||
|
||||
### 如何使用最新 Marqdo(v1.0.1)
|
||||
### 如何使用最新 Marqdo(v1.0.3)
|
||||
|
||||
**安装解释器(任选其一)**
|
||||
|
||||
| 方式 | 适用 | 命令 / 链接 |
|
||||
|------|------|-------------|
|
||||
| **Ubuntu PPA** | Ubuntu 24.04+(`noble` 等) | `sudo add-apt-repository ppa:cflmy/marqdo && sudo apt update && sudo apt install marqdo` |
|
||||
| **GitHub Releases** | Windows / Linux 预编译 zip | https://github.com/cflmy/marqdo/releases |
|
||||
| **源码** | 需本机 Rust | 见下方 `git clone` + `cargo build --release` |
|
||||
|
||||
**安装官方扩展**(与 CLI 可分开发版):`marqdo ext add …` 默认下载顺序为 **CDN** [`https://ext.marqdo.com`](https://ext.marqdo.com) → GitHub Releases → [`proxy.cflmy.top`](https://proxy.cflmy.top) 镜像。
|
||||
|
||||
```bash
|
||||
# 1) 源码安装(跟 tag 或 main)
|
||||
git clone https://github.com/cflmy/marqdo.git && cd marqdo
|
||||
git checkout v1.0.1 # 或留在 main
|
||||
git checkout v1.0.3 # 或留在 main
|
||||
cargo build --release
|
||||
export PATH="$PWD/target/release:$PATH"
|
||||
marqdo version
|
||||
@@ -138,7 +148,7 @@ marqdo view public --no-open
|
||||
marqdo debug public --no-open
|
||||
marqdo catalog public -o .marqdo
|
||||
|
||||
# 3) 安装官方扩展(Release 用户:无需本机 Rust/Go)
|
||||
# 3) 安装官方扩展(Release / CDN 用户:无需本机 Rust/Go)
|
||||
marqdo ext add web # 或:网页 — 自动下载 L1 + 预编译 native(Go libweb)
|
||||
marqdo ext add agent # 或:智能体
|
||||
marqdo ext add quantum # 或:量子
|
||||
@@ -149,6 +159,7 @@ marqdo ext add llm # 或:大模型(纯 .mq.md)
|
||||
# 离线:解压 Windows zip(已含 ext/native)或手动放下 native zip;MARQDO_EXT_NO_DOWNLOAD=1
|
||||
|
||||
# 4) 动态站示例(扩展装好后)
|
||||
marqdo run examples/web-site-zh/index.mq.md # 表驱动引言 Demo
|
||||
marqdo run examples/marqdo-blog/index.mq.md
|
||||
marqdo run examples/anlian-mq/index.mq.md # W-G14 验收站
|
||||
# 浏览器打开终端打印的 listen 地址;/favicon.ico 与 logo 装配见 W8
|
||||
@@ -158,7 +169,7 @@ marqdo wasm build
|
||||
# → dist/wasm/ … 见 examples/browser-hello/
|
||||
|
||||
# 6) Releases:Windows exe/zip/vsix;Linux CLI zip + native `.so` zip
|
||||
# https://github.com/cflmy/marqdo/releases/tag/v1.0.1
|
||||
# https://github.com/cflmy/marqdo/releases/tag/v1.0.3
|
||||
```
|
||||
|
||||
开发期也可用 `cargo run -- …` 代替已安装的 `marqdo`:
|
||||
@@ -170,7 +181,7 @@ cargo run -- view output public -o public
|
||||
powershell -File ./scripts/build-public.ps1
|
||||
```
|
||||
|
||||
**发布包(GitHub Releases)**:单独二进制 **已内置**官方 `lib/`(`import …:lib/…` 可直接导入)。仍提供带 `lib/` 的 zip 便于覆盖或离线分发。**扩展库**用 `marqdo ext add …` 安装(见 [CHANGELOG](CHANGELOG.md) 与 [ext-cli.md](doc/design/ext-cli.md));原生 `.so`/`.dll` 需本地编译或从带 `native/` 的安装目录解析。
|
||||
**发布包**:GitHub Releases 的单独二进制 **已内置**官方 `lib/`。Ubuntu 用户优先 **PPA** 装 CLI。**扩展库**用 `marqdo ext add …`(CDN → GitHub);设计见 [ext-cdn.md](doc/design/ext-cdn.md) · [ubuntu-ppa.md](doc/design/ubuntu-ppa.md) · [ext-cli.md](doc/design/ext-cli.md)。
|
||||
|
||||
文档:用户站 [public/](public/) · 设计 [doc/](doc/) · OKF / catalog [catalog-cli.md](doc/design/catalog-cli.md) · 调试 [view-debug.md](doc/design/view-debug.md) · 变更 [CHANGELOG.md](CHANGELOG.md)
|
||||
---
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "marqdo-wasm"
|
||||
version = "1.0.1"
|
||||
version = "1.0.3"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Marqdo interpreter as WebAssembly (browser host bridge)"
|
||||
|
||||
@@ -197,6 +197,20 @@ export function eventArgsFromDom(ev, valueFromSel) {
|
||||
args.fields = fields;
|
||||
}
|
||||
}
|
||||
if (ev && (ev.type === "scroll" || ev.type === "resize")) {
|
||||
try {
|
||||
const doc = typeof document !== "undefined" ? document.documentElement : null;
|
||||
const body = typeof document !== "undefined" ? document.body : null;
|
||||
const scrollTop = (doc && (doc.scrollTop || 0)) || (body && body.scrollTop) || 0;
|
||||
const height = doc ? (doc.scrollHeight - doc.clientHeight) || 1 : 1;
|
||||
const ratio = Math.max(0, Math.min(1, scrollTop / height));
|
||||
args.scroll_top = scrollTop;
|
||||
args.scroll_max = height;
|
||||
args.scroll_ratio = ratio;
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
}
|
||||
return args;
|
||||
}
|
||||
|
||||
@@ -721,75 +735,88 @@ function runObserveEffect(exports, spec, onError) {
|
||||
const kind = String(spec.kind || spec.type || "intersect").toLowerCase();
|
||||
const sel = String(spec.sel || "");
|
||||
const thenFn = spec.then;
|
||||
const id = String(spec.id || `obs${++observeSeq}`);
|
||||
const el = qsOne(sel);
|
||||
if (!el || !thenFn) return;
|
||||
const baseId = String(spec.id || `obs${++observeSeq}`);
|
||||
const nodes = qsAll(sel);
|
||||
if (!nodes.length || (!thenFn && !spec.add_class)) return;
|
||||
|
||||
const prev = observeHandles.get(id);
|
||||
if (prev) {
|
||||
try {
|
||||
prev.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
}
|
||||
|
||||
const fire = (payload) => {
|
||||
try {
|
||||
const result = call(exports, thenFn, payload);
|
||||
if (!result.ok) {
|
||||
if (onError) onError(result.error);
|
||||
return;
|
||||
nodes.forEach((el, idx) => {
|
||||
const id = nodes.length === 1 ? baseId : `${baseId}_${idx}`;
|
||||
const prev = observeHandles.get(id);
|
||||
if (prev) {
|
||||
try {
|
||||
prev.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
applyEffects(exports, result.value, { onError });
|
||||
} catch (e) {
|
||||
if (onError) onError(String(e));
|
||||
}
|
||||
};
|
||||
|
||||
if (kind === "resize" && typeof ResizeObserver !== "undefined") {
|
||||
const ro = new ResizeObserver((entries) => {
|
||||
const en = entries[0];
|
||||
const cr = en?.contentRect;
|
||||
fire({
|
||||
ok: true,
|
||||
kind: "resize",
|
||||
id,
|
||||
width: cr ? cr.width : 0,
|
||||
height: cr ? cr.height : 0,
|
||||
});
|
||||
});
|
||||
ro.observe(el);
|
||||
observeHandles.set(id, ro);
|
||||
return;
|
||||
}
|
||||
const fire = (payload) => {
|
||||
try {
|
||||
const result = call(exports, thenFn, payload);
|
||||
if (!result.ok) {
|
||||
if (onError) onError(result.error);
|
||||
return;
|
||||
}
|
||||
applyEffects(exports, result.value, { onError });
|
||||
} catch (e) {
|
||||
if (onError) onError(String(e));
|
||||
}
|
||||
};
|
||||
|
||||
if (typeof IntersectionObserver !== "undefined") {
|
||||
const io = new IntersectionObserver(
|
||||
(entries) => {
|
||||
if (kind === "resize" && typeof ResizeObserver !== "undefined") {
|
||||
const ro = new ResizeObserver((entries) => {
|
||||
const en = entries[0];
|
||||
if (!en) return;
|
||||
const cr = en?.contentRect;
|
||||
fire({
|
||||
ok: true,
|
||||
kind: "intersect",
|
||||
kind: "resize",
|
||||
id,
|
||||
intersecting: !!en.isIntersecting,
|
||||
ratio: en.intersectionRatio,
|
||||
width: cr ? cr.width : 0,
|
||||
height: cr ? cr.height : 0,
|
||||
});
|
||||
if (spec.once && en.isIntersecting) {
|
||||
try {
|
||||
io.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
});
|
||||
ro.observe(el);
|
||||
observeHandles.set(id, ro);
|
||||
return;
|
||||
}
|
||||
|
||||
if (typeof IntersectionObserver !== "undefined") {
|
||||
const opts = { threshold: spec.threshold != null ? Number(spec.threshold) : 0.1 };
|
||||
if (spec.rootMargin != null) opts.rootMargin = String(spec.rootMargin);
|
||||
const io = new IntersectionObserver(
|
||||
(entries) => {
|
||||
const en = entries[0];
|
||||
if (!en) return;
|
||||
if (en.isIntersecting && spec.add_class) {
|
||||
for (const c of String(spec.add_class).split(/\s+/).filter(Boolean)) {
|
||||
el.classList.add(c);
|
||||
}
|
||||
}
|
||||
observeHandles.delete(id);
|
||||
}
|
||||
},
|
||||
{ threshold: spec.threshold != null ? Number(spec.threshold) : 0.1 },
|
||||
);
|
||||
io.observe(el);
|
||||
observeHandles.set(id, io);
|
||||
}
|
||||
if (thenFn) {
|
||||
fire({
|
||||
ok: true,
|
||||
kind: "intersect",
|
||||
id,
|
||||
intersecting: !!en.isIntersecting,
|
||||
ratio: en.intersectionRatio,
|
||||
target_id: el.id || "",
|
||||
});
|
||||
}
|
||||
if (spec.once && en.isIntersecting) {
|
||||
try {
|
||||
io.disconnect();
|
||||
} catch (_) {
|
||||
/* ignore */
|
||||
}
|
||||
observeHandles.delete(id);
|
||||
}
|
||||
},
|
||||
opts,
|
||||
);
|
||||
io.observe(el);
|
||||
observeHandles.set(id, io);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function buildFetchInit(spec) {
|
||||
@@ -921,8 +948,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;
|
||||
}
|
||||
@@ -1371,12 +1413,24 @@ export async function autoMount(doc) {
|
||||
|
||||
const g = typeof globalThis !== "undefined" ? globalThis : undefined;
|
||||
if (g && g.document) {
|
||||
// Defer WASM boot until after first paint / load so LCP images are not
|
||||
// contending with a ~1.6MB wasm download on the critical path.
|
||||
const start = () => {
|
||||
autoMount(g.document).catch((e) => console.error("marqdo autoMount:", e));
|
||||
const run = () => {
|
||||
autoMount(g.document).catch((e) => console.error("marqdo autoMount:", e));
|
||||
};
|
||||
const schedule = () => {
|
||||
if (typeof g.requestIdleCallback === "function") {
|
||||
g.requestIdleCallback(() => run(), { timeout: 1500 });
|
||||
} else {
|
||||
g.setTimeout(run, 0);
|
||||
}
|
||||
};
|
||||
if (g.document.readyState === "complete") {
|
||||
schedule();
|
||||
} else {
|
||||
g.addEventListener("load", schedule, { once: true });
|
||||
}
|
||||
};
|
||||
if (g.document.readyState === "loading") {
|
||||
g.document.addEventListener("DOMContentLoaded", start);
|
||||
} else {
|
||||
queueMicrotask(start);
|
||||
}
|
||||
start();
|
||||
}
|
||||
@@ -185,7 +185,38 @@ fn pack_json(v: &serde_json::Value) -> *mut u8 {
|
||||
ptr::copy_nonoverlapping(len.to_le_bytes().as_ptr(), out, 4);
|
||||
ptr::copy_nonoverlapping(bytes.as_ptr(), out.add(4), bytes.len());
|
||||
}
|
||||
out
|
||||
out
|
||||
}
|
||||
|
||||
/// getrandom `custom` backend for wasm32 — no wasm-bindgen / JS glue imports.
|
||||
/// Preferable to the `js` feature which pulls `__wbindgen_*` and breaks raw mq_* ABI.
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
#[no_mangle]
|
||||
unsafe extern "Rust" fn __getrandom_custom(dest: *mut u8, len: usize) -> u32 {
|
||||
// xorshift64* seeded once; fine for uuid/non-crypto browser host helpers.
|
||||
use std::cell::Cell;
|
||||
thread_local! {
|
||||
static STATE: Cell<u64> = const { Cell::new(0x4d51_5241_4e44_4f21) };
|
||||
}
|
||||
if dest.is_null() || len == 0 {
|
||||
return 0;
|
||||
}
|
||||
let mut s = STATE.with(|c| {
|
||||
let mut v = c.get();
|
||||
if v == 0 {
|
||||
v = 0x4d51_5241_4e44_4f21;
|
||||
}
|
||||
v
|
||||
});
|
||||
let buf = unsafe { std::slice::from_raw_parts_mut(dest, len) };
|
||||
for b in buf.iter_mut() {
|
||||
s ^= s << 13;
|
||||
s ^= s >> 7;
|
||||
s ^= s << 17;
|
||||
*b = (s >> 8) as u8;
|
||||
}
|
||||
STATE.with(|c| c.set(s));
|
||||
0
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
Vendored
+22
@@ -0,0 +1,22 @@
|
||||
Marqdo for Ubuntu (PPA)
|
||||
=======================
|
||||
|
||||
This package installs the marqdo CLI (/usr/bin/marqdo).
|
||||
|
||||
Official language extensions are not bundled. After install:
|
||||
|
||||
marqdo ext add web
|
||||
marqdo ext add quantum
|
||||
|
||||
Extension packs download from https://ext.marqdo.com (then GitHub / proxy).
|
||||
|
||||
Install this package from:
|
||||
|
||||
sudo add-apt-repository ppa:cflmy/marqdo
|
||||
sudo apt update
|
||||
sudo apt install marqdo
|
||||
|
||||
Also available: GitHub Releases (Windows/Linux zips) and building from source.
|
||||
|
||||
Documentation: https://github.com/cflmy/marqdo
|
||||
PPA notes: doc/design/ubuntu-ppa.md in the upstream repository.
|
||||
Vendored
+27
@@ -0,0 +1,27 @@
|
||||
marqdo (1.0.3-1ppa2) noble; urgency=medium
|
||||
|
||||
* Fix Launchpad build: dh_clean -Xvendor/ so cargo vendor checksums keep
|
||||
Cargo.toml.orig (debian-only; reuse published 1.0.3.orig.tar.xz).
|
||||
|
||||
-- cflmy <pingan@cflmy.cn> Thu, 17 Sep 2026 21:28:00 +0800
|
||||
|
||||
marqdo (1.0.3-1ppa1) noble; urgency=medium
|
||||
|
||||
* Marqdo 1.0.3: PPA + ext CDN; unbound GFM tables; bundled Rust for noble.
|
||||
|
||||
-- cflmy <pingan@cflmy.cn> Thu, 17 Sep 2026 10:35:00 +0800
|
||||
|
||||
marqdo (1.0.2-1ppa2) noble; urgency=medium
|
||||
|
||||
* Bundle Rust toolchain in orig (third_party/rust) so noble can build
|
||||
Cargo.lock v4 offline; drop distro cargo/rustc Build-Depends.
|
||||
* Architecture: amd64 (bundled toolchain is x86_64).
|
||||
|
||||
-- cflmy <pingan@cflmy.cn> Thu, 17 Sep 2026 10:20:00 +0800
|
||||
|
||||
marqdo (1.0.2-1ppa1) noble; urgency=medium
|
||||
|
||||
* Initial Ubuntu PPA packaging for Marqdo 1.0.2.
|
||||
* CLI only; extensions via "marqdo ext add" / ext.marqdo.com.
|
||||
|
||||
-- cflmy <pingan@cflmy.cn> Thu, 17 Sep 2026 09:55:00 +0800
|
||||
Vendored
+29
@@ -0,0 +1,29 @@
|
||||
Source: marqdo
|
||||
Section: devel
|
||||
Priority: optional
|
||||
Maintainer: cflmy <pingan@cflmy.cn>
|
||||
Build-Depends:
|
||||
debhelper-compat (= 13),
|
||||
build-essential,
|
||||
pkg-config,
|
||||
libssl-dev,
|
||||
ca-certificates
|
||||
Standards-Version: 4.7.0
|
||||
Homepage: https://github.com/cflmy/marqdo
|
||||
Vcs-Git: https://github.com/cflmy/marqdo.git
|
||||
Vcs-Browser: https://github.com/cflmy/marqdo
|
||||
Rules-Requires-Root: no
|
||||
|
||||
Package: marqdo
|
||||
Architecture: amd64
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, ca-certificates
|
||||
Description: Markdown markers as an interpreted programming language
|
||||
Marqdo treats Markdown markers as executable syntax (code / return /
|
||||
control flow). This package installs the marqdo CLI.
|
||||
.
|
||||
Official extensions (web, quantum, …) are installed separately via
|
||||
"marqdo ext add" and download from https://ext.marqdo.com .
|
||||
.
|
||||
Launchpad builds use a bundled Rust toolchain under third_party/rust
|
||||
(Ubuntu noble cargo is too old for Cargo.lock v4). Rebuilds on newer
|
||||
series may use distro rustc if cargo ≥ 1.78.
|
||||
Vendored
+24
@@ -0,0 +1,24 @@
|
||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: marqdo
|
||||
Upstream-Contact: cflmy <pingan@cflmy.cn>
|
||||
Source: https://github.com/cflmy/marqdo
|
||||
|
||||
Files: *
|
||||
Copyright: 2024-2026 cflmy
|
||||
License: Apache-2.0
|
||||
|
||||
License: Apache-2.0
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
.
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
.
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
.
|
||||
On Debian systems, the complete text of the Apache License version 2
|
||||
can be found in "/usr/share/common-licenses/Apache-2.0".
|
||||
+58
@@ -0,0 +1,58 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
export DH_VERBOSE = 1
|
||||
# Offline builds on Launchpad: vendored crates + optional bundled Rust toolchain.
|
||||
export CARGO_HOME = $(CURDIR)/debian/cargo_home
|
||||
export CARGO_NET_OFFLINE = true
|
||||
|
||||
# Noble (and older) distro cargo cannot read Cargo.lock v4 / modern crates.
|
||||
# Prefer third_party/rust from the orig tarball when present (see ppa-build-source.sh).
|
||||
BUNDLED_RUST = $(CURDIR)/third_party/rust
|
||||
ifneq ($(wildcard $(BUNDLED_RUST)/bin/cargo),)
|
||||
export PATH := $(BUNDLED_RUST)/bin:$(PATH)
|
||||
endif
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
||||
override_dh_auto_configure:
|
||||
mkdir -p debian/cargo_home
|
||||
@if [ -x "$(BUNDLED_RUST)/bin/cargo" ]; then \
|
||||
echo "Using bundled Rust: $$($(BUNDLED_RUST)/bin/rustc --version)"; \
|
||||
else \
|
||||
echo "Using system Rust: $$(rustc --version 2>/dev/null || echo missing)"; \
|
||||
fi
|
||||
@if [ -f "$(CURDIR)/.cargo/config.toml" ] || [ -d "$(CURDIR)/vendor" ]; then \
|
||||
echo "Using vendored Cargo dependencies"; \
|
||||
else \
|
||||
echo "WARNING: no vendor/ — online cargo fetch required (not for Launchpad)"; \
|
||||
fi
|
||||
|
||||
override_dh_auto_build:
|
||||
mkdir -p debian/cargo_home
|
||||
@command -v cargo >/dev/null || { echo "error: cargo not found (bundle third_party/rust or install rustc/cargo)" >&2; exit 1; }
|
||||
if [ -d "$(CURDIR)/vendor" ]; then \
|
||||
CARGO_NET_OFFLINE=true cargo build --release --locked --offline \
|
||||
-p marqdo; \
|
||||
else \
|
||||
cargo build --release --locked -p marqdo; \
|
||||
fi
|
||||
|
||||
override_dh_auto_test:
|
||||
@echo "Skipping full test suite on package build (run cargo test in CI)."
|
||||
|
||||
override_dh_auto_install:
|
||||
install -d $(CURDIR)/debian/marqdo/usr/bin
|
||||
install -m 0755 $(CURDIR)/target/release/marqdo \
|
||||
$(CURDIR)/debian/marqdo/usr/bin/marqdo
|
||||
|
||||
# dh_clean deletes *.orig by default; cargo vendor checksums require
|
||||
# vendor/**/Cargo.toml.orig. Exclude the vendored tree from that purge.
|
||||
override_dh_clean:
|
||||
dh_clean -Xvendor/
|
||||
|
||||
override_dh_auto_clean:
|
||||
dh_auto_clean
|
||||
rm -rf debian/cargo_home
|
||||
# keep vendor/ and third_party/rust (part of source package)
|
||||
-cargo clean
|
||||
Vendored
+1
@@ -0,0 +1 @@
|
||||
3.0 (quilt)
|
||||
Vendored
+2
@@ -0,0 +1,2 @@
|
||||
# Ignore temporary files while editing patches
|
||||
extend-diff-ignore = "^vendor/"
|
||||
@@ -53,6 +53,8 @@
|
||||
| [design/ext-agent.md](design/ext-agent.md) | **官方扩展 `ext/agent`(文档驱动:单步 / 多步工作簿 + 自写回;废弃 thin TOOL 循环)** |
|
||||
| [design/ext-agent-plan.md](design/ext-agent-plan.md) | **`## 多步` / `## plan` 锁定设计**(工作簿文件、subtask 执行、修订循环、`step` 默认写回) |
|
||||
| [design/ext-cli.md](design/ext-cli.md) | **`marqdo ext list/add/remove` 官方扩展安装器** |
|
||||
| [design/ext-cdn.md](design/ext-cdn.md) | **扩展 CDN(R2 / ext.marqdo.com)与分开发版** |
|
||||
| [design/ubuntu-ppa.md](design/ubuntu-ppa.md) | **Ubuntu PPA 打包与上传** |
|
||||
| [design/ext-web.md](design/ext-web.md) | **官方扩展 `ext/web`(页面/库表/绑定/后台;ABI + CLI;设计锁定)** |
|
||||
| [design/ext-web-go-rewrite.md](design/ext-web-go-rewrite.md) | **`plugins/web` Go 全量重写**(多语言 ABI · 网页制备完备 · anlian 验收) |
|
||||
| [adr/0004-web-plugin-go.md](adr/0004-web-plugin-go.md) | **Accepted:web 原生插件实现语言为 Go** |
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
# Extension CDN (Cloudflare R2 → https://ext.marqdo.com)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| Status | **Accepted** — download prefer CDN; upload via `scripts/upload-ext-r2.py` |
|
||||
| Date | 2026-09-17 |
|
||||
| Related | [ext-cli.md](ext-cli.md) · [marqdo-release](../../.cursor/skills/marqdo-release/SKILL.md) |
|
||||
|
||||
## Why
|
||||
|
||||
CLI (语法解释器) and official **extension packs** (`ext/` L1 + native plugins) update on different cadences. Users behind unstable GitHub links should get packs from a stable object store first.
|
||||
|
||||
## Public URL layout
|
||||
|
||||
Bucket: `marqdo` · Custom domain: **https://ext.marqdo.com**
|
||||
|
||||
| Key | Meaning |
|
||||
|-----|---------|
|
||||
| `v{VER}/marqdo-{VER}-ext.zip` | L1 sources |
|
||||
| `v{VER}/marqdo-{VER}-native-{triple}.zip` | Prebuilt plugins |
|
||||
| `v{VER}/VERSION` | Pack SemVer echo |
|
||||
| `latest/VERSION` | Recommended pack SemVer (plain text) |
|
||||
| `latest/marqdo-…zip` | Same assets mirrored for convenience |
|
||||
|
||||
`{VER}` is the **extension pack** version (`ext/VERSION`), which **may differ** from CLI `Cargo.toml` version.
|
||||
|
||||
## Client download order (`marqdo ext add`)
|
||||
|
||||
1. `MARQDO_EXT_DOWNLOAD_BASE` (optional override)
|
||||
2. **CDN** `https://ext.marqdo.com/v{VER}/…` (override host with `MARQDO_EXT_CDN`)
|
||||
3. GitHub Releases
|
||||
4. `https://proxy.cflmy.top/github.com/…`
|
||||
|
||||
Pack SemVer resolution (`release_version()`):
|
||||
|
||||
1. `MARQDO_EXT_VERSION`
|
||||
2. CDN `GET …/latest/VERSION` (short timeout)
|
||||
3. Embedded `ext/VERSION` at build time
|
||||
4. CLI `CARGO_PKG_VERSION`
|
||||
|
||||
## Separate ext release (no CLI bump)
|
||||
|
||||
1. Bump `ext/VERSION` (e.g. `1.0.3`) — leave root `Cargo.toml` alone if CLI unchanged.
|
||||
2. Build native zips (CI Linux/Windows jobs or local `scripts/build-web-plugin.sh` + cargo plugins).
|
||||
3. Package `marqdo-{VER}-ext.zip` and `marqdo-{VER}-native-*.zip`.
|
||||
4. Upload **both**:
|
||||
- R2: `python3 scripts/upload-ext-r2.py --version VER --from-dir dist/`
|
||||
- GitHub: attach to a GitHub Release (tag `ext-vVER` **or** reuse latest CLI release assets)
|
||||
5. Confirm `https://ext.marqdo.com/latest/VERSION` and a sample zip URL return 200.
|
||||
|
||||
## Full product release (CLI + ext)
|
||||
|
||||
Keep `ext/VERSION` equal to (or compatible with) CLI SemVer unless documenting a deliberate skew. CI still publishes GitHub assets; **after** CI green, run `upload-ext-r2.py` so CDN is populated (or add a CI step with R2 secrets).
|
||||
|
||||
## Credentials
|
||||
|
||||
| Where | What |
|
||||
|-------|------|
|
||||
| Local | `~/.marqdo/r2.env` (`chmod 600`) — see `.env.r2.example` |
|
||||
| CI (optional) | GitHub Actions secrets: `R2_ACCESS_KEY_ID`, `R2_SECRET_ACCESS_KEY`, `R2_ENDPOINT`, `R2_BUCKET` |
|
||||
|
||||
**Never** commit Account API tokens or S3 secret keys. If a token was pasted into chat, **rotate** it in the Cloudflare dashboard.
|
||||
|
||||
## Object ACL
|
||||
|
||||
Custom domain public reads require the bucket/objects to be publicly readable (R2 public bucket / r2.dev / custom domain). Uploads use S3 API credentials; downloads by `ext add` are anonymous HTTPS GETs.
|
||||
@@ -51,10 +51,16 @@ L1 sources:
|
||||
|
||||
| Variable | Meaning |
|
||||
|----------|---------|
|
||||
| `MARQDO_EXT_VERSION` | Override SemVer used for Release asset names (default: CLI `CARGO_PKG_VERSION`) |
|
||||
| `MARQDO_EXT_VERSION` | Override **extension pack** SemVer (default: CDN `latest/VERSION` → embedded `ext/VERSION` → CLI version) |
|
||||
| `MARQDO_EXT_CDN` | Public CDN base (default `https://ext.marqdo.com`) |
|
||||
| `MARQDO_EXT_NO_DOWNLOAD=1` | Never hit the network (CI / air-gap); local/cargo only |
|
||||
| `MARQDO_EXT_DOWNLOAD_BASE` | Optional extra base tried **before** CDN |
|
||||
| `MARQDO_WEB_PLUGIN` / `MARQDO_AGENT_PLUGIN` / `MARQDO_QUANTUM_PLUGIN` | Explicit native path |
|
||||
|
||||
Download order for each Release asset: `MARQDO_EXT_DOWNLOAD_BASE` → **CDN `ext.marqdo.com`** → `github.com` → **`proxy.cflmy.top`**. Connect timeout 20s; read timeout 10min.
|
||||
|
||||
See [ext-cdn.md](ext-cdn.md) for R2 layout, separate ext releases, and `scripts/upload-ext-r2.py`.
|
||||
|
||||
Windows Release **zip** also ships `ext/` + `ext/native/*.dll` next to `marqdo.exe` so a portable unzip works offline after one download.
|
||||
|
||||
## Source for `add` (developers)
|
||||
|
||||
@@ -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,81 @@
|
||||
# `ext/web` 可配置 RBAC(角色 ⊥ 权限)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 验收 | qdqc:门禁 `desk:access` + 评论权限;`tests/ext/web-rbac-*-smoke.mq.md` |
|
||||
| 状态 | **Accepted · 已落地核心**(gate permissions;`/_rbac/*` 管理台 **opt-in** `管理台=真`) |
|
||||
|
||||
---
|
||||
|
||||
## 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;可选 `目录`;`管理台=真` 才挂 `/_rbac/*` |
|
||||
| `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. 仅当 `auth.rbac_desk=true`(`启用权限 管理台=真`)时挂载 `/_rbac/*` API 与 desk。
|
||||
3. 登录成功:解析角色 → DB `user_roles` ∪ GFM 角色展开 → session `permissions`(CSV)+ 兼容 `role`。
|
||||
4. `withRBAC`:gate 含 `permissions` 则 `PermissionAllowed`;否则旧 `RoleAllowed`。
|
||||
5. 注册:`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,91 @@
|
||||
# ext/web:请求上下文与表单字段来源
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted** |
|
||||
| 日期 | 2026-09-18 |
|
||||
| 相关 | [ext-web.md](ext-web.md) §5.5 · 对照 Django `request.user` / URL kwargs |
|
||||
| 动机 | 禁止扩展库按业务表名(如 `comments`)特判填字段;身份与路由键属于请求上下文 |
|
||||
|
||||
---
|
||||
|
||||
## 0. 原则
|
||||
|
||||
1. **扩展库提供机制,站点表达领域** — 不得出现 `if table == "comments"`。
|
||||
2. **身份只从 session 来,且服务端盖戳** — 客户端提交的 `author` 等不可信。
|
||||
3. **资源键从路由参数来** — 页面已在 `/post/{slug}` 时,表单继承该页 `params`,不解析 Referer 猜 slug。
|
||||
4. **非 `client` 来源的字段默认不渲染** — 服务端在校验前写入;若 POST 带同名键,一律覆盖丢弃。
|
||||
|
||||
---
|
||||
|
||||
## 1. 请求上下文(Request)
|
||||
|
||||
每次处理 HTTP 请求时,框架逻辑上持有:
|
||||
|
||||
| 键 | 含义 |
|
||||
|----|------|
|
||||
| `user` / `username` | 登录名;访客为空 |
|
||||
| `params` | 动态路由捕获(如 `{slug}`) |
|
||||
| `path` | 请求路径 |
|
||||
| `method` | GET / POST / … |
|
||||
| `query` | URL 查询(可选) |
|
||||
|
||||
与 Django 对应:`request.user`、`request.resolver_match.kwargs`、`request.path`。
|
||||
|
||||
页面渲染时已有 `page.params`(`injectParams`)。表单提交时通过隐藏字段 `_mq_params`(JSON)与 `_mq_return`(回跳路径)把**渲染该表单时的页上下文**带回 POST,避免依赖 Referer。
|
||||
|
||||
---
|
||||
|
||||
## 2. 字段表「来源」列
|
||||
|
||||
字段表增加可选列 `来源` / `source`(缺省 = `client`):
|
||||
|
||||
```markdown
|
||||
| 字段 | 标签 | 类型 | 必填 | 默认 | 来源 |
|
||||
|------|------|------|------|------|------|
|
||||
| body | 写下你的想法 | textarea | true | | client |
|
||||
| author | | | true | | session.username |
|
||||
| post_slug | | | true | | route.slug |
|
||||
| created_at | | | false | | now |
|
||||
```
|
||||
|
||||
| 来源值 | 含义 | 渲染 |
|
||||
|--------|------|------|
|
||||
| `client` / 空 | 用户填写 | 正常控件 |
|
||||
| `session.username` / `session.user` / `user` | 当前登录用户名 | 不渲染 |
|
||||
| `route.NAME` / `param.NAME` / `params.NAME` | `params[NAME]` | 不渲染 |
|
||||
| `now` / `utc.now` / `server.now` | UTC `YYYY-MM-DD HH:MM:SS` | 不渲染 |
|
||||
|
||||
`类型=hidden` 仍可显式使用;与 `来源≠client` 叠加时仍不依赖客户端值(服务端覆盖)。
|
||||
|
||||
---
|
||||
|
||||
## 3. 提交管线
|
||||
|
||||
```
|
||||
ParseForm → 去掉来源≠client 的 POST 键
|
||||
→ 按字段来源从 Request 写入
|
||||
→ validate → insert/update
|
||||
→ 回跳:优先 _mq_return(同站路径),否则 form.redirect
|
||||
```
|
||||
|
||||
伪造 `author` / `post_slug` 无效。
|
||||
|
||||
---
|
||||
|
||||
## 4. 页面列表装配(副绑定)
|
||||
|
||||
详情页可附加与主主体**不同查询条件**的列表绑定(如评论):
|
||||
|
||||
```markdown
|
||||
**post = > post.列表装配 主体=`评论卡片` 条件=`评论条件` 排序="-created_at"**
|
||||
```
|
||||
|
||||
条件值同样支持 `{slug}`。渲染在主文章/卡片区之后,无需为子资源单独写 JSON API + 前端过滤。
|
||||
|
||||
---
|
||||
|
||||
## 5. 非目标
|
||||
|
||||
- 不在扩展库内实现「评论」领域类型。
|
||||
- 不把 Referer 解析当作正式 params 来源(仅兼容期可作 `_mq_params` 缺失时的弱回退,金样不依赖)。
|
||||
@@ -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/`.
|
||||
@@ -3,8 +3,8 @@
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **Accepted · W0–W7 + P3 + W8(站点图标/Head/图片装配)完结**(SQLite/Postgres 作者面:页面装配 / db CRUD+`where` / form / 嵌入主区 / `app.route` / 路由 `/_part` / admin UI / RBAC / 上传相册 / SEO·RSS·sitemap / **favicon·头资源·图片装配**;Postgres 等见 §9) |
|
||||
| 日期 | 2026-08-11(W8:2026-08-29) |
|
||||
| 相关 | [markdown-mapping.md](markdown-mapping.md) · [module-namespace.md](module-namespace.md) · [objects.md](objects.md) · [ext-abi.md](ext-abi.md) · [ext-cli.md](ext-cli.md) · [stdlib-i18n.md](stdlib-i18n.md) · [web-assets-and-images.md](web-assets-and-images.md) |
|
||||
| 日期 | 2026-08-11(W8:2026-08-29;请求上下文:2026-09-18) |
|
||||
| 相关 | [markdown-mapping.md](markdown-mapping.md) · [module-namespace.md](module-namespace.md) · [objects.md](objects.md) · [ext-abi.md](ext-abi.md) · [ext-cli.md](ext-cli.md) · [stdlib-i18n.md](stdlib-i18n.md) · [web-assets-and-images.md](web-assets-and-images.md) · **[ext-web-request-context.md](ext-web-request-context.md)** |
|
||||
| 安装(目标) | `marqdo ext add web`(中英:`web` / `网页`) |
|
||||
| 本文目的 | 锁定**作者面**与**类 API**;指导实现 |
|
||||
|
||||
@@ -247,6 +247,7 @@ import db:db/index.mq.md
|
||||
|------|------|
|
||||
| compose_components / 组件装配 | 解析组件·样式路径 → 填 nav/sidebar/footer → CSS → 登记 part |
|
||||
| compose_main / 主体装配 | 解析库字段与样式路径 → 填 main → 登记 part(如 id=`index`) |
|
||||
| compose_list / 列表装配 | 副绑定(独立 query/order);可选 target 注入引言元素;见 [ext-web-request-context.md](ext-web-request-context.md) |
|
||||
|
||||
**槽位推断:** 由组件导出名决定(`nav`→顶栏,`side`→侧栏,`foot`→底栏;其余→main)。
|
||||
|
||||
@@ -423,6 +424,7 @@ import db:db/index.mq.md
|
||||
| `类型` | 控件/值类型:`text` `textarea` `number` `email` `url` `checkbox` `select` … |
|
||||
| `必填` | 是否必填 |
|
||||
| `默认` | 可选默认值 |
|
||||
| `来源` / `source` | 可选;见 [ext-web-request-context.md](ext-web-request-context.md):`client`(默认)/ `session.username` / `route.NAME` / `now`;非 client 不渲染且服务端盖戳 |
|
||||
|
||||
#### 5.5.2 校验表(作者面)
|
||||
|
||||
@@ -580,7 +582,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` 已够用)。
|
||||
|
||||
---
|
||||
|
||||
@@ -211,7 +211,7 @@ v0.3:
|
||||
| 体内 `1.` `2.` … | 分支 |
|
||||
| 体内 `-` | 循环 |
|
||||
| `N. *` | else 臂(此处 `*` 仍是「空条件」标记,**不是**返回值;见 §7.3) |
|
||||
| GFM 表格 | 集合(不变) |
|
||||
| GFM 表格 | 集合;`` `名` = `` 后绑定,或**未绑定**时求值后丢弃(文档中可写表) |
|
||||
| 表达式 `[键](集合)` | **取元**(与 foreach 同形;见 [collection-access-link.md](collection-access-link.md)) |
|
||||
| `修饰… [函数名] 实参…` | **方括号标记调用**(前置修饰 → `名=True`;见 [bracket-call-modifiers.md](bracket-call-modifiers.md)) |
|
||||
| `` 集合[^键] `` | **过渡**:旧脚注取元(仍可用) |
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
# Ubuntu PPA packaging (Marqdo)
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| Status | **Active** — `ppa:cflmy/marqdo`; noble builds need bundled Rust (Cargo.lock v4) |
|
||||
| Maintainer | cflmy \<pingan@cflmy.cn\> |
|
||||
| GPG | `505943294D04C803` (fingerprint `52A1…C803`) |
|
||||
| PPA | `ppa:cflmy/marqdo` |
|
||||
|
||||
## Goal
|
||||
|
||||
Users install with:
|
||||
|
||||
```bash
|
||||
sudo add-apt-repository ppa:cflmy/marqdo
|
||||
sudo apt update
|
||||
sudo apt install marqdo
|
||||
```
|
||||
|
||||
CLI and extension packs stay independent: the `.deb` ships the **interpreter**; `marqdo ext add …` still pulls from **https://ext.marqdo.com** (then GitHub / proxy).
|
||||
|
||||
## Why bundled Rust?
|
||||
|
||||
Ubuntu **noble** ships cargo/rustc **1.75**, which cannot parse **Cargo.lock version 4** (`lock file version 4 requires -Znext-lockfile-bump`). Launchpad builders also have **no network**, so `ppa-build-source.sh` vendors crates **and** installs a modern toolchain into `third_party/rust` inside the `.orig.tar.xz`. `debian/rules` prefers that toolchain over distro cargo.
|
||||
|
||||
## One-time Launchpad setup
|
||||
|
||||
1. Create PPA: https://launchpad.net/~cflmy/+activate-ppa → name e.g. `marqdo`
|
||||
2. OpenPGP key already on Launchpad (done)
|
||||
3. Sign Ubuntu Code of Conduct if Launchpad asks
|
||||
4. Enable the Ubuntu **series** you upload for (e.g. noble) under PPA → Change details
|
||||
5. On the build machine:
|
||||
|
||||
```bash
|
||||
sudo apt install build-essential debhelper devscripts dput lintian \
|
||||
dpkg-dev quilt cargo rustc pkg-config curl xz-utils
|
||||
```
|
||||
|
||||
## Package layout
|
||||
|
||||
| File | Role |
|
||||
|------|------|
|
||||
| `debian/control` | Metadata (amd64; no distro cargo BD) |
|
||||
| `debian/changelog` | Upload revisions (`1ppaN`) |
|
||||
| `debian/rules` | `dh` + bundled/system cargo build |
|
||||
| `scripts/ppa-build-source.sh` | Vendor + bundle Rust + `debuild -S` |
|
||||
| `scripts/ppa-ship.sh` | apt deps + build + `dput` |
|
||||
|
||||
## Versioning
|
||||
|
||||
- Upstream SemVer: `Cargo.toml` / git tag `vX.Y.Z`
|
||||
- Debian revision: `X.Y.Z-1ppaN~SERIES` (SERIES = `noble`, …) — bump `1ppaN` on packaging-only reuploads
|
||||
- **Ext pack** SemVer (`ext/VERSION`) is **not** the deb version
|
||||
|
||||
## One-shot (recommended)
|
||||
|
||||
```bash
|
||||
cd ~/work/marqdo
|
||||
./scripts/ppa-ship.sh noble # tools → debuild -S → dput
|
||||
./scripts/ppa-ship.sh noble -n # build only
|
||||
```
|
||||
|
||||
If automation cannot enter sudo/GPG, tell the user these commands (do not invent alternatives):
|
||||
|
||||
```bash
|
||||
./scripts/ppa-build-source.sh noble
|
||||
dput ppa:cflmy/marqdo ../build-area/marqdo_*~noble_source.changes
|
||||
```
|
||||
|
||||
Watch: https://launchpad.net/~cflmy/+archive/ubuntu/marqdo/+builds
|
||||
|
||||
## Failure notes
|
||||
|
||||
| Symptom | Fix |
|
||||
|---------|-----|
|
||||
| `lock file version 4 requires -Znext-lockfile-bump` | Rebuild with current `ppa-build-source.sh` (bundles Rust); bump `1ppaN` |
|
||||
| `failed to calculate checksum of: …/vendor/…/Cargo.toml.orig` | `dh_clean` purged `*.orig`; fixed via `dh_clean -Xvendor/` (+ strip `.orig` only when **creating a new** orig); bump `1ppaN` with **`-sd`** |
|
||||
| `orig.tar.xz already exists … different contents` | Never rewrite an uploaded upstream `.orig`; reuse PPA file (`ppa-build-source.sh` downloads it) and `debuild -S -sd` |
|
||||
| Same version rejected by Launchpad | Bump `debian/changelog` (`1ppa2`, …) |
|
||||
| Wrong series | Enable series on PPA; rebuild with that series name |
|
||||
|
||||
## Out of scope (v1 deb)
|
||||
|
||||
- Shipping `ext/native/*.so` inside the deb (use CDN `ext add`)
|
||||
- WASM / VSIX / non-amd64
|
||||
@@ -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. *
|
||||
****
|
||||
@@ -1,10 +1,9 @@
|
||||
# examples/web-site-zh
|
||||
|
||||
中文作者面示例:只导入 `ext/web/网页.mq.md`(不用英文 `web.mq.md`)。
|
||||
与 [`examples/web-site`](../web-site/) 对等(`ext/web/网页.mq.md`)。
|
||||
|
||||
```bash
|
||||
cargo build -p marqdo_plugin_web
|
||||
cargo run -- examples/web-site-zh/index.mq.md
|
||||
marqdo run examples/web-site-zh/index.mq.md
|
||||
```
|
||||
|
||||
打开 http://127.0.0.1:18082/ — `/about`、`/new`、`/admin`、`/static/site.css`。
|
||||
http://127.0.0.1:18082/ — 演示脚本见英文样站 [DEMO.md](../web-site/DEMO.md)。
|
||||
@@ -0,0 +1,29 @@
|
||||
---
|
||||
title: components/desk
|
||||
description: 管理台壳 — 顶栏品牌为「后台」,无前台侧栏。
|
||||
---
|
||||
|
||||
## nav
|
||||
|
||||
`nav` =
|
||||
|
||||
| 属性 | 值 | 样式 | 媒体 | 当 |
|
||||
|------|-----|------|------|-----|
|
||||
| 后台 | /admin | | | |
|
||||
| 站点 | / | | | |
|
||||
| 写文章 | /new | | | |
|
||||
| 退出 | /admin/logout | | | auth |
|
||||
|
||||
*`nav`*
|
||||
|
||||
## foot
|
||||
|
||||
`foot` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| 站点 | / | |
|
||||
| 后台 | /admin | |
|
||||
| 退出 | /admin/logout | |
|
||||
|
||||
*`foot`*
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| Marqdo | https://github.com | |
|
||||
| Marqdo | https://www.marqdo.com/ | |
|
||||
| Source | https://github.com/cflmy/marqdo | |
|
||||
|
||||
*`foot`*
|
||||
|
||||
@@ -1,12 +1,16 @@
|
||||
## nav
|
||||
|
||||
顶栏:**登录**(访客)/ **后台** + **退出**(已登录)。
|
||||
|
||||
`nav` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| 首页 | / | |
|
||||
| 关于 | /about | |
|
||||
| 写文章 | /new | |
|
||||
| 后台 | /admin | |
|
||||
| 属性 | 值 | 样式 | 媒体 | 当 |
|
||||
|------|-----|------|------|-----|
|
||||
| Marqdo | / | | | |
|
||||
| 关于 | /about | | | |
|
||||
| 写文章 | /new | | | |
|
||||
| 登录 | /login | | | guest |
|
||||
| 后台 | /admin | | | auth |
|
||||
| 退出 | /admin/logout | | | auth |
|
||||
|
||||
*`nav`*
|
||||
@@ -2,9 +2,12 @@
|
||||
|
||||
`side` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| 笔记 | / | |
|
||||
| 文档 | https://github.com | |
|
||||
| 属性 | 值 | 样式 | 媒体 | 当 |
|
||||
|------|-----|------|------|-----|
|
||||
| 1. 首页 | / | | | |
|
||||
| 2. 写文章 | /new | | | |
|
||||
| 3. 登录 | /login | | | guest |
|
||||
| 3. 后台 | /admin | | | auth |
|
||||
| 关于 | /about | | | |
|
||||
|
||||
*`side`*
|
||||
@@ -6,17 +6,27 @@
|
||||
|------|------|------|
|
||||
| id | integer | false |
|
||||
| title | text | false |
|
||||
| slug | text | false |
|
||||
| summary | text | true |
|
||||
| body | text | true |
|
||||
|
||||
*`fields`*
|
||||
|
||||
## seed
|
||||
|
||||
卡片显示 summary;/post/{slug} 显示完整 body(Markdown)。
|
||||
|
||||
`rows` =
|
||||
|
||||
| id | title | body |
|
||||
|----|-------|------|
|
||||
| 1 | 你好 Marqdo | 第一篇来自 GFM 表格。 |
|
||||
| 2 | 代码即文档 | 页面表就是程序。 |
|
||||
| id | title | slug | summary | body |
|
||||
|----|-------|------|---------|------|
|
||||
| 1 | 你好 Marqdo | hello-marqdo | 一份可执行 Markdown 既是站点说明,也是上线制品——路由、表单与样式都用表声明。 | "Marqdo 把 .mq.md 当作可执行文档。编辑器里读到的叙述,就是服务器跑起来的同一份制品:GFM 表变成 schema、表单、导航与 CSS。本 Demo 走完这条契约——打开「写文章」、触发规则表校验,再发布一行,首页与后台同时出现,全程无需作者业务 JavaScript。" |
|
||||
| 2 | 表即全栈 | tables-full-stack | Schema、表单、路由、后台与主题令牌共用一套表方言,而不是 JS/CSS 分家。 | "常见技术栈把关切拆进多种语言:数据用 SQL/ORM,输入用表单库,URL 用路由,外观用手写样式。Marqdo 把这些表面收成作者本来就会写的 GFM 表。字段表、规则表、绑定表、样式表不是比喻,而是运行时。结果是一份既能当散文扫读、又能当程序执行的站点。" |
|
||||
| 3 | 零作者 JS 与 CSS | zero-author-js-css | 业务留在 Markdown;外观是样式表加宿主壳——无作者业务 JS、无作者 .css。 | "作者业务 JavaScript 从构造上为零:校验来自服务端规则表,列表/详情由绑定表交给宿主渲染。主题令牌写在属性/值表里,经样式装配变成 CSS,作者也不必维护 .css 文件。本 Demo 关闭壳样式,只让声明过的样式上色——方便会议观众当场核对主张。" |
|
||||
| 4 | 一表打通卡片与详情 | card-to-detail | 列表把 href 绑到 slug;/post/{slug} 加详情=真即可打开全文。 | "点击首页任意卡片。列表绑定用 articles.slug 作为 href,链接前缀补上 /post/。详情页复用同一张表,查询条件 slug = {slug},再页面.详情,首行就渲染成完整文章(标题 + Markdown 正文),而不是卡片网格。这与求道量子等更大的 Marqdo 站同一套路。" |
|
||||
| 5 | 样式表不是样式文件 | style-tables | 具名样式表(kicker、intro_title、card_title)通过绑定表第三列挂上。 | "引言、卡片与壳层都用属性/值/样式绑定。样式列指向 styles/shell.mq.md 里的具名属性表。引言装配或主体装配时,这些表变成页面上的 CSS 类。改 Demo 外观不必打开 .css——改可读的 Markdown 表,文案与样式仍挨在一起。" |
|
||||
| 6 | 表单来自字段表与规则表 | forms-from-tables | 「写文章」空标题会因规则表失败;合法提交写入与后台共享的一行。 | "写文章与后台挂载同一表单对象:字段表声明标签与类型,规则表声明 required、max 与提示文案。空标题提交时错误来自服务端,不是客户端脚本。填好标题与 slug 再提交,卡片网格与后台列表都会出现——一张 schema、两个表面、零作者 JS。" |
|
||||
| 7 | 种子数据就是文档 | seed-is-docs | 这些段落写在 GFM 种子表里——Demo 正文也是程序的一部分。 | "种子行与 schema 同在 db/articles.mq.md。首次启动若表为空,宿主会插入它们。于是 Demo 叙述与代码同版本:卡片用稍长摘要,详情用更长正文,slug 保证深链稳定。审稿人打开种子表,就能看到会场站点将展示的内容。" |
|
||||
| 8 | 为什么要做这个 Demo | why-demo-matters | WWW Demo 需要审稿人几分钟内能跑、能点、能对照源码的制品。 | "Demo 轨道要的是可运行系统,不是只靠幻灯片。本样站刻意很小:一张 SQLite 表、几条路由、一套文学风壳层——却覆盖论文主张(表即全栈),并配三步操作脚本。克隆仓库,运行样站,点开卡片,弄坏一次表单,再把 index.mq.md 与浏览器对照。这个闭环就是投稿本身。" |
|
||||
|
||||
*`rows`*
|
||||
@@ -1,37 +1,113 @@
|
||||
---
|
||||
title: 中文站点示例
|
||||
description: Home + /about + /new(表单嵌入)+ 后台;只用 ext/web/网页.mq.md。
|
||||
description: >-
|
||||
与 examples/web-site 对等的 WWW Demo 样站:表驱动全站;作者业务 JS=0;作者 .css=0。
|
||||
导入 网页:ext/web/网页.mq.md
|
||||
import shell:styles/shell.mq.md
|
||||
import nav:components/nav.mq.md
|
||||
import side:components/side.mq.md
|
||||
import foot:components/foot.mq.md
|
||||
import desk:components/desk.mq.md
|
||||
import articles:db/articles.mq.md
|
||||
import db:db/index.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
本文件既是站点说明,也是可运行应用。
|
||||
|
||||
`home` =
|
||||
|
||||
| 组件 | 样式 |
|
||||
|------|------|
|
||||
| nav.`nav` | shell.`topnav` |
|
||||
| side.`side` | shell.`side_panel` |
|
||||
| foot.`foot` | |
|
||||
| foot.`foot` | shell.`footer` |
|
||||
|
||||
后台壳:去掉前台侧栏,顶栏品牌改为「后台」。
|
||||
|
||||
`desk_shell` =
|
||||
|
||||
| 组件 | 样式 |
|
||||
|------|------|
|
||||
| desk.`nav` | shell.`topnav` |
|
||||
| desk.`foot` | shell.`footer` |
|
||||
|
||||
`index` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| title | articles.`articles`.title | shell.`card_title` |
|
||||
| body | articles.`articles`.body | shell.`card_body` |
|
||||
| body | articles.`articles`.summary | shell.`card_body` |
|
||||
| href | articles.`articles`.slug | |
|
||||
|
||||
`detail` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| title | articles.`articles`.title | shell.`card_title` |
|
||||
| body | articles.`articles`.body | |
|
||||
|
||||
`by_slug` =
|
||||
|
||||
| 字段 | 操作 | 值 |
|
||||
|------|------|-----|
|
||||
| slug | = | {slug} |
|
||||
|
||||
`首页引言` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| 眉题 | WWW Demo · 表即全栈 | shell.`kicker` |
|
||||
| 标题 | Marqdo | shell.`intro_title` |
|
||||
| 导语 | "一份可执行 Markdown 声明路由、表单、后台与样式——作者零业务 JavaScript、零手写 .css。点击卡片打开全文,再按下列三步动手试。" | shell.`lede` |
|
||||
| 标签 | 0 作者 JS | shell.`claim` |
|
||||
| 标签 | 0 作者 .css | shell.`claim` |
|
||||
| 标签 | GFM 表 | shell.`claim` |
|
||||
| 步骤 | "点击任意卡片 — /post/{slug} 用同一张 articles 表打开详情。" | shell.`step` |
|
||||
| 步骤 | "打开 [写文章](/new),空标题提交(规则表校验)。" | shell.`step` |
|
||||
| 步骤 | "点顶栏 **登录**(admin / demo),再进 **后台** — 门禁管理台:创建表单 + 列表。" | shell.`step` |
|
||||
|
||||
`关于引言` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| 眉题 | 关于 | shell.`kicker` |
|
||||
| 标题 | 关于 | shell.`intro_title` |
|
||||
| 导语 | "文档与站点同一 .mq.md 制品。版式与主题是 styles/shell.mq.md 里的 GFM 样式表——无需手写 CSS 或业务 JavaScript。" | shell.`lede` |
|
||||
|
||||
`写文章引言` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| 眉题 | 表单 · 试校验 | shell.`kicker` |
|
||||
| 标题 | 写文章 | shell.`intro_title` |
|
||||
| 导语 | 空标题提交应失败(规则表,非客户端 JS);填写标题、slug 与摘要后与后台、卡片网格共享一行。 | shell.`lede` |
|
||||
|
||||
`后台引言` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| 眉题 | 管理台 · 已进入后台 | shell.`kicker` |
|
||||
| 标题 | 后台 | shell.`intro_title` |
|
||||
| 导语 | "这就是管理台(需登录):与前台共用 articles schema,装配成列表 + 创建表单——不是另写一套 SPA。顶栏「站点」回前台,「退出」结束会话。" | shell.`lede` |
|
||||
| 标签 | 登录门禁 | shell.`claim` |
|
||||
| 标签 | 表声明 | shell.`claim` |
|
||||
| 标签 | "创建 + 列表" | shell.`claim` |
|
||||
|
||||
`文章引言` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| 眉题 | 文章 · 表绑定详情 | shell.`kicker` |
|
||||
|
||||
`article_fields` =
|
||||
|
||||
| 字段 | 标签 | 类型 | 必填 | 默认 |
|
||||
|------|------|------|------|------|
|
||||
| title | 标题 | text | true | |
|
||||
| slug | slug | text | true | |
|
||||
| summary | 摘要 | textarea | false | |
|
||||
| body | 正文 | textarea | false | |
|
||||
|
||||
`article_rules` =
|
||||
@@ -40,26 +116,88 @@ import db:db/index.mq.md
|
||||
|------|------|------|
|
||||
| title | required | 标题不能为空 |
|
||||
| title | max:120 | 标题太长 |
|
||||
| slug | required | slug 不能为空 |
|
||||
| slug | max:80 | slug 太长 |
|
||||
| summary | max:500 | 摘要太长 |
|
||||
| body | max:8000 | 正文太长 |
|
||||
|
||||
`home_meta` =
|
||||
|
||||
| key | value |
|
||||
|-----|-------|
|
||||
| description | 表即全栈 — Marqdo 网页示例;作者零业务 JavaScript。 |
|
||||
| og:type | website |
|
||||
| og:title | Marqdo 中文站 |
|
||||
|
||||
`fonts` =
|
||||
|
||||
| 关系 | 地址 | 跨域 |
|
||||
|------|------|------|
|
||||
| preconnect | https://fonts.googleapis.com | |
|
||||
| preconnect | https://fonts.gstatic.com | anonymous |
|
||||
| stylesheet | https://fonts.googleapis.com/css2?family=Great+Vibes&family=Noto+Sans+SC:wght@300;400;500;700&family=Noto+Serif+SC:wght@400;600&display=swap | |
|
||||
|
||||
**store = > db.open**
|
||||
**page = > 网页.页面 标题="Marqdo 中文站" 引言="<h1>中文站</h1><p>表格 + 类方法。</p>"**
|
||||
**site_css = > shell.css**
|
||||
|
||||
**page = > 网页.页面 标题="Marqdo 中文站" 壳样式="off"**
|
||||
**page = > page.引言装配 引言=`首页引言`**
|
||||
**page = > page.元数据 元数据=home_meta**
|
||||
**page = > page.头装配 表=fonts**
|
||||
**page = > page.样式 样式=site_css**
|
||||
**page = > page.组件装配 组件=home**
|
||||
**page = > page.主体装配 主体=index**
|
||||
**page = > page.链接前缀 前缀="/post/"**
|
||||
|
||||
**about = > 网页.页面 标题="关于" 引言="<h1>关于</h1><p>导入网页.mq.md 即用中文 API。</p>"**
|
||||
**about = > 网页.页面 标题="关于 · Marqdo 中文站" 壳样式="off"**
|
||||
**about = > about.引言装配 引言=`关于引言`**
|
||||
**about = > about.头装配 表=fonts**
|
||||
**about = > about.样式 样式=site_css**
|
||||
**about = > about.组件装配 组件=home**
|
||||
|
||||
**article_form = > 网页.表单 表="articles" 动作="插入"**
|
||||
**article_form = > article_form.字段 字段=article_fields**
|
||||
**article_form = > article_form.规则 规则=article_rules**
|
||||
|
||||
**new = > 网页.页面 标题="写文章" 引言="<h1>写文章</h1><p>表单嵌在主区。</p>"**
|
||||
**new = > 网页.页面 标题="写文章 · Marqdo 中文站" 壳样式="off"**
|
||||
**new = > new.引言装配 引言=`写文章引言`**
|
||||
**new = > new.头装配 表=fonts**
|
||||
**new = > new.样式 样式=site_css**
|
||||
**new = > new.组件装配 组件=home**
|
||||
**new = > new.表单装配 id="article" 表单=article_form**
|
||||
|
||||
**app = > 网页.应用 页面=page 数据库=store 后台=True 主机="127.0.0.1" 端口=18082**
|
||||
**desk = > 网页.页面 标题="后台 · Marqdo 中文站" 壳样式="off"**
|
||||
**desk = > desk.壳HTML 体类="is-desk"**
|
||||
**desk = > desk.引言装配 引言=`后台引言`**
|
||||
**desk = > desk.头装配 表=fonts**
|
||||
**desk = > desk.样式 样式=site_css**
|
||||
**desk = > desk.组件装配 组件=desk_shell**
|
||||
**desk = > desk.表单装配 id="article" 表单=article_form**
|
||||
**desk = > desk.主体装配 主体=index**
|
||||
**desk = > desk.链接前缀 前缀="/post/"**
|
||||
|
||||
**post = > 网页.页面 标题="文章 · Marqdo 中文站" 壳样式="off"**
|
||||
**post = > post.引言装配 引言=`文章引言`**
|
||||
**post = > post.头装配 表=fonts**
|
||||
**post = > post.样式 样式=site_css**
|
||||
**post = > post.组件装配 组件=home**
|
||||
**post = > post.主体装配 主体=detail**
|
||||
**post = > post.查询条件 条件=by_slug**
|
||||
**post = > post.详情 详情=True**
|
||||
|
||||
演示账号(用户表声明;宿主会话鉴权,无作者 JS)。
|
||||
|
||||
`管理员` =
|
||||
|
||||
| 用户名 | 密码 | 角色 |
|
||||
|--------|------|------|
|
||||
| admin | demo | admin |
|
||||
|
||||
**app = > 网页.应用 页面=page 数据库=store 后台=False 主机="127.0.0.1" 端口=18082 壳样式="off" 登录回跳="/admin" 登出回跳="/"**
|
||||
**app = > app.路由 路径="/about" 页面=about**
|
||||
**app = > app.路由 路径="/new" 页面=new**
|
||||
**app = > app.静态 目录="public" 挂载="/static"**
|
||||
**app = > app.路由 路径="/admin" 页面=desk**
|
||||
**app = > app.路由 路径="/post/{slug}" 页面=post**
|
||||
**app = > app.鉴权 用户表=`管理员` 会话时长=3600 登录路径="/login" 登录回跳="/admin" 登出回跳="/"**
|
||||
**app = > app.门禁 路径="/admin" 角色="admin" 匹配="prefix" 拒绝="redirect" 排除="/login"**
|
||||
> `app`.监听
|
||||
@@ -1,5 +0,0 @@
|
||||
/* 可选站点样式 — /static/site.css */
|
||||
body.site-hint::before {
|
||||
content: "static ok";
|
||||
display: none;
|
||||
}
|
||||
@@ -1,11 +1,233 @@
|
||||
---
|
||||
title: styles/shell
|
||||
description: >-
|
||||
Literary dark theme for examples/web-site — ink / wine / gold after the
|
||||
anlian.cyou Zhang Ailing topic. GFM tables only; no author .css.
|
||||
import web:ext/web/web.mq.md
|
||||
import text:lib/text.mq.md
|
||||
---
|
||||
|
||||
Authors style the site with **GFM tables** only. App pages use `shell_css=off`
|
||||
so host defaults do not fight this theme. Palette mirrors
|
||||
[海上花开](https://www.anlian.cyou/topics/author-zhangailing/): night ink,
|
||||
wine, cold gold, serif display.
|
||||
|
||||
## vars
|
||||
|
||||
`vars` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| :root | --ink | #0a0809 |
|
||||
| :root | --ink-lift | #141012 |
|
||||
| :root | --wine | #6b1e3a |
|
||||
| :root | --wine-soft | rgba(107,30,58,0.35) |
|
||||
| :root | --gold | #d4af37 |
|
||||
| :root | --gold-dim | rgba(212,175,55,0.45) |
|
||||
| :root | --gold-soft | rgba(212,175,55,0.12) |
|
||||
| :root | --paper | rgba(255,248,240,0.92) |
|
||||
| :root | --paper-dim | rgba(255,248,240,0.72) |
|
||||
| :root | --paper-faint | rgba(255,248,240,0.48) |
|
||||
| :root | --glass | rgba(20,12,18,0.72) |
|
||||
| :root | --glass-strong | rgba(20,12,18,0.88) |
|
||||
| :root | --border | rgba(212,175,55,0.22) |
|
||||
| :root | --border-soft | rgba(212,175,55,0.12) |
|
||||
| :root | --danger | #e8a0a8 |
|
||||
| :root | --radius | 4px |
|
||||
| :root | --radius-sm | 2px |
|
||||
| :root | --space-2 | 8px |
|
||||
| :root | --space-3 | 12px |
|
||||
| :root | --space-4 | 16px |
|
||||
| :root | --space-5 | 20px |
|
||||
| :root | --space-6 | 24px |
|
||||
| :root | --space-8 | 32px |
|
||||
| :root | --text | 16px |
|
||||
| :root | --leading | "1.75" |
|
||||
| :root | --shadow | "0 24px 80px rgba(0,0,0,.55), inset 0 1px 0 rgba(255,255,255,.06)" |
|
||||
| :root | --shadow-card | "0 12px 40px rgba(107,30,58,.35)" |
|
||||
| :root | --ring | "0 0 0 2px rgba(212,175,55,.35)" |
|
||||
| :root | --serif | "'Noto Serif SC', 'Source Serif 4', Georgia, serif" |
|
||||
| :root | --sans | "'Noto Sans SC', 'IBM Plex Sans', system-ui, sans-serif" |
|
||||
| :root | --display | "'Great Vibes', 'Allura', cursive" |
|
||||
| :root | --mono | "ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" |
|
||||
| ::selection | background | rgba(212,175,55,0.35) |
|
||||
| ::selection | color | var(--paper) |
|
||||
|
||||
*`vars`*
|
||||
|
||||
## motion
|
||||
|
||||
`motion` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| @keyframes rise 0% | opacity | "0" |
|
||||
| @keyframes rise 0% | transform | translateY(14px) |
|
||||
| @keyframes rise 100% | opacity | "1" |
|
||||
| @keyframes rise 100% | transform | translateY(0) |
|
||||
| @keyframes float 0% | transform | translateY(0) |
|
||||
| @keyframes float 0% | opacity | "0.7" |
|
||||
| @keyframes float 50% | transform | translateY(6px) |
|
||||
| @keyframes float 50% | opacity | "1" |
|
||||
| @keyframes float 100% | transform | translateY(0) |
|
||||
| @keyframes float 100% | opacity | "0.7" |
|
||||
| @keyframes goldPulse 0% | text-shadow | "0 0 24px rgba(212,175,55,.2)" |
|
||||
| @keyframes goldPulse 50% | text-shadow | "0 0 48px rgba(212,175,55,.45)" |
|
||||
| @keyframes goldPulse 100% | text-shadow | "0 0 24px rgba(212,175,55,.2)" |
|
||||
| @keyframes particleDrift 0% | transform | translate3d(0,0,0) |
|
||||
| @keyframes particleDrift 50% | transform | translate3d(-2.5vw, 1.5vh, 0) |
|
||||
| @keyframes particleDrift 100% | transform | translate3d(0,0,0) |
|
||||
| @keyframes particleDrift2 0% | transform | translate3d(0,0,0) |
|
||||
| @keyframes particleDrift2 50% | transform | translate3d(2vw, -2vh, 0) |
|
||||
| @keyframes particleDrift2 100% | transform | translate3d(0,0,0) |
|
||||
| @keyframes nebulaPulse 0% | opacity | "0.55" |
|
||||
| @keyframes nebulaPulse 50% | opacity | "0.9" |
|
||||
| @keyframes nebulaPulse 100% | opacity | "0.55" |
|
||||
|
||||
*`motion`*
|
||||
|
||||
## layout
|
||||
|
||||
`layout` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| * | box-sizing | border-box |
|
||||
| html | scroll-behavior | smooth |
|
||||
| html | -webkit-text-size-adjust | 100% |
|
||||
| body | margin | "0" |
|
||||
| body | min-height | 100vh |
|
||||
| body | font-family | var(--sans) |
|
||||
| body | font-weight | "400" |
|
||||
| body | font-size | var(--text) |
|
||||
| body | line-height | var(--leading) |
|
||||
| body | color | var(--paper) |
|
||||
| body | background | var(--ink) |
|
||||
| body | background-image | "radial-gradient(ellipse 90% 55% at 50% -15%, rgba(107,30,58,.5), transparent 58%), radial-gradient(ellipse 55% 45% at 92% 75%, rgba(212,175,55,.14), transparent 55%), radial-gradient(ellipse 40% 35% at 8% 70%, rgba(107,30,58,.22), transparent 60%), linear-gradient(180deg, #0a0809 0%, #120c10 45%, #0a0809 100%)" |
|
||||
| body | background-attachment | fixed |
|
||||
| body | display | grid |
|
||||
| body | grid-template-rows | "auto 1fr auto" |
|
||||
| body | -webkit-font-smoothing | antialiased |
|
||||
| body | position | relative |
|
||||
| body | overflow-x | hidden |
|
||||
| body::before | content | '""' |
|
||||
| body::before | position | fixed |
|
||||
| body::before | inset | "0" |
|
||||
| body::before | z-index | "1" |
|
||||
| body::before | pointer-events | none |
|
||||
| body::before | opacity | "0.1" |
|
||||
| body::before | background-image | "url(\"data:image/svg+xml,%3Csvg viewBox='0 0 256 256' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.9' numOctaves='4' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)'/%3E%3C/svg%3E\")" |
|
||||
| html::before | content | '""' |
|
||||
| html::before | position | fixed |
|
||||
| html::before | inset | "0" |
|
||||
| html::before | z-index | "0" |
|
||||
| html::before | pointer-events | none |
|
||||
| html::before | background-image | "radial-gradient(ellipse 50% 40% at 15% 30%, rgba(107,30,58,.35), transparent 70%), radial-gradient(ellipse 45% 35% at 85% 60%, rgba(212,175,55,.12), transparent 65%), radial-gradient(ellipse 40% 30% at 50% 90%, rgba(107,30,58,.25), transparent 70%)" |
|
||||
| html::before | animation | "nebulaPulse 12s ease-in-out infinite" |
|
||||
| body::after | content | '""' |
|
||||
| body::after | position | fixed |
|
||||
| body::after | top | "0" |
|
||||
| body::after | left | "0" |
|
||||
| body::after | width | "2px" |
|
||||
| body::after | height | "2px" |
|
||||
| body::after | z-index | "2" |
|
||||
| body::after | pointer-events | none |
|
||||
| body::after | border-radius | 50% |
|
||||
| body::after | background | transparent |
|
||||
| body::after | box-shadow | "82vw 15vh 0px 0px rgba(212,175,55,0.55),29vw 18vh 0px 1px rgba(212,175,55,0.25),95vw 70vh 1px 0px rgba(212,175,55,0.55),4vw 12vh 0px 1px rgba(212,175,55,0.35),78vw 4vh 0px 1px rgba(245,230,200,0.5),84vw 90vh 1px 0px rgba(245,230,200,0.5),58vw 76vh 0px 0px rgba(255,248,240,0.4),90vw 55vh 0px 0px rgba(255,248,240,0.4),28vw 98vh 0px 0px rgba(255,248,240,0.4),49vw 13vh 0px 1px rgba(255,248,240,0.4),34vw 6vh 1px 1px rgba(212,175,55,0.25),16vw 49vh 0px 1px rgba(212,175,55,0.55),80vw 47vh 0px 1px rgba(245,230,200,0.5),9vw 6vh 0px 0px rgba(212,175,55,0.25),11vw 30vh 1px 0px rgba(212,175,55,0.55),59vw 82vh 0px 0px rgba(255,248,240,0.4),46vw 27vh 0px 1px rgba(212,175,55,0.25),88vw 83vh 0px 1px rgba(212,175,55,0.55),94vw 32vh 1px 0px rgba(212,175,55,0.35),35vw 82vh 0px 1px rgba(212,175,55,0.25),42vw 99vh 0px 0px rgba(212,175,55,0.55),41vw 52vh 0px 0px rgba(255,248,240,0.4),73vw 92vh 0px 1px rgba(255,248,240,0.4),64vw 51vh 1px 0px rgba(212,175,55,0.25),34vw 18vh 0px 1px rgba(212,175,55,0.35),75vw 55vh 1px 0px rgba(245,230,200,0.5),29vw 18vh 1px 0px rgba(245,230,200,0.5),97vw 7vh 0px 1px rgba(212,175,55,0.55),21vw 88vh 0px 0px rgba(107,30,58,0.45),49vw 77vh 0px 1px rgba(107,30,58,0.45),2vw 88vh 0px 1px rgba(212,175,55,0.25),69vw 97vh 0px 0px rgba(255,248,240,0.4),38vw 56vh 1px 0px rgba(212,175,55,0.35),93vw 93vh 0px 1px rgba(255,248,240,0.4),14vw 81vh 0px 0px rgba(255,248,240,0.4),48vw 98vh 0px 1px rgba(212,175,55,0.35),42vw 63vh 0px 0px rgba(212,175,55,0.55),40vw 31vh 0px 1px rgba(212,175,55,0.55),11vw 11vh 1px 0px rgba(212,175,55,0.25),98vw 69vh 0px 1px rgba(212,175,55,0.35),61vw 71vh 0px 1px rgba(212,175,55,0.35),78vw 55vh 0px 1px rgba(212,175,55,0.35),40vw 52vh 0px 0px rgba(212,175,55,0.25),67vw 58vh 0px 0px rgba(212,175,55,0.55),9vw 44vh 0px 1px rgba(212,175,55,0.55),29vw 1vh 0px 0px rgba(212,175,55,0.55),9vw 5vh 0px 1px rgba(255,248,240,0.4),31vw 36vh 1px 0px rgba(212,175,55,0.25),70vw 17vh 1px 0px rgba(212,175,55,0.25),61vw 53vh 0px 0px rgba(212,175,55,0.35),85vw 56vh 1px 0px rgba(255,248,240,0.4),60vw 94vh 0px 0px rgba(212,175,55,0.55),52vw 94vh 0px 0px rgba(255,248,240,0.4),25vw 25vh 1px 0px rgba(245,230,200,0.5),55vw 24vh 1px 0px rgba(255,248,240,0.4),10vw 57vh 0px 0px rgba(245,230,200,0.5),84vw 70vh 0px 0px rgba(212,175,55,0.55),22vw 53vh 1px 0px rgba(107,30,58,0.45),52vw 8vh 1px 0px rgba(212,175,55,0.35),50vw 34vh 0px 0px rgba(107,30,58,0.45),90vw 94vh 1px 0px rgba(245,230,200,0.5),25vw 38vh 0px 1px rgba(212,175,55,0.35),95vw 70vh 0px 0px rgba(212,175,55,0.55),7vw 75vh 0px 0px rgba(107,30,58,0.45),66vw 11vh 0px 1px rgba(212,175,55,0.35),9vw 87vh 1px 0px rgba(212,175,55,0.35),73vw 32vh 0px 1px rgba(245,230,200,0.5),11vw 54vh 0px 0px rgba(212,175,55,0.25),27vw 86vh 0px 0px rgba(212,175,55,0.25),34vw 51vh 0px 0px rgba(212,175,55,0.35),41vw 97vh 0px 0px rgba(212,175,55,0.55),80vw 73vh 0px 1px rgba(212,175,55,0.55)" |
|
||||
| body::after | animation | "particleDrift 48s ease-in-out infinite" |
|
||||
| html::after | content | '""' |
|
||||
| html::after | position | fixed |
|
||||
| html::after | top | "0" |
|
||||
| html::after | left | "0" |
|
||||
| html::after | width | "1px" |
|
||||
| html::after | height | "1px" |
|
||||
| html::after | z-index | "2" |
|
||||
| html::after | pointer-events | none |
|
||||
| html::after | border-radius | 50% |
|
||||
| html::after | background | transparent |
|
||||
| html::after | box-shadow | "28vw 65vh 0 0 rgba(255,248,240,0.25),17vw 45vh 0 0 rgba(212,175,55,0.3),32vw 48vh 0 0 rgba(255,248,240,0.25),21vw 57vh 0 0 rgba(107,30,58,0.3),91vw 39vh 0 0 rgba(107,30,58,0.3),84vw 68vh 0 0 rgba(212,175,55,0.3),86vw 71vh 0 0 rgba(255,248,240,0.25),85vw 14vh 0 0 rgba(212,175,55,0.3),34vw 15vh 0 0 rgba(212,175,55,0.3),96vw 71vh 0 0 rgba(212,175,55,0.3),35vw 37vh 0 0 rgba(107,30,58,0.3),27vw 92vh 0 0 rgba(255,248,240,0.25),27vw 88vh 0 0 rgba(107,30,58,0.3),34vw 65vh 0 0 rgba(255,248,240,0.25),33vw 7vh 0 0 rgba(212,175,55,0.3),82vw 55vh 0 0 rgba(255,248,240,0.25),6vw 1vh 0 0 rgba(255,248,240,0.25),99vw 17vh 0 0 rgba(107,30,58,0.3),34vw 21vh 0 0 rgba(107,30,58,0.3),57vw 71vh 0 0 rgba(107,30,58,0.3),55vw 72vh 0 0 rgba(212,175,55,0.3),15vw 10vh 0 0 rgba(107,30,58,0.3),20vw 70vh 0 0 rgba(212,175,55,0.3),48vw 75vh 0 0 rgba(107,30,58,0.3),19vw 56vh 0 0 rgba(212,175,55,0.3),6vw 40vh 0 0 rgba(255,248,240,0.25),6vw 46vh 0 0 rgba(212,175,55,0.3),88vw 32vh 0 0 rgba(107,30,58,0.3),14vw 46vh 0 0 rgba(107,30,58,0.3),53vw 80vh 0 0 rgba(107,30,58,0.3),20vw 31vh 0 0 rgba(212,175,55,0.3),23vw 53vh 0 0 rgba(212,175,55,0.3),23vw 95vh 0 0 rgba(255,248,240,0.25),53vw 86vh 0 0 rgba(107,30,58,0.3),32vw 35vh 0 0 rgba(212,175,55,0.3),90vw 14vh 0 0 rgba(255,248,240,0.25),5vw 61vh 0 0 rgba(212,175,55,0.3),26vw 59vh 0 0 rgba(255,248,240,0.25),40vw 30vh 0 0 rgba(212,175,55,0.3),4vw 85vh 0 0 rgba(212,175,55,0.3),52vw 43vh 0 0 rgba(255,248,240,0.25),9vw 99vh 0 0 rgba(255,248,240,0.25),45vw 83vh 0 0 rgba(107,30,58,0.3),52vw 87vh 0 0 rgba(107,30,58,0.3),43vw 4vh 0 0 rgba(212,175,55,0.3),34vw 23vh 0 0 rgba(107,30,58,0.3),34vw 5vh 0 0 rgba(212,175,55,0.3),77vw 56vh 0 0 rgba(255,248,240,0.25)" |
|
||||
| html::after | animation | "particleDrift2 64s ease-in-out infinite" |
|
||||
| body.has-sidebar | grid-template-columns | "14rem minmax(0, 1fr)" |
|
||||
| body.has-sidebar | grid-template-areas | '"top top" "side main" "foot foot"' |
|
||||
| body.no-sidebar | grid-template-areas | '"top" "main" "foot"' |
|
||||
| body.layout-stacked | grid-template-areas | '"top" "main" "foot"' |
|
||||
| body.is-desk | grid-template-areas | '"top" "main" "foot"' |
|
||||
| header.topnav | grid-area | top |
|
||||
| aside.side | grid-area | side |
|
||||
| main.main | grid-area | main |
|
||||
| footer.foot | grid-area | foot |
|
||||
| header.topnav | position | relative |
|
||||
| header.topnav | z-index | "20" |
|
||||
| aside.side | position | relative |
|
||||
| aside.side | z-index | "10" |
|
||||
| main.main | position | relative |
|
||||
| main.main | z-index | "10" |
|
||||
| footer.foot | position | relative |
|
||||
| footer.foot | z-index | "10" |
|
||||
| main.main | width | "100%" |
|
||||
| main.main | max-width | "min(78rem, 100%)" |
|
||||
| main.main | padding | "var(--space-8) var(--space-6) 4rem" |
|
||||
| main.main | animation | "rise .8s cubic-bezier(.22,1,.36,1) both" |
|
||||
| a | color | var(--gold) |
|
||||
| a | text-decoration | none |
|
||||
| a | transition | color 0.25s ease |
|
||||
| a:hover | color | #f5e6c8 |
|
||||
| code | font-family | var(--mono) |
|
||||
| code | font-size | "0.82em" |
|
||||
| code | font-weight | "400" |
|
||||
| code | background | rgba(0,0,0,0.35) |
|
||||
| code | border | 1px solid var(--border-soft) |
|
||||
| code | padding | "0.12em 0.45em" |
|
||||
| code | border-radius | var(--radius-sm) |
|
||||
| code | color | var(--gold) |
|
||||
|
||||
*`layout`*
|
||||
|
||||
## responsive
|
||||
|
||||
`responsive` =
|
||||
|
||||
| 媒体 | 选择器 | 属性 | 值 |
|
||||
|------|--------|------|-----|
|
||||
| (max-width: 860px) | body.has-sidebar | grid-template-columns | 1fr |
|
||||
| (max-width: 860px) | body.has-sidebar | grid-template-areas | '"top" "main" "side" "foot"' |
|
||||
| (max-width: 860px) | aside.side | border-right | "0" |
|
||||
| (max-width: 860px) | aside.side | border-top | 1px solid var(--border-soft) |
|
||||
| (max-width: 860px) | main.main | padding | "var(--space-6) var(--space-4) var(--space-8)" |
|
||||
| (max-width: 860px) | .content.cards | grid-template-columns | 1fr |
|
||||
| (max-width: 860px) | .site-form form | grid-template-columns | 1fr |
|
||||
| (max-width: 860px) | .site-form label:nth-child(1) | grid-column | "1 / -1" |
|
||||
| (max-width: 860px) | .site-form label:nth-child(2) | grid-column | "1 / -1" |
|
||||
| (max-width: 860px) | header.topnav | padding | "0.85rem var(--space-4)" |
|
||||
| (max-width: 860px) | .intro_title | font-size | "2.4rem" |
|
||||
| (prefers-reduced-motion: reduce) | main.main | animation | none |
|
||||
| (prefers-reduced-motion: reduce) | .kicker | animation | none |
|
||||
| (prefers-reduced-motion: reduce) | article.card | transition | none |
|
||||
| (prefers-reduced-motion: reduce) | body::after | animation | none |
|
||||
| (prefers-reduced-motion: reduce) | html::after | animation | none |
|
||||
| (prefers-reduced-motion: reduce) | html::before | animation | none |
|
||||
|
||||
*`responsive`*
|
||||
|
||||
## topnav
|
||||
|
||||
`topnav` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| background | #ffffff |
|
||||
| border-bottom | 1px solid #e7e5e4 |
|
||||
| position | sticky |
|
||||
| top | "0" |
|
||||
| z-index | "40" |
|
||||
| display | flex |
|
||||
| align-items | center |
|
||||
| justify-content | flex-start |
|
||||
| gap | var(--space-4) |
|
||||
| padding | "1rem var(--space-6)" |
|
||||
| background | "linear-gradient(180deg, rgba(10,8,9,.92) 0%, rgba(10,8,9,.55) 70%, transparent 100%)" |
|
||||
| backdrop-filter | blur(10px) |
|
||||
| -webkit-backdrop-filter | blur(10px) |
|
||||
| border-bottom | 1px solid var(--border-soft) |
|
||||
|
||||
*`topnav`*
|
||||
|
||||
@@ -15,18 +237,40 @@
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| background | #f5f5f4 |
|
||||
| background | "rgba(10,8,9,.55)" |
|
||||
| padding | "var(--space-6) var(--space-4)" |
|
||||
| border-right | 1px solid var(--border-soft) |
|
||||
|
||||
*`side_panel`*
|
||||
|
||||
## footer
|
||||
|
||||
`footer` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| color | var(--paper-faint) |
|
||||
| font-size | "0.8rem" |
|
||||
| letter-spacing | "0.08em" |
|
||||
| padding | "var(--space-5) var(--space-6)" |
|
||||
| border-top | 1px solid var(--border-soft) |
|
||||
| background | "rgba(10,8,9,.75)" |
|
||||
|
||||
*`footer`*
|
||||
|
||||
## card_title
|
||||
|
||||
`card_title` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| font-size | 1.15rem |
|
||||
| margin | 0 0 0.35rem |
|
||||
| font-family | var(--serif) |
|
||||
| font-size | "1.15rem" |
|
||||
| font-weight | "600" |
|
||||
| margin | "0 0 var(--space-2)" |
|
||||
| color | var(--gold) |
|
||||
| letter-spacing | "0.02em" |
|
||||
| line-height | "1.35" |
|
||||
|
||||
*`card_title`*
|
||||
|
||||
@@ -36,7 +280,396 @@
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| color | #57534e |
|
||||
| margin | 0 |
|
||||
| color | var(--paper-dim) |
|
||||
| margin | "0" |
|
||||
| line-height | "1.65" |
|
||||
| font-size | "0.9rem" |
|
||||
| font-weight | "400" |
|
||||
| display | "-webkit-box" |
|
||||
| -webkit-box-orient | vertical |
|
||||
| -webkit-line-clamp | "3" |
|
||||
| overflow | hidden |
|
||||
|
||||
*`card_body`*
|
||||
|
||||
## chrome
|
||||
|
||||
Panel + claim/steps group layout (field look comes from named bind styles).
|
||||
|
||||
`chrome` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| .main-intro | background | var(--glass) |
|
||||
| .main-intro | border | 1px solid var(--border) |
|
||||
| .main-intro | border-radius | var(--radius) |
|
||||
| .main-intro | padding | "2.25rem 1.75rem 1.85rem" |
|
||||
| .main-intro | box-shadow | var(--shadow) |
|
||||
| .main-intro | backdrop-filter | blur(16px) |
|
||||
| .main-intro | -webkit-backdrop-filter | blur(16px) |
|
||||
| .main-intro | margin-bottom | var(--space-8) |
|
||||
| .main-intro > .claim | display | flex |
|
||||
| .main-intro > .claim | flex-wrap | wrap |
|
||||
| .main-intro > .claim | gap | var(--space-2) |
|
||||
| .main-intro > .claim | margin | "0 0 var(--space-6)" |
|
||||
| .main-intro > .steps | margin | "0" |
|
||||
| .main-intro > .steps | padding | "var(--space-5) var(--space-5) var(--space-5) 1.5rem" |
|
||||
| .main-intro > .steps | color | var(--paper-dim) |
|
||||
| .main-intro > .steps | background | "rgba(0,0,0,.35)" |
|
||||
| .main-intro > .steps | border | 1px solid var(--border-soft) |
|
||||
| .main-intro > .steps | border-left | 2px solid var(--gold-dim) |
|
||||
| .main-intro > .steps | border-radius | var(--radius) |
|
||||
| .main-intro > .steps | font-size | "0.95rem" |
|
||||
| .main-intro > .steps | letter-spacing | "0.02em" |
|
||||
| .main-intro > .steps a | color | var(--gold) |
|
||||
| .main-intro > .steps a | font-weight | "500" |
|
||||
| .main-intro > .steps a:hover | color | #f5e6c8 |
|
||||
| .article | background | var(--glass) |
|
||||
| .article | border | 1px solid var(--border) |
|
||||
| .article | border-radius | var(--radius) |
|
||||
| .article | padding | "2rem 1.75rem" |
|
||||
| .article | box-shadow | var(--shadow) |
|
||||
| .article | backdrop-filter | blur(16px) |
|
||||
| .article | -webkit-backdrop-filter | blur(16px) |
|
||||
| .article-title | font-family | var(--serif) |
|
||||
| .article-title | font-size | "clamp(1.75rem, 4vw, 2.35rem)" |
|
||||
| .article-title | font-weight | "600" |
|
||||
| .article-title | color | var(--gold) |
|
||||
| .article-title | letter-spacing | "0.04em" |
|
||||
| .article-title | margin | "0 0 var(--space-5)" |
|
||||
| .article-title | line-height | "1.25" |
|
||||
| .article-body | color | var(--paper-dim) |
|
||||
| .article-body | font-family | var(--sans) |
|
||||
| .article-body | font-size | "1.02rem" |
|
||||
| .article-body | line-height | "1.85" |
|
||||
| .article-body.md p | margin | "0 0 1.1rem" |
|
||||
| .article-body.md a | color | var(--gold) |
|
||||
| article.card | cursor | pointer |
|
||||
| a.card-link | color | inherit |
|
||||
| a.card-link | text-decoration | none |
|
||||
| a.card-link:hover | color | inherit |
|
||||
|
||||
*`chrome`*
|
||||
|
||||
## kicker
|
||||
|
||||
`kicker` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| letter-spacing | "0.32em" |
|
||||
| text-transform | uppercase |
|
||||
| font-size | "0.72rem" |
|
||||
| color | var(--gold-dim) |
|
||||
| margin | "0 0 var(--space-4)" |
|
||||
| font-weight | "400" |
|
||||
| font-family | var(--sans) |
|
||||
| animation | "float 2.8s ease-in-out infinite" |
|
||||
|
||||
*`kicker`*
|
||||
|
||||
## intro_title
|
||||
|
||||
`intro_title` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| font-family | var(--display) |
|
||||
| font-size | "clamp(3rem, 10vw, 4.8rem)" |
|
||||
| font-weight | "400" |
|
||||
| line-height | "1.15" |
|
||||
| letter-spacing | "0.04em" |
|
||||
| margin | "0 0 var(--space-4)" |
|
||||
| color | transparent |
|
||||
| background | "linear-gradient(135deg, #f5e6c8 0%, var(--gold) 42%, var(--wine) 100%)" |
|
||||
| -webkit-background-clip | text |
|
||||
| background-clip | text |
|
||||
| animation | "goldPulse 4.5s ease-in-out infinite" |
|
||||
|
||||
*`intro_title`*
|
||||
|
||||
## lede
|
||||
|
||||
`lede` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| color | var(--paper-dim) |
|
||||
| max-width | "34rem" |
|
||||
| line-height | "1.85" |
|
||||
| margin | "0 0 var(--space-5)" |
|
||||
| font-size | "1.05rem" |
|
||||
| letter-spacing | "0.02em" |
|
||||
| font-weight | "400" |
|
||||
| font-family | var(--sans) |
|
||||
|
||||
*`lede`*
|
||||
|
||||
## claim
|
||||
|
||||
`claim` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| display | inline-flex |
|
||||
| align-items | center |
|
||||
| padding | "0.2rem 0.65rem" |
|
||||
| border-radius | var(--radius-sm) |
|
||||
| background | var(--wine-soft) |
|
||||
| color | #f0c9d4 |
|
||||
| font-size | "0.68rem" |
|
||||
| font-weight | "500" |
|
||||
| letter-spacing | "0.14em" |
|
||||
| border | 1px solid rgba(107,30,58,0.5) |
|
||||
|
||||
*`claim`*
|
||||
|
||||
## step
|
||||
|
||||
`step` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| margin | "0.55rem 0" |
|
||||
|
||||
*`step`*
|
||||
|
||||
## widgets
|
||||
|
||||
`widgets` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| ul.nav | display | flex |
|
||||
| ul.nav | flex-wrap | wrap |
|
||||
| ul.nav | align-items | center |
|
||||
| ul.nav | gap | "0.35rem 1rem" |
|
||||
| ul.nav | list-style | none |
|
||||
| ul.nav | margin | "0" |
|
||||
| ul.nav | padding | "0" |
|
||||
| ul.nav a | display | inline-flex |
|
||||
| ul.nav a | align-items | center |
|
||||
| ul.nav a | text-decoration | none |
|
||||
| ul.nav a | color | var(--paper-dim) |
|
||||
| ul.nav a | padding | "0.35rem 0" |
|
||||
| ul.nav a | border-radius | "0" |
|
||||
| ul.nav a | font-weight | "400" |
|
||||
| ul.nav a | font-size | "0.8rem" |
|
||||
| ul.nav a | letter-spacing | "0.14em" |
|
||||
| ul.nav a | transition | color 0.25s ease |
|
||||
| ul.nav a:hover | background | transparent |
|
||||
| ul.nav a:hover | color | var(--gold) |
|
||||
| ul.nav a:hover | text-decoration | none |
|
||||
| ul.nav a[href="/admin"] | color | var(--gold) |
|
||||
| ul.nav a[href="/admin"] | letter-spacing | "0.18em" |
|
||||
| ul.nav a[href="/admin"] | border-bottom | 1px solid var(--gold-dim) |
|
||||
| ul.side-nav a[href="/admin"] | color | var(--gold) |
|
||||
| body.is-desk header.topnav | border-bottom | 1px solid rgba(107,30,58,0.55) |
|
||||
| body.is-desk header.topnav | box-shadow | "0 12px 40px rgba(107,30,58,.18)" |
|
||||
| body.is-desk .main-intro | border-left | 3px solid var(--wine) |
|
||||
| body.is-desk .site-form | border-color | rgba(107,30,58,0.45) |
|
||||
| body.is-desk .site-form | box-shadow | "0 0 0 1px rgba(212,175,55,.12), 0 18px 48px rgba(0,0,0,.35)" |
|
||||
| body.is-desk .content.cards | margin-top | var(--space-6) |
|
||||
| ul.nav li:first-child a | font-family | var(--display) |
|
||||
| ul.nav li:first-child a | font-weight | "400" |
|
||||
| ul.nav li:first-child a | color | var(--gold) |
|
||||
| ul.nav li:first-child a | font-size | "1.85rem" |
|
||||
| ul.nav li:first-child a | letter-spacing | "0.06em" |
|
||||
| ul.nav li:first-child a | padding | "0.1rem 0.2rem 0.1rem 0" |
|
||||
| ul.nav li:first-child a:hover | background | transparent |
|
||||
| ul.nav li:first-child a:hover | color | #f5e6c8 |
|
||||
| .side-label | display | block |
|
||||
| .side-label | font-size | "0" |
|
||||
| .side-label | margin | "0 0 var(--space-4)" |
|
||||
| .side-label::before | content | '"Path"' |
|
||||
| .side-label::before | display | block |
|
||||
| .side-label::before | font-size | "0.68rem" |
|
||||
| .side-label::before | letter-spacing | "0.28em" |
|
||||
| .side-label::before | text-transform | uppercase |
|
||||
| .side-label::before | color | var(--gold-dim) |
|
||||
| .side-label::before | font-weight | "400" |
|
||||
| ul.side-nav | list-style | none |
|
||||
| ul.side-nav | margin | "0" |
|
||||
| ul.side-nav | padding | "0" |
|
||||
| ul.side-nav | display | grid |
|
||||
| ul.side-nav | gap | "2px" |
|
||||
| ul.side-nav | border-left | 1px solid var(--border) |
|
||||
| ul.side-nav | padding-left | "0.85rem" |
|
||||
| ul.side-nav | margin-left | "0.25rem" |
|
||||
| ul.side-nav a | display | block |
|
||||
| ul.side-nav a | text-decoration | none |
|
||||
| ul.side-nav a | color | var(--paper-dim) |
|
||||
| ul.side-nav a | padding | "0.45rem 0.35rem" |
|
||||
| ul.side-nav a | border-radius | "0" |
|
||||
| ul.side-nav a | font-weight | "400" |
|
||||
| ul.side-nav a | font-size | "0.88rem" |
|
||||
| ul.side-nav a | letter-spacing | "0.06em" |
|
||||
| ul.side-nav a | border | "0" |
|
||||
| ul.side-nav a | position | relative |
|
||||
| ul.side-nav a:hover | background | transparent |
|
||||
| ul.side-nav a:hover | border-color | transparent |
|
||||
| ul.side-nav a:hover | color | var(--gold) |
|
||||
| ul.side-nav a:hover | text-decoration | none |
|
||||
| ul.side-nav a:hover | box-shadow | none |
|
||||
| ul.foot-nav | display | flex |
|
||||
| ul.foot-nav | gap | var(--space-4) |
|
||||
| ul.foot-nav | list-style | none |
|
||||
| ul.foot-nav | margin | "0" |
|
||||
| ul.foot-nav | padding | "0" |
|
||||
| ul.foot-nav a | color | var(--paper-faint) |
|
||||
| ul.foot-nav a | font-weight | "400" |
|
||||
| ul.foot-nav a | letter-spacing | "0.1em" |
|
||||
| ul.foot-nav a | font-size | "0.78rem" |
|
||||
| ul.foot-nav a:hover | color | var(--gold) |
|
||||
| .content.cards | display | grid |
|
||||
| .content.cards | gap | var(--space-4) |
|
||||
| .content.cards | margin-top | "0" |
|
||||
| .content.cards | grid-template-columns | "repeat(auto-fill, minmax(16rem, 1fr))" |
|
||||
| article.card | background | "rgba(0,0,0,.35)" |
|
||||
| article.card | border | 1px solid var(--border-soft) |
|
||||
| article.card | border-radius | var(--radius-sm) |
|
||||
| article.card | padding | "1.35rem 1.15rem" |
|
||||
| article.card | box-shadow | none |
|
||||
| article.card | transition | "border-color .35s ease, box-shadow .35s ease, transform .35s ease" |
|
||||
| article.card:hover | transform | "translateY(-3px)" |
|
||||
| article.card:hover | box-shadow | var(--shadow-card) |
|
||||
| article.card:hover | border-color | var(--gold-dim) |
|
||||
| .site-form | background | var(--glass) |
|
||||
| .site-form | border | 1px solid var(--border) |
|
||||
| .site-form | border-radius | var(--radius) |
|
||||
| .site-form | padding | "var(--space-6) var(--space-6) var(--space-7, 1.75rem)" |
|
||||
| .site-form | margin | "0 0 var(--space-6)" |
|
||||
| .site-form | max-width | "100%" |
|
||||
| .site-form | width | "100%" |
|
||||
| .site-form | box-shadow | var(--shadow) |
|
||||
| .site-form | backdrop-filter | blur(16px) |
|
||||
| .site-form | -webkit-backdrop-filter | blur(16px) |
|
||||
| .site-form .meta | display | none |
|
||||
| .site-form form | display | grid |
|
||||
| .site-form form | grid-template-columns | "minmax(0, 1fr) minmax(0, 1fr)" |
|
||||
| .site-form form | column-gap | var(--space-5) |
|
||||
| .site-form form | row-gap | var(--space-5) |
|
||||
| .site-form form | gap | var(--space-5) |
|
||||
| .site-form form | margin | "0" |
|
||||
| .site-form form | width | "100%" |
|
||||
| .site-form form | max-width | "100%" |
|
||||
| .site-form label | display | grid |
|
||||
| .site-form label | gap | var(--space-2) |
|
||||
| .site-form label | margin | "0" |
|
||||
| .site-form label | min-width | "0" |
|
||||
| .site-form label | font-weight | "400" |
|
||||
| .site-form label | color | var(--gold) |
|
||||
| .site-form label | font-size | "0.78rem" |
|
||||
| .site-form label | letter-spacing | "0.16em" |
|
||||
| .site-form label | text-transform | uppercase |
|
||||
| .site-form label:nth-child(1) | grid-column | "1" |
|
||||
| .site-form label:nth-child(2) | grid-column | "2" |
|
||||
| .site-form label:nth-child(n+3) | grid-column | "1 / -1" |
|
||||
| .site-form .actions | grid-column | "1 / -1" |
|
||||
| .site-form input | -webkit-appearance | none |
|
||||
| .site-form textarea | -webkit-appearance | none |
|
||||
| .site-form input | appearance | none |
|
||||
| .site-form textarea | appearance | none |
|
||||
| .site-form input | box-sizing | border-box |
|
||||
| .site-form textarea | box-sizing | border-box |
|
||||
| .site-form input | display | block |
|
||||
| .site-form textarea | display | block |
|
||||
| .site-form input | width | "100%" |
|
||||
| .site-form textarea | width | "100%" |
|
||||
| .site-form input | height | "2.75rem" |
|
||||
| .site-form textarea | min-height | "10rem" |
|
||||
| .site-form label:nth-child(4) textarea | min-height | "14rem" |
|
||||
| .site-form textarea | resize | vertical |
|
||||
| .site-form input | padding | "0 0.9rem" |
|
||||
| .site-form textarea | padding | "0.75rem 0.9rem" |
|
||||
| .site-form input | border | 1px solid var(--border) |
|
||||
| .site-form textarea | border | 1px solid var(--border) |
|
||||
| .site-form input | border-radius | var(--radius-sm) |
|
||||
| .site-form textarea | border-radius | var(--radius-sm) |
|
||||
| .site-form input | background | "rgba(0,0,0,.4)" |
|
||||
| .site-form textarea | background | "rgba(0,0,0,.4)" |
|
||||
| .site-form input | color | var(--paper) |
|
||||
| .site-form textarea | color | var(--paper) |
|
||||
| .site-form input | font | inherit |
|
||||
| .site-form textarea | font | inherit |
|
||||
| .site-form input | font-size | "0.95rem" |
|
||||
| .site-form textarea | font-size | "0.95rem" |
|
||||
| .site-form input | line-height | "1.4" |
|
||||
| .site-form textarea | line-height | "1.65" |
|
||||
| .site-form input | transition | "border-color .2s ease, box-shadow .2s ease" |
|
||||
| .site-form textarea | transition | "border-color .2s ease, box-shadow .2s ease" |
|
||||
| .site-form input:hover | border-color | var(--gold-dim) |
|
||||
| .site-form textarea:hover | border-color | var(--gold-dim) |
|
||||
| .site-form input:focus | outline | none |
|
||||
| .site-form textarea:focus | outline | none |
|
||||
| .site-form input:focus | border-color | var(--gold) |
|
||||
| .site-form textarea:focus | border-color | var(--gold) |
|
||||
| .site-form input:focus | box-shadow | var(--ring) |
|
||||
| .site-form textarea:focus | box-shadow | var(--ring) |
|
||||
| .site-form input[readonly] | background | "rgba(0,0,0,.25)" |
|
||||
| .site-form input[readonly] | color | var(--paper-faint) |
|
||||
| .site-form .err | color | var(--danger) |
|
||||
| .site-form .err | font-size | "0.8rem" |
|
||||
| .site-form .err | font-weight | "500" |
|
||||
| .site-form .err | letter-spacing | "0.04em" |
|
||||
| .site-form .actions | display | flex |
|
||||
| .site-form .actions | align-items | center |
|
||||
| .site-form .actions | gap | var(--space-4) |
|
||||
| .site-form .actions | margin-top | var(--space-2) |
|
||||
| .site-form .actions | flex-wrap | wrap |
|
||||
| .site-form button | -webkit-appearance | none |
|
||||
| .site-form button | appearance | none |
|
||||
| .site-form button | height | "2.75rem" |
|
||||
| .site-form button | padding | "0 1.35rem" |
|
||||
| .site-form button | background | "linear-gradient(135deg, #f5e6c8, var(--gold))" |
|
||||
| .site-form button | color | var(--ink) |
|
||||
| .site-form button | border | "0" |
|
||||
| .site-form button | border-radius | 999px |
|
||||
| .site-form button | font-weight | "600" |
|
||||
| .site-form button | font-size | "0.85rem" |
|
||||
| .site-form button | letter-spacing | "0.12em" |
|
||||
| .site-form button | cursor | pointer |
|
||||
| .site-form button | box-shadow | "0 8px 28px rgba(212,175,55,.28)" |
|
||||
| .site-form button | transition | "transform .2s ease, box-shadow .2s ease, filter .2s ease" |
|
||||
| .site-form button:hover | filter | brightness(1.06) |
|
||||
| .site-form button:hover | transform | "translateY(-1px)" |
|
||||
| .site-form button:hover | box-shadow | "0 12px 36px rgba(212,175,55,.4)" |
|
||||
| .site-form .actions a | color | var(--paper-faint) |
|
||||
| .site-form .actions a | font-weight | "400" |
|
||||
| .site-form .actions a | text-decoration | none |
|
||||
| .site-form .actions a | font-size | "0.85rem" |
|
||||
| .site-form .actions a | letter-spacing | "0.08em" |
|
||||
| .site-form .actions a:hover | color | var(--gold) |
|
||||
| .flash.err | color | var(--danger) |
|
||||
| .flash.err | font-weight | "500" |
|
||||
|
||||
*`widgets`*
|
||||
|
||||
## css
|
||||
|
||||
**v = > vars**
|
||||
**m = > motion**
|
||||
**l = > layout**
|
||||
**r = > responsive**
|
||||
**c = > chrome**
|
||||
**w = > widgets**
|
||||
**css_v = > web.make_style name="vars" table=v**
|
||||
**css_m = > web.make_style name="motion" table=m**
|
||||
**css_l = > web.make_style name="layout" table=l**
|
||||
**css_r = > web.make_style name="responsive" table=r**
|
||||
**css_c = > web.make_style name="chrome" table=c**
|
||||
**css_w = > web.make_style name="widgets" table=w**
|
||||
|
||||
`parts` =
|
||||
|
||||
| css |
|
||||
|-----|
|
||||
| `css_v` |
|
||||
| `css_m` |
|
||||
| `css_l` |
|
||||
| `css_r` |
|
||||
| `css_c` |
|
||||
| `css_w` |
|
||||
|
||||
**out = > text.str_join xs=`parts` sep=""**
|
||||
*out*
|
||||
@@ -0,0 +1,40 @@
|
||||
# Demo walkthrough (`examples/web-site`)
|
||||
|
||||
Aligned with The Web Conference **Demo** expectations: implemented system,
|
||||
**hands-on** interaction, clear venue script, reproducible from the repo.
|
||||
|
||||
## Run
|
||||
|
||||
```bash
|
||||
./scripts/build-web-plugin.sh
|
||||
marqdo run examples/web-site/index.mq.md
|
||||
```
|
||||
|
||||
Open http://127.0.0.1:18081/
|
||||
|
||||
## Venue script (≈3 minutes)
|
||||
|
||||
| Step | Action | What reviewers should notice |
|
||||
|------|--------|------------------------------|
|
||||
| 1 | Home | Claim badges + steps; **8 seed cards** with summaries |
|
||||
| 2 | Click a card | `/post/{slug}` detail from the same table (`detail=True`) |
|
||||
| 3 | Open `index.mq.md` beside the browser | Narrative = program; field/rule/route/intro tables |
|
||||
| 4 | `/new` empty title → submit | Server validation from **rule table** (no author JS) |
|
||||
| 5 | `/new` valid title+slug → submit | Row appears on Home and Admin |
|
||||
| 6 | Top-nav **Login** (`admin` / `demo`) → **Admin** | Session gate; desk shell + create form |
|
||||
| 7 | Terminal check | `find examples/web-site \( -name '*.js' -o -name '*.css' \)` → **0** |
|
||||
|
||||
## Authoring contract
|
||||
|
||||
| Surface | Source |
|
||||
|---------|--------|
|
||||
| Routes / forms / admin | GFM tables in `index.mq.md` |
|
||||
| Styles | `styles/shell.mq.md` → `web.make_style` (ink / wine / gold; `shell_css=off`) |
|
||||
| Intro | `| front | back | style |` → `page.compose_intro` (same bind as main) |
|
||||
| Fonts | `page.head` table → Google Fonts (Noto Serif SC + Ma Shan Zheng) |
|
||||
| Author `.js` / `.css` | **None** |
|
||||
|
||||
## Video
|
||||
|
||||
Same beats as above; English captions preferred. See thesis
|
||||
`www-2027-demo/VIDEO.md` for length / upload tips.
|
||||
@@ -1,10 +1,27 @@
|
||||
# examples/web-site
|
||||
|
||||
Canonical English sample for `ext/web` (design §4).
|
||||
Canonical **English** sample for `ext/web` — WWW Demo walkthrough site.
|
||||
|
||||
**Hands-on script:** [DEMO.md](./DEMO.md)
|
||||
|
||||
## Authoring rules (checkable)
|
||||
|
||||
| Surface | How it is authored |
|
||||
|---------|-------------------|
|
||||
| Routes / forms / admin | GFM tables + class methods |
|
||||
| Look-and-feel | Host shell CSS + **style tables** |
|
||||
| Author business JavaScript | **none** |
|
||||
| Author hand-written `.css` | **none** |
|
||||
|
||||
```bash
|
||||
cargo build -p marqdo_plugin_web
|
||||
cargo run -- examples/web-site/index.mq.md
|
||||
marqdo run examples/web-site/index.mq.md
|
||||
```
|
||||
|
||||
Then open http://127.0.0.1:18081/ — `/about`, `/new` (form in page slot), `/admin`, `/static/site.css`.
|
||||
http://127.0.0.1:18081/ — `/about`, `/new` (validation), `/admin` (list + create).
|
||||
|
||||
```bash
|
||||
find examples/web-site \( -name '*.js' -o -name '*.css' \) | wc -l # 0
|
||||
```
|
||||
|
||||
Chinese twin: [`examples/web-site-zh/`](../web-site-zh/).
|
||||
@@ -0,0 +1,29 @@
|
||||
---
|
||||
title: components/desk
|
||||
description: Admin desk chrome — brand reads Admin; no public side rail.
|
||||
---
|
||||
|
||||
## nav
|
||||
|
||||
`nav` =
|
||||
|
||||
| front | back | style | media | when |
|
||||
|-------|------|-------|-------|------|
|
||||
| Admin | /admin | | | |
|
||||
| Site | / | | | |
|
||||
| New | /new | | | |
|
||||
| Logout | /admin/logout | | | auth |
|
||||
|
||||
*`nav`*
|
||||
|
||||
## foot
|
||||
|
||||
`foot` =
|
||||
|
||||
| front | back | style |
|
||||
|-------|------|-------|
|
||||
| Site | / | |
|
||||
| Admin | /admin | |
|
||||
| Logout | /admin/logout | |
|
||||
|
||||
*`foot`*
|
||||
@@ -2,8 +2,10 @@
|
||||
|
||||
`foot` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| Marqdo | https://github.com | |
|
||||
| front | back | style |
|
||||
|-------|------|-------|
|
||||
| Marqdo | https://www.marqdo.com/ | |
|
||||
| Source | https://github.com/cflmy/marqdo | |
|
||||
|
||||
*`foot`*
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
## nav
|
||||
|
||||
Static top links for the shell.
|
||||
Brand first, then demo routes. Guest sees **Login**; signed-in sees **Admin** + **Logout**.
|
||||
|
||||
`nav` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| Home | / | |
|
||||
| About | /about | |
|
||||
| New | /new | |
|
||||
| Admin | /admin | |
|
||||
| front | back | style | media | when |
|
||||
|-------|------|-------|-------|------|
|
||||
| Marqdo | / | | | |
|
||||
| About | /about | | | |
|
||||
| New | /new | | | |
|
||||
| Login | /login | | | guest |
|
||||
| Admin | /admin | | | auth |
|
||||
| Logout | /admin/logout | | | auth |
|
||||
|
||||
*`nav`*
|
||||
@@ -1,10 +1,15 @@
|
||||
## side
|
||||
|
||||
Hands-on demo checklist (links only — no JS).
|
||||
|
||||
`side` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| Notes | / | |
|
||||
| Docs | https://github.com | |
|
||||
| front | back | style | media | when |
|
||||
|-------|------|-------|-------|------|
|
||||
| 1. Home | / | | | |
|
||||
| 2. New form | /new | | | |
|
||||
| 3. Login | /login | | | guest |
|
||||
| 3. Admin | /admin | | | auth |
|
||||
| About | /about | | | |
|
||||
|
||||
*`side`*
|
||||
@@ -2,21 +2,31 @@
|
||||
|
||||
`fields` =
|
||||
|
||||
| 字段 | 类型 | 可空 |
|
||||
|------|------|------|
|
||||
| name | type | nullable |
|
||||
|------|------|----------|
|
||||
| id | integer | false |
|
||||
| title | text | false |
|
||||
| slug | text | false |
|
||||
| summary | text | true |
|
||||
| body | text | true |
|
||||
|
||||
*`fields`*
|
||||
|
||||
## seed
|
||||
|
||||
Longer demo rows — cards show summary; /post/{slug} shows full body (Markdown).
|
||||
|
||||
`rows` =
|
||||
|
||||
| id | title | body |
|
||||
|----|-------|------|
|
||||
| 1 | Hello Marqdo | First article from a GFM table. |
|
||||
| 2 | Code as docs | The page table is the program. |
|
||||
| id | title | slug | summary | body |
|
||||
|----|-------|------|---------|------|
|
||||
| 1 | Hello Marqdo | hello-marqdo | A runnable Markdown file is both the site docs and the deployed app — tables declare routes, forms, and styles. | "Marqdo treats an .mq.md file as an executable document. The narrative you read in the editor is the same artifact the server runs: GFM tables become schema, forms, navigation, and CSS. This demo shows that contract end-to-end — open New, trigger a rule-table validation error, then publish a row that appears on Home and Admin without any author JavaScript." |
|
||||
| 2 | Tables as the full stack | tables-full-stack | Schema, forms, routes, admin pages, and theme tokens share one tabular dialect instead of a JS/CSS split. | "Most stacks split concerns across languages: SQL or an ORM for data, a form library for input, a router for URLs, and a stylesheet for look. Marqdo collapses those surfaces into GFM tables with the same geometry authors already use for documentation. Field tables, rule tables, bind tables, and style tables are not metaphors — they are the runtime. The result is a site you can skim as prose and execute as a program." |
|
||||
| 3 | Zero author JS and CSS | zero-author-js-css | Business logic stays in Markdown; appearance is style tables plus the host shell — no hand-written business JS or author .css. | "Author business JavaScript is zero by construction: validation runs from rule tables on the server, and list/detail pages are bind tables rendered by the host. Author .css files are also unnecessary when theme tokens live in property/value tables assembled by make_style. The demo turns shell_css=off so only those declared styles paint the page — proving the claim for a conference audience." |
|
||||
| 4 | Card to detail in one bind | card-to-detail | List cards bind href to slug; a /post/{slug} route plus detail=True opens the full article. | "Click any card on the home page. The list bind exposes href from articles.slug, and link_prefix prefixes /post/. The detail page reuses the same table with a query slug = {slug} and page.detail so the first row renders as a full article — title and Markdown body — instead of a card grid. That is the same pattern used by larger Marqdo sites such as 求道量子." |
|
||||
| 5 | Style tables not stylesheets | style-tables | Named style tables (kicker, intro_title, card_title) bind through the third column of every layout table. | "Intro, cards, and chrome all use the bind shape front/back/style. The style column points at a named property table in styles/shell.mq.md. When compose_intro or compose_main runs, those tables become CSS classes on the page. Authors never open a .css file to tweak the demo look — they edit readable Markdown tables that stay next to the copy they style." |
|
||||
| 6 | Forms from field and rule tables | forms-from-tables | Empty title on New fails from the rule table; a valid submit inserts a row shared with Admin. | "The New and Admin pages mount the same form object: a field table declares labels and types, a rule table declares required and max constraints with messages. Submit with an empty title and the error is server-side, not a client script. Fill a title and slug, submit again, and the row shows up in the card grid and under Admin — one schema, two surfaces, zero author JS." |
|
||||
| 7 | Seed data is documentation | seed-is-docs | These paragraphs were written as a GFM seed table — the demo content is part of the program. | "Seed rows live beside the schema in db/articles.mq.md. On first boot the host inserts them when the articles table is empty. That means the demo narrative is versioned with the code: longer summaries for cards, fuller bodies for detail pages, and slugs that make deep links stable. Reviewers can open the seed table and see exactly what the venue site will show." |
|
||||
| 8 | Why this Demo matters | why-demo-matters | WWW Demo needs a hands-on artifact reviewers can run, click, and compare to source in minutes. | "A Demo track asks for an implemented system, not a slide-only pitch. This sample is intentionally small: one SQLite table, a handful of routes, and a literary shell — yet it covers the paper claim (tables as the full stack) with a three-step script. Clone the repo, run the web-site sample, click a card, break a form, then open index.mq.md beside the browser. That loop is the publication." |
|
||||
|
||||
*`rows`*
|
||||
+170
-22
@@ -1,73 +1,221 @@
|
||||
---
|
||||
title: web-site
|
||||
description: Home + /about + /new (form in page slot) + admin.
|
||||
description: >-
|
||||
WWW Demo sample — GFM tables for shell, schema, forms, styles, and admin.
|
||||
Author business JavaScript: none. Author hand-written .css: none.
|
||||
import web:ext/web/web.mq.md
|
||||
import shell:styles/shell.mq.md
|
||||
import nav:components/nav.mq.md
|
||||
import side:components/side.mq.md
|
||||
import foot:components/foot.mq.md
|
||||
import desk:components/desk.mq.md
|
||||
import articles:db/articles.mq.md
|
||||
import db:db/index.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
This Markdown file is both the **site documentation** and the **running app**.
|
||||
Routes, forms, validation, admin pages, and look-and-feel are **GFM tables** —
|
||||
no hand-written business JavaScript and no author .css file.
|
||||
|
||||
`home` =
|
||||
|
||||
| 组件 | 样式 |
|
||||
|------|------|
|
||||
| src | style |
|
||||
|-----|-------|
|
||||
| nav.`nav` | shell.`topnav` |
|
||||
| side.`side` | shell.`side_panel` |
|
||||
| foot.`foot` | |
|
||||
| foot.`foot` | shell.`footer` |
|
||||
|
||||
Main content is not a reusable component, so it is authored here.
|
||||
Public shell (nav + side + foot). Desk shell drops the public side rail.
|
||||
|
||||
`desk_shell` =
|
||||
|
||||
| src | style |
|
||||
|-----|-------|
|
||||
| desk.`nav` | shell.`topnav` |
|
||||
| desk.`foot` | shell.`footer` |
|
||||
|
||||
List cards: summary + slug link (click through to detail).
|
||||
|
||||
`index` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| front | back | style |
|
||||
|-------|------|-------|
|
||||
| title | articles.`articles`.title | shell.`card_title` |
|
||||
| body | articles.`articles`.body | shell.`card_body` |
|
||||
| body | articles.`articles`.summary | shell.`card_body` |
|
||||
| href | articles.`articles`.slug | |
|
||||
|
||||
Article create form (design §5.5): field table + rules table.
|
||||
Detail bind for /post/{slug} (full Markdown body).
|
||||
|
||||
`detail` =
|
||||
|
||||
| front | back | style |
|
||||
|-------|------|-------|
|
||||
| title | articles.`articles`.title | shell.`card_title` |
|
||||
| body | articles.`articles`.body | |
|
||||
|
||||
`by_slug` =
|
||||
|
||||
| field | op | value |
|
||||
|-------|-----|-------|
|
||||
| slug | = | {slug} |
|
||||
|
||||
Home intro — same bind shape as main (front / back / style).
|
||||
|
||||
`home_intro` =
|
||||
|
||||
| front | back | style |
|
||||
|-------|------|-------|
|
||||
| kicker | WWW demo · tables as the full stack | shell.`kicker` |
|
||||
| title | Marqdo | shell.`intro_title` |
|
||||
| lede | "One executable Markdown artifact declares routes, forms, admin pages, and styles — no hand-written business JavaScript, no author .css. Click a card for the full article, then try the three steps below." | shell.`lede` |
|
||||
| claim | 0 author JS | shell.`claim` |
|
||||
| claim | 0 author .css | shell.`claim` |
|
||||
| claim | GFM tables | shell.`claim` |
|
||||
| step | "Click any card — /post/{slug} opens the detail page from the same articles table." | shell.`step` |
|
||||
| step | "Open [New](/new) and submit with an empty title (validation from a rule table)." | shell.`step` |
|
||||
| step | "Open top-nav **Login** (admin / demo), then **Admin** — gated desk with create form + list." | shell.`step` |
|
||||
|
||||
`about_intro` =
|
||||
|
||||
| front | back | style |
|
||||
|-------|------|-------|
|
||||
| kicker | about | shell.`kicker` |
|
||||
| title | About | shell.`intro_title` |
|
||||
| lede | "Documentation and the deployed site stay one .mq.md artifact. Layout and theme are GFM style tables in styles/shell.mq.md — structure without hand-written CSS or business JavaScript." | shell.`lede` |
|
||||
| claim | docs = program | shell.`claim` |
|
||||
| claim | server-side rules | shell.`claim` |
|
||||
| claim | hands-on | shell.`claim` |
|
||||
|
||||
`new_intro` =
|
||||
|
||||
| front | back | style |
|
||||
|-------|------|-------|
|
||||
| kicker | form · try validation | shell.`kicker` |
|
||||
| title | New article | shell.`intro_title` |
|
||||
| lede | "Leave Title empty and submit — the error comes from the rule table, not client JavaScript. Then fill title, slug, and summary to create a row shared with Admin and the card grid." | shell.`lede` |
|
||||
|
||||
`admin_intro` =
|
||||
|
||||
| front | back | style |
|
||||
|-------|------|-------|
|
||||
| kicker | desk · you are in admin | shell.`kicker` |
|
||||
| title | Admin | shell.`intro_title` |
|
||||
| lede | "This is the management desk (login required): same articles schema as the public site, assembled as list + create form — not a separate SPA. Use Site in the topnav to return, or Logout to end the session." | shell.`lede` |
|
||||
| claim | login-gated | shell.`claim` |
|
||||
| claim | table-declared | shell.`claim` |
|
||||
| claim | "create + list" | shell.`claim` |
|
||||
|
||||
`post_intro` =
|
||||
|
||||
| front | back | style |
|
||||
|-------|------|-------|
|
||||
| kicker | article · table-bound detail | shell.`kicker` |
|
||||
|
||||
Article create form: field table + rules table (server-side validation).
|
||||
|
||||
`article_fields` =
|
||||
|
||||
| 字段 | 标签 | 类型 | 必填 | 默认 |
|
||||
|------|------|------|------|------|
|
||||
| name | label | type | required | default |
|
||||
|------|-------|------|----------|---------|
|
||||
| title | Title | text | true | |
|
||||
| slug | Slug | text | true | |
|
||||
| summary | Summary | textarea | false | |
|
||||
| body | Body | textarea | false | |
|
||||
|
||||
`article_rules` =
|
||||
|
||||
| 字段 | 规则 | 消息 |
|
||||
|------|------|------|
|
||||
| field | rule | message |
|
||||
|-------|------|---------|
|
||||
| title | required | Title is required |
|
||||
| title | max:120 | Title is too long |
|
||||
| slug | required | Slug is required |
|
||||
| slug | max:80 | Slug is too long |
|
||||
| summary | max:500 | Summary is too long |
|
||||
| body | max:8000 | Body is too long |
|
||||
|
||||
SEO / Open Graph for the home page (still a table).
|
||||
|
||||
`home_meta` =
|
||||
|
||||
| key | value |
|
||||
|-----|-------|
|
||||
| description | Tables as the full stack — Marqdo Web demo with zero author business JavaScript. |
|
||||
| og:type | website |
|
||||
| og:title | Marqdo Web Site |
|
||||
|
||||
Neat CJK sans for body; Great Vibes for English display.
|
||||
|
||||
`fonts` =
|
||||
|
||||
| rel | href | crossorigin |
|
||||
|-----|------|-------------|
|
||||
| preconnect | https://fonts.googleapis.com | |
|
||||
| preconnect | https://fonts.gstatic.com | anonymous |
|
||||
| stylesheet | https://fonts.googleapis.com/css2?family=Great+Vibes&family=Noto+Sans+SC:wght@300;400;500;700&family=Noto+Serif+SC:wght@400;600&display=swap | |
|
||||
|
||||
**store = > db.open**
|
||||
**page = > web.page title="Marqdo Web Site" intro="<h1>Web Site</h1><p>Tables + class methods.</p>"**
|
||||
**site_css = > shell.css**
|
||||
|
||||
**page = > web.page title="Marqdo Web Site" shell_css="off"**
|
||||
**page = > page.compose_intro intro=home_intro**
|
||||
**page = > page.meta meta=home_meta**
|
||||
**page = > page.head table=fonts**
|
||||
**page = > page.css css=site_css**
|
||||
**page = > page.compose_components components=home**
|
||||
**page = > page.compose_main main=index**
|
||||
**page = > page.link_prefix prefix="/post/"**
|
||||
|
||||
About page: same shell, different intro (no main bind).
|
||||
|
||||
**about = > web.page title="About" intro="<h1>About</h1><p>Marqdo web = tables + class methods.</p>"**
|
||||
**about = > web.page title="About · Marqdo Web" shell_css="off"**
|
||||
**about = > about.compose_intro intro=about_intro**
|
||||
**about = > about.head table=fonts**
|
||||
**about = > about.css css=site_css**
|
||||
**about = > about.compose_components components=home**
|
||||
|
||||
**article_form = > web.form table="articles" action="insert"**
|
||||
**article_form = > article_form.fields fields=article_fields**
|
||||
**article_form = > article_form.rules rules=article_rules**
|
||||
|
||||
New article: form embedded in the page main slot (design §5.5.4).
|
||||
|
||||
**new = > web.page title="New article" intro="<h1>New article</h1><p>Form lives in the main slot.</p>"**
|
||||
**new = > web.page title="New article · Marqdo Web" shell_css="off"**
|
||||
**new = > new.compose_intro intro=new_intro**
|
||||
**new = > new.head table=fonts**
|
||||
**new = > new.css css=site_css**
|
||||
**new = > new.compose_components components=home**
|
||||
**new = > new.compose_form id="article" form=article_form**
|
||||
|
||||
**app = > web.app page=page db=store admin=True host="127.0.0.1" port=18081**
|
||||
**desk = > web.page title="Admin · Marqdo Web" shell_css="off"**
|
||||
**desk = > desk.chrome body_class="is-desk"**
|
||||
**desk = > desk.compose_intro intro=admin_intro**
|
||||
**desk = > desk.head table=fonts**
|
||||
**desk = > desk.css css=site_css**
|
||||
**desk = > desk.compose_components components=desk_shell**
|
||||
**desk = > desk.compose_form id="article" form=article_form**
|
||||
**desk = > desk.compose_main main=index**
|
||||
**desk = > desk.link_prefix prefix="/post/"**
|
||||
|
||||
**post = > web.page title="Article · Marqdo Web" shell_css="off"**
|
||||
**post = > post.compose_intro intro=post_intro**
|
||||
**post = > post.head table=fonts**
|
||||
**post = > post.css css=site_css**
|
||||
**post = > post.compose_components components=home**
|
||||
**post = > post.compose_main main=detail**
|
||||
**post = > post.query query=by_slug**
|
||||
**post = > post.detail detail=True**
|
||||
|
||||
Demo credentials (table-declared users — host session auth, no author JS).
|
||||
|
||||
`admins` =
|
||||
|
||||
| username | password | role |
|
||||
|----------|----------|------|
|
||||
| admin | demo | admin |
|
||||
|
||||
**app = > web.app page=page db=store admin=False host="127.0.0.1" port=18081 shell_css="off" login_redirect="/admin" logout_redirect="/"**
|
||||
**app = > app.route path="/about" page=about**
|
||||
**app = > app.route path="/new" page=new**
|
||||
**app = > app.static dir="public" mount="/static"**
|
||||
**app = > app.route path="/admin" page=desk**
|
||||
**app = > app.route path="/post/{slug}" page=post**
|
||||
**app = > app.auth users=admins session_ttl=3600 login_path="/login" login_redirect="/admin" logout_redirect="/"**
|
||||
**app = > app.gate path="/admin" roles="admin" match="prefix" on_deny="redirect" exclude="/login"**
|
||||
> `app`.listen
|
||||
@@ -1,5 +0,0 @@
|
||||
/* Optional site stylesheet — served at /static/site.css */
|
||||
body.site-hint::before {
|
||||
content: "static ok";
|
||||
display: none;
|
||||
}
|
||||
@@ -1,11 +1,233 @@
|
||||
---
|
||||
title: styles/shell
|
||||
description: >-
|
||||
Literary dark theme for examples/web-site — ink / wine / gold after the
|
||||
anlian.cyou Zhang Ailing topic. GFM tables only; no author .css.
|
||||
import web:ext/web/web.mq.md
|
||||
import text:lib/text.mq.md
|
||||
---
|
||||
|
||||
Authors style the site with **GFM tables** only. App pages use `shell_css=off`
|
||||
so host defaults do not fight this theme. Palette mirrors
|
||||
[海上花开](https://www.anlian.cyou/topics/author-zhangailing/): night ink,
|
||||
wine, cold gold, serif display.
|
||||
|
||||
## vars
|
||||
|
||||
`vars` =
|
||||
|
||||
| selector | property | value |
|
||||
|----------|----------|-------|
|
||||
| :root | --ink | #0a0809 |
|
||||
| :root | --ink-lift | #141012 |
|
||||
| :root | --wine | #6b1e3a |
|
||||
| :root | --wine-soft | rgba(107,30,58,0.35) |
|
||||
| :root | --gold | #d4af37 |
|
||||
| :root | --gold-dim | rgba(212,175,55,0.45) |
|
||||
| :root | --gold-soft | rgba(212,175,55,0.12) |
|
||||
| :root | --paper | rgba(255,248,240,0.92) |
|
||||
| :root | --paper-dim | rgba(255,248,240,0.72) |
|
||||
| :root | --paper-faint | rgba(255,248,240,0.48) |
|
||||
| :root | --glass | rgba(20,12,18,0.72) |
|
||||
| :root | --glass-strong | rgba(20,12,18,0.88) |
|
||||
| :root | --border | rgba(212,175,55,0.22) |
|
||||
| :root | --border-soft | rgba(212,175,55,0.12) |
|
||||
| :root | --danger | #e8a0a8 |
|
||||
| :root | --radius | 4px |
|
||||
| :root | --radius-sm | 2px |
|
||||
| :root | --space-2 | 8px |
|
||||
| :root | --space-3 | 12px |
|
||||
| :root | --space-4 | 16px |
|
||||
| :root | --space-5 | 20px |
|
||||
| :root | --space-6 | 24px |
|
||||
| :root | --space-8 | 32px |
|
||||
| :root | --text | 16px |
|
||||
| :root | --leading | "1.75" |
|
||||
| :root | --shadow | "0 24px 80px rgba(0,0,0,.55), inset 0 1px 0 rgba(255,255,255,.06)" |
|
||||
| :root | --shadow-card | "0 12px 40px rgba(107,30,58,.35)" |
|
||||
| :root | --ring | "0 0 0 2px rgba(212,175,55,.35)" |
|
||||
| :root | --serif | "'Noto Serif SC', 'Source Serif 4', Georgia, serif" |
|
||||
| :root | --sans | "'Noto Sans SC', 'IBM Plex Sans', system-ui, sans-serif" |
|
||||
| :root | --display | "'Great Vibes', 'Allura', cursive" |
|
||||
| :root | --mono | "ui-monospace, SFMono-Regular, Menlo, Consolas, monospace" |
|
||||
| ::selection | background | rgba(212,175,55,0.35) |
|
||||
| ::selection | color | var(--paper) |
|
||||
|
||||
*`vars`*
|
||||
|
||||
## motion
|
||||
|
||||
`motion` =
|
||||
|
||||
| selector | property | value |
|
||||
|----------|----------|-------|
|
||||
| @keyframes rise 0% | opacity | "0" |
|
||||
| @keyframes rise 0% | transform | translateY(14px) |
|
||||
| @keyframes rise 100% | opacity | "1" |
|
||||
| @keyframes rise 100% | transform | translateY(0) |
|
||||
| @keyframes float 0% | transform | translateY(0) |
|
||||
| @keyframes float 0% | opacity | "0.7" |
|
||||
| @keyframes float 50% | transform | translateY(6px) |
|
||||
| @keyframes float 50% | opacity | "1" |
|
||||
| @keyframes float 100% | transform | translateY(0) |
|
||||
| @keyframes float 100% | opacity | "0.7" |
|
||||
| @keyframes goldPulse 0% | text-shadow | "0 0 24px rgba(212,175,55,.2)" |
|
||||
| @keyframes goldPulse 50% | text-shadow | "0 0 48px rgba(212,175,55,.45)" |
|
||||
| @keyframes goldPulse 100% | text-shadow | "0 0 24px rgba(212,175,55,.2)" |
|
||||
| @keyframes particleDrift 0% | transform | translate3d(0,0,0) |
|
||||
| @keyframes particleDrift 50% | transform | translate3d(-2.5vw, 1.5vh, 0) |
|
||||
| @keyframes particleDrift 100% | transform | translate3d(0,0,0) |
|
||||
| @keyframes particleDrift2 0% | transform | translate3d(0,0,0) |
|
||||
| @keyframes particleDrift2 50% | transform | translate3d(2vw, -2vh, 0) |
|
||||
| @keyframes particleDrift2 100% | transform | translate3d(0,0,0) |
|
||||
| @keyframes nebulaPulse 0% | opacity | "0.55" |
|
||||
| @keyframes nebulaPulse 50% | opacity | "0.9" |
|
||||
| @keyframes nebulaPulse 100% | opacity | "0.55" |
|
||||
|
||||
*`motion`*
|
||||
|
||||
## layout
|
||||
|
||||
`layout` =
|
||||
|
||||
| selector | property | value |
|
||||
|----------|----------|-------|
|
||||
| * | box-sizing | border-box |
|
||||
| html | scroll-behavior | smooth |
|
||||
| html | -webkit-text-size-adjust | 100% |
|
||||
| body | margin | "0" |
|
||||
| body | min-height | 100vh |
|
||||
| body | font-family | var(--sans) |
|
||||
| body | font-weight | "400" |
|
||||
| body | font-size | var(--text) |
|
||||
| body | line-height | var(--leading) |
|
||||
| body | color | var(--paper) |
|
||||
| body | background | var(--ink) |
|
||||
| body | background-image | "radial-gradient(ellipse 90% 55% at 50% -15%, rgba(107,30,58,.5), transparent 58%), radial-gradient(ellipse 55% 45% at 92% 75%, rgba(212,175,55,.14), transparent 55%), radial-gradient(ellipse 40% 35% at 8% 70%, rgba(107,30,58,.22), transparent 60%), linear-gradient(180deg, #0a0809 0%, #120c10 45%, #0a0809 100%)" |
|
||||
| body | background-attachment | fixed |
|
||||
| body | display | grid |
|
||||
| body | grid-template-rows | "auto 1fr auto" |
|
||||
| body | -webkit-font-smoothing | antialiased |
|
||||
| body | position | relative |
|
||||
| body | overflow-x | hidden |
|
||||
| body::before | content | '""' |
|
||||
| body::before | position | fixed |
|
||||
| body::before | inset | "0" |
|
||||
| body::before | z-index | "1" |
|
||||
| body::before | pointer-events | none |
|
||||
| body::before | opacity | "0.1" |
|
||||
| body::before | background-image | "url(\"data:image/svg+xml,%3Csvg viewBox='0 0 256 256' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.9' numOctaves='4' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)'/%3E%3C/svg%3E\")" |
|
||||
| html::before | content | '""' |
|
||||
| html::before | position | fixed |
|
||||
| html::before | inset | "0" |
|
||||
| html::before | z-index | "0" |
|
||||
| html::before | pointer-events | none |
|
||||
| html::before | background-image | "radial-gradient(ellipse 50% 40% at 15% 30%, rgba(107,30,58,.35), transparent 70%), radial-gradient(ellipse 45% 35% at 85% 60%, rgba(212,175,55,.12), transparent 65%), radial-gradient(ellipse 40% 30% at 50% 90%, rgba(107,30,58,.25), transparent 70%)" |
|
||||
| html::before | animation | "nebulaPulse 12s ease-in-out infinite" |
|
||||
| body::after | content | '""' |
|
||||
| body::after | position | fixed |
|
||||
| body::after | top | "0" |
|
||||
| body::after | left | "0" |
|
||||
| body::after | width | "2px" |
|
||||
| body::after | height | "2px" |
|
||||
| body::after | z-index | "2" |
|
||||
| body::after | pointer-events | none |
|
||||
| body::after | border-radius | 50% |
|
||||
| body::after | background | transparent |
|
||||
| body::after | box-shadow | "82vw 15vh 0px 0px rgba(212,175,55,0.55),29vw 18vh 0px 1px rgba(212,175,55,0.25),95vw 70vh 1px 0px rgba(212,175,55,0.55),4vw 12vh 0px 1px rgba(212,175,55,0.35),78vw 4vh 0px 1px rgba(245,230,200,0.5),84vw 90vh 1px 0px rgba(245,230,200,0.5),58vw 76vh 0px 0px rgba(255,248,240,0.4),90vw 55vh 0px 0px rgba(255,248,240,0.4),28vw 98vh 0px 0px rgba(255,248,240,0.4),49vw 13vh 0px 1px rgba(255,248,240,0.4),34vw 6vh 1px 1px rgba(212,175,55,0.25),16vw 49vh 0px 1px rgba(212,175,55,0.55),80vw 47vh 0px 1px rgba(245,230,200,0.5),9vw 6vh 0px 0px rgba(212,175,55,0.25),11vw 30vh 1px 0px rgba(212,175,55,0.55),59vw 82vh 0px 0px rgba(255,248,240,0.4),46vw 27vh 0px 1px rgba(212,175,55,0.25),88vw 83vh 0px 1px rgba(212,175,55,0.55),94vw 32vh 1px 0px rgba(212,175,55,0.35),35vw 82vh 0px 1px rgba(212,175,55,0.25),42vw 99vh 0px 0px rgba(212,175,55,0.55),41vw 52vh 0px 0px rgba(255,248,240,0.4),73vw 92vh 0px 1px rgba(255,248,240,0.4),64vw 51vh 1px 0px rgba(212,175,55,0.25),34vw 18vh 0px 1px rgba(212,175,55,0.35),75vw 55vh 1px 0px rgba(245,230,200,0.5),29vw 18vh 1px 0px rgba(245,230,200,0.5),97vw 7vh 0px 1px rgba(212,175,55,0.55),21vw 88vh 0px 0px rgba(107,30,58,0.45),49vw 77vh 0px 1px rgba(107,30,58,0.45),2vw 88vh 0px 1px rgba(212,175,55,0.25),69vw 97vh 0px 0px rgba(255,248,240,0.4),38vw 56vh 1px 0px rgba(212,175,55,0.35),93vw 93vh 0px 1px rgba(255,248,240,0.4),14vw 81vh 0px 0px rgba(255,248,240,0.4),48vw 98vh 0px 1px rgba(212,175,55,0.35),42vw 63vh 0px 0px rgba(212,175,55,0.55),40vw 31vh 0px 1px rgba(212,175,55,0.55),11vw 11vh 1px 0px rgba(212,175,55,0.25),98vw 69vh 0px 1px rgba(212,175,55,0.35),61vw 71vh 0px 1px rgba(212,175,55,0.35),78vw 55vh 0px 1px rgba(212,175,55,0.35),40vw 52vh 0px 0px rgba(212,175,55,0.25),67vw 58vh 0px 0px rgba(212,175,55,0.55),9vw 44vh 0px 1px rgba(212,175,55,0.55),29vw 1vh 0px 0px rgba(212,175,55,0.55),9vw 5vh 0px 1px rgba(255,248,240,0.4),31vw 36vh 1px 0px rgba(212,175,55,0.25),70vw 17vh 1px 0px rgba(212,175,55,0.25),61vw 53vh 0px 0px rgba(212,175,55,0.35),85vw 56vh 1px 0px rgba(255,248,240,0.4),60vw 94vh 0px 0px rgba(212,175,55,0.55),52vw 94vh 0px 0px rgba(255,248,240,0.4),25vw 25vh 1px 0px rgba(245,230,200,0.5),55vw 24vh 1px 0px rgba(255,248,240,0.4),10vw 57vh 0px 0px rgba(245,230,200,0.5),84vw 70vh 0px 0px rgba(212,175,55,0.55),22vw 53vh 1px 0px rgba(107,30,58,0.45),52vw 8vh 1px 0px rgba(212,175,55,0.35),50vw 34vh 0px 0px rgba(107,30,58,0.45),90vw 94vh 1px 0px rgba(245,230,200,0.5),25vw 38vh 0px 1px rgba(212,175,55,0.35),95vw 70vh 0px 0px rgba(212,175,55,0.55),7vw 75vh 0px 0px rgba(107,30,58,0.45),66vw 11vh 0px 1px rgba(212,175,55,0.35),9vw 87vh 1px 0px rgba(212,175,55,0.35),73vw 32vh 0px 1px rgba(245,230,200,0.5),11vw 54vh 0px 0px rgba(212,175,55,0.25),27vw 86vh 0px 0px rgba(212,175,55,0.25),34vw 51vh 0px 0px rgba(212,175,55,0.35),41vw 97vh 0px 0px rgba(212,175,55,0.55),80vw 73vh 0px 1px rgba(212,175,55,0.55)" |
|
||||
| body::after | animation | "particleDrift 48s ease-in-out infinite" |
|
||||
| html::after | content | '""' |
|
||||
| html::after | position | fixed |
|
||||
| html::after | top | "0" |
|
||||
| html::after | left | "0" |
|
||||
| html::after | width | "1px" |
|
||||
| html::after | height | "1px" |
|
||||
| html::after | z-index | "2" |
|
||||
| html::after | pointer-events | none |
|
||||
| html::after | border-radius | 50% |
|
||||
| html::after | background | transparent |
|
||||
| html::after | box-shadow | "28vw 65vh 0 0 rgba(255,248,240,0.25),17vw 45vh 0 0 rgba(212,175,55,0.3),32vw 48vh 0 0 rgba(255,248,240,0.25),21vw 57vh 0 0 rgba(107,30,58,0.3),91vw 39vh 0 0 rgba(107,30,58,0.3),84vw 68vh 0 0 rgba(212,175,55,0.3),86vw 71vh 0 0 rgba(255,248,240,0.25),85vw 14vh 0 0 rgba(212,175,55,0.3),34vw 15vh 0 0 rgba(212,175,55,0.3),96vw 71vh 0 0 rgba(212,175,55,0.3),35vw 37vh 0 0 rgba(107,30,58,0.3),27vw 92vh 0 0 rgba(255,248,240,0.25),27vw 88vh 0 0 rgba(107,30,58,0.3),34vw 65vh 0 0 rgba(255,248,240,0.25),33vw 7vh 0 0 rgba(212,175,55,0.3),82vw 55vh 0 0 rgba(255,248,240,0.25),6vw 1vh 0 0 rgba(255,248,240,0.25),99vw 17vh 0 0 rgba(107,30,58,0.3),34vw 21vh 0 0 rgba(107,30,58,0.3),57vw 71vh 0 0 rgba(107,30,58,0.3),55vw 72vh 0 0 rgba(212,175,55,0.3),15vw 10vh 0 0 rgba(107,30,58,0.3),20vw 70vh 0 0 rgba(212,175,55,0.3),48vw 75vh 0 0 rgba(107,30,58,0.3),19vw 56vh 0 0 rgba(212,175,55,0.3),6vw 40vh 0 0 rgba(255,248,240,0.25),6vw 46vh 0 0 rgba(212,175,55,0.3),88vw 32vh 0 0 rgba(107,30,58,0.3),14vw 46vh 0 0 rgba(107,30,58,0.3),53vw 80vh 0 0 rgba(107,30,58,0.3),20vw 31vh 0 0 rgba(212,175,55,0.3),23vw 53vh 0 0 rgba(212,175,55,0.3),23vw 95vh 0 0 rgba(255,248,240,0.25),53vw 86vh 0 0 rgba(107,30,58,0.3),32vw 35vh 0 0 rgba(212,175,55,0.3),90vw 14vh 0 0 rgba(255,248,240,0.25),5vw 61vh 0 0 rgba(212,175,55,0.3),26vw 59vh 0 0 rgba(255,248,240,0.25),40vw 30vh 0 0 rgba(212,175,55,0.3),4vw 85vh 0 0 rgba(212,175,55,0.3),52vw 43vh 0 0 rgba(255,248,240,0.25),9vw 99vh 0 0 rgba(255,248,240,0.25),45vw 83vh 0 0 rgba(107,30,58,0.3),52vw 87vh 0 0 rgba(107,30,58,0.3),43vw 4vh 0 0 rgba(212,175,55,0.3),34vw 23vh 0 0 rgba(107,30,58,0.3),34vw 5vh 0 0 rgba(212,175,55,0.3),77vw 56vh 0 0 rgba(255,248,240,0.25)" |
|
||||
| html::after | animation | "particleDrift2 64s ease-in-out infinite" |
|
||||
| body.has-sidebar | grid-template-columns | "14rem minmax(0, 1fr)" |
|
||||
| body.has-sidebar | grid-template-areas | '"top top" "side main" "foot foot"' |
|
||||
| body.no-sidebar | grid-template-areas | '"top" "main" "foot"' |
|
||||
| body.layout-stacked | grid-template-areas | '"top" "main" "foot"' |
|
||||
| body.is-desk | grid-template-areas | '"top" "main" "foot"' |
|
||||
| header.topnav | grid-area | top |
|
||||
| aside.side | grid-area | side |
|
||||
| main.main | grid-area | main |
|
||||
| footer.foot | grid-area | foot |
|
||||
| header.topnav | position | relative |
|
||||
| header.topnav | z-index | "20" |
|
||||
| aside.side | position | relative |
|
||||
| aside.side | z-index | "10" |
|
||||
| main.main | position | relative |
|
||||
| main.main | z-index | "10" |
|
||||
| footer.foot | position | relative |
|
||||
| footer.foot | z-index | "10" |
|
||||
| main.main | width | "100%" |
|
||||
| main.main | max-width | "min(78rem, 100%)" |
|
||||
| main.main | padding | "var(--space-8) var(--space-6) 4rem" |
|
||||
| main.main | animation | "rise .8s cubic-bezier(.22,1,.36,1) both" |
|
||||
| a | color | var(--gold) |
|
||||
| a | text-decoration | none |
|
||||
| a | transition | color 0.25s ease |
|
||||
| a:hover | color | #f5e6c8 |
|
||||
| code | font-family | var(--mono) |
|
||||
| code | font-size | "0.82em" |
|
||||
| code | font-weight | "400" |
|
||||
| code | background | rgba(0,0,0,0.35) |
|
||||
| code | border | 1px solid var(--border-soft) |
|
||||
| code | padding | "0.12em 0.45em" |
|
||||
| code | border-radius | var(--radius-sm) |
|
||||
| code | color | var(--gold) |
|
||||
|
||||
*`layout`*
|
||||
|
||||
## responsive
|
||||
|
||||
`responsive` =
|
||||
|
||||
| media | selector | property | value |
|
||||
|-------|----------|----------|-------|
|
||||
| (max-width: 860px) | body.has-sidebar | grid-template-columns | 1fr |
|
||||
| (max-width: 860px) | body.has-sidebar | grid-template-areas | '"top" "main" "side" "foot"' |
|
||||
| (max-width: 860px) | aside.side | border-right | "0" |
|
||||
| (max-width: 860px) | aside.side | border-top | 1px solid var(--border-soft) |
|
||||
| (max-width: 860px) | main.main | padding | "var(--space-6) var(--space-4) var(--space-8)" |
|
||||
| (max-width: 860px) | .content.cards | grid-template-columns | 1fr |
|
||||
| (max-width: 860px) | .site-form form | grid-template-columns | 1fr |
|
||||
| (max-width: 860px) | .site-form label:nth-child(1) | grid-column | "1 / -1" |
|
||||
| (max-width: 860px) | .site-form label:nth-child(2) | grid-column | "1 / -1" |
|
||||
| (max-width: 860px) | header.topnav | padding | "0.85rem var(--space-4)" |
|
||||
| (max-width: 860px) | .intro_title | font-size | "2.4rem" |
|
||||
| (prefers-reduced-motion: reduce) | main.main | animation | none |
|
||||
| (prefers-reduced-motion: reduce) | .kicker | animation | none |
|
||||
| (prefers-reduced-motion: reduce) | article.card | transition | none |
|
||||
| (prefers-reduced-motion: reduce) | body::after | animation | none |
|
||||
| (prefers-reduced-motion: reduce) | html::after | animation | none |
|
||||
| (prefers-reduced-motion: reduce) | html::before | animation | none |
|
||||
|
||||
*`responsive`*
|
||||
|
||||
## topnav
|
||||
|
||||
`topnav` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| background | #ffffff |
|
||||
| border-bottom | 1px solid #e7e5e4 |
|
||||
| property | value |
|
||||
|----------|-------|
|
||||
| position | sticky |
|
||||
| top | "0" |
|
||||
| z-index | "40" |
|
||||
| display | flex |
|
||||
| align-items | center |
|
||||
| justify-content | flex-start |
|
||||
| gap | var(--space-4) |
|
||||
| padding | "1rem var(--space-6)" |
|
||||
| background | "linear-gradient(180deg, rgba(10,8,9,.92) 0%, rgba(10,8,9,.55) 70%, transparent 100%)" |
|
||||
| backdrop-filter | blur(10px) |
|
||||
| -webkit-backdrop-filter | blur(10px) |
|
||||
| border-bottom | 1px solid var(--border-soft) |
|
||||
|
||||
*`topnav`*
|
||||
|
||||
@@ -13,20 +235,42 @@
|
||||
|
||||
`side_panel` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| background | #f5f5f4 |
|
||||
| property | value |
|
||||
|----------|-------|
|
||||
| background | "rgba(10,8,9,.55)" |
|
||||
| padding | "var(--space-6) var(--space-4)" |
|
||||
| border-right | 1px solid var(--border-soft) |
|
||||
|
||||
*`side_panel`*
|
||||
|
||||
## footer
|
||||
|
||||
`footer` =
|
||||
|
||||
| property | value |
|
||||
|----------|-------|
|
||||
| color | var(--paper-faint) |
|
||||
| font-size | "0.8rem" |
|
||||
| letter-spacing | "0.08em" |
|
||||
| padding | "var(--space-5) var(--space-6)" |
|
||||
| border-top | 1px solid var(--border-soft) |
|
||||
| background | "rgba(10,8,9,.75)" |
|
||||
|
||||
*`footer`*
|
||||
|
||||
## card_title
|
||||
|
||||
`card_title` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| font-size | 1.15rem |
|
||||
| margin | 0 0 0.35rem |
|
||||
| property | value |
|
||||
|----------|-------|
|
||||
| font-family | var(--serif) |
|
||||
| font-size | "1.15rem" |
|
||||
| font-weight | "600" |
|
||||
| margin | "0 0 var(--space-2)" |
|
||||
| color | var(--gold) |
|
||||
| letter-spacing | "0.02em" |
|
||||
| line-height | "1.35" |
|
||||
|
||||
*`card_title`*
|
||||
|
||||
@@ -34,9 +278,398 @@
|
||||
|
||||
`card_body` =
|
||||
|
||||
| 属性 | 值 |
|
||||
|------|-----|
|
||||
| color | #57534e |
|
||||
| margin | 0 |
|
||||
| property | value |
|
||||
|----------|-------|
|
||||
| color | var(--paper-dim) |
|
||||
| margin | "0" |
|
||||
| line-height | "1.65" |
|
||||
| font-size | "0.9rem" |
|
||||
| font-weight | "400" |
|
||||
| display | "-webkit-box" |
|
||||
| -webkit-box-orient | vertical |
|
||||
| -webkit-line-clamp | "3" |
|
||||
| overflow | hidden |
|
||||
|
||||
*`card_body`*
|
||||
|
||||
## chrome
|
||||
|
||||
Panel + claim/steps group layout (field look comes from named bind styles).
|
||||
|
||||
`chrome` =
|
||||
|
||||
| selector | property | value |
|
||||
|----------|----------|-------|
|
||||
| .main-intro | background | var(--glass) |
|
||||
| .main-intro | border | 1px solid var(--border) |
|
||||
| .main-intro | border-radius | var(--radius) |
|
||||
| .main-intro | padding | "2.25rem 1.75rem 1.85rem" |
|
||||
| .main-intro | box-shadow | var(--shadow) |
|
||||
| .main-intro | backdrop-filter | blur(16px) |
|
||||
| .main-intro | -webkit-backdrop-filter | blur(16px) |
|
||||
| .main-intro | margin-bottom | var(--space-8) |
|
||||
| .main-intro > .claim | display | flex |
|
||||
| .main-intro > .claim | flex-wrap | wrap |
|
||||
| .main-intro > .claim | gap | var(--space-2) |
|
||||
| .main-intro > .claim | margin | "0 0 var(--space-6)" |
|
||||
| .main-intro > .steps | margin | "0" |
|
||||
| .main-intro > .steps | padding | "var(--space-5) var(--space-5) var(--space-5) 1.5rem" |
|
||||
| .main-intro > .steps | color | var(--paper-dim) |
|
||||
| .main-intro > .steps | background | "rgba(0,0,0,.35)" |
|
||||
| .main-intro > .steps | border | 1px solid var(--border-soft) |
|
||||
| .main-intro > .steps | border-left | 2px solid var(--gold-dim) |
|
||||
| .main-intro > .steps | border-radius | var(--radius) |
|
||||
| .main-intro > .steps | font-size | "0.95rem" |
|
||||
| .main-intro > .steps | letter-spacing | "0.02em" |
|
||||
| .main-intro > .steps a | color | var(--gold) |
|
||||
| .main-intro > .steps a | font-weight | "500" |
|
||||
| .main-intro > .steps a:hover | color | #f5e6c8 |
|
||||
| .article | background | var(--glass) |
|
||||
| .article | border | 1px solid var(--border) |
|
||||
| .article | border-radius | var(--radius) |
|
||||
| .article | padding | "2rem 1.75rem" |
|
||||
| .article | box-shadow | var(--shadow) |
|
||||
| .article | backdrop-filter | blur(16px) |
|
||||
| .article | -webkit-backdrop-filter | blur(16px) |
|
||||
| .article-title | font-family | var(--serif) |
|
||||
| .article-title | font-size | "clamp(1.75rem, 4vw, 2.35rem)" |
|
||||
| .article-title | font-weight | "600" |
|
||||
| .article-title | color | var(--gold) |
|
||||
| .article-title | letter-spacing | "0.04em" |
|
||||
| .article-title | margin | "0 0 var(--space-5)" |
|
||||
| .article-title | line-height | "1.25" |
|
||||
| .article-body | color | var(--paper-dim) |
|
||||
| .article-body | font-family | var(--sans) |
|
||||
| .article-body | font-size | "1.02rem" |
|
||||
| .article-body | line-height | "1.85" |
|
||||
| .article-body.md p | margin | "0 0 1.1rem" |
|
||||
| .article-body.md a | color | var(--gold) |
|
||||
| article.card | cursor | pointer |
|
||||
| a.card-link | color | inherit |
|
||||
| a.card-link | text-decoration | none |
|
||||
| a.card-link:hover | color | inherit |
|
||||
|
||||
*`chrome`*
|
||||
|
||||
## kicker
|
||||
|
||||
`kicker` =
|
||||
|
||||
| property | value |
|
||||
|----------|-------|
|
||||
| letter-spacing | "0.32em" |
|
||||
| text-transform | uppercase |
|
||||
| font-size | "0.72rem" |
|
||||
| color | var(--gold-dim) |
|
||||
| margin | "0 0 var(--space-4)" |
|
||||
| font-weight | "400" |
|
||||
| font-family | var(--sans) |
|
||||
| animation | "float 2.8s ease-in-out infinite" |
|
||||
|
||||
*`kicker`*
|
||||
|
||||
## intro_title
|
||||
|
||||
`intro_title` =
|
||||
|
||||
| property | value |
|
||||
|----------|-------|
|
||||
| font-family | var(--display) |
|
||||
| font-size | "clamp(3rem, 10vw, 4.8rem)" |
|
||||
| font-weight | "400" |
|
||||
| line-height | "1.15" |
|
||||
| letter-spacing | "0.04em" |
|
||||
| margin | "0 0 var(--space-4)" |
|
||||
| color | transparent |
|
||||
| background | "linear-gradient(135deg, #f5e6c8 0%, var(--gold) 42%, var(--wine) 100%)" |
|
||||
| -webkit-background-clip | text |
|
||||
| background-clip | text |
|
||||
| animation | "goldPulse 4.5s ease-in-out infinite" |
|
||||
|
||||
*`intro_title`*
|
||||
|
||||
## lede
|
||||
|
||||
`lede` =
|
||||
|
||||
| property | value |
|
||||
|----------|-------|
|
||||
| color | var(--paper-dim) |
|
||||
| max-width | "34rem" |
|
||||
| line-height | "1.85" |
|
||||
| margin | "0 0 var(--space-5)" |
|
||||
| font-size | "1.05rem" |
|
||||
| letter-spacing | "0.02em" |
|
||||
| font-weight | "400" |
|
||||
| font-family | var(--sans) |
|
||||
|
||||
*`lede`*
|
||||
|
||||
## claim
|
||||
|
||||
`claim` =
|
||||
|
||||
| property | value |
|
||||
|----------|-------|
|
||||
| display | inline-flex |
|
||||
| align-items | center |
|
||||
| padding | "0.2rem 0.65rem" |
|
||||
| border-radius | var(--radius-sm) |
|
||||
| background | var(--wine-soft) |
|
||||
| color | #f0c9d4 |
|
||||
| font-size | "0.68rem" |
|
||||
| font-weight | "500" |
|
||||
| letter-spacing | "0.14em" |
|
||||
| border | 1px solid rgba(107,30,58,0.5) |
|
||||
|
||||
*`claim`*
|
||||
|
||||
## step
|
||||
|
||||
`step` =
|
||||
|
||||
| property | value |
|
||||
|----------|-------|
|
||||
| margin | "0.55rem 0" |
|
||||
|
||||
*`step`*
|
||||
|
||||
## widgets
|
||||
|
||||
`widgets` =
|
||||
|
||||
| selector | property | value |
|
||||
|----------|----------|-------|
|
||||
| ul.nav | display | flex |
|
||||
| ul.nav | flex-wrap | wrap |
|
||||
| ul.nav | align-items | center |
|
||||
| ul.nav | gap | "0.35rem 1rem" |
|
||||
| ul.nav | list-style | none |
|
||||
| ul.nav | margin | "0" |
|
||||
| ul.nav | padding | "0" |
|
||||
| ul.nav a | display | inline-flex |
|
||||
| ul.nav a | align-items | center |
|
||||
| ul.nav a | text-decoration | none |
|
||||
| ul.nav a | color | var(--paper-dim) |
|
||||
| ul.nav a | padding | "0.35rem 0" |
|
||||
| ul.nav a | border-radius | "0" |
|
||||
| ul.nav a | font-weight | "400" |
|
||||
| ul.nav a | font-size | "0.8rem" |
|
||||
| ul.nav a | letter-spacing | "0.14em" |
|
||||
| ul.nav a | transition | color 0.25s ease |
|
||||
| ul.nav a:hover | background | transparent |
|
||||
| ul.nav a:hover | color | var(--gold) |
|
||||
| ul.nav a:hover | text-decoration | none |
|
||||
| ul.nav a[href="/admin"] | color | var(--gold) |
|
||||
| ul.nav a[href="/admin"] | letter-spacing | "0.18em" |
|
||||
| ul.nav a[href="/admin"] | border-bottom | 1px solid var(--gold-dim) |
|
||||
| ul.side-nav a[href="/admin"] | color | var(--gold) |
|
||||
| body.is-desk header.topnav | border-bottom | 1px solid rgba(107,30,58,0.55) |
|
||||
| body.is-desk header.topnav | box-shadow | "0 12px 40px rgba(107,30,58,.18)" |
|
||||
| body.is-desk .main-intro | border-left | 3px solid var(--wine) |
|
||||
| body.is-desk .site-form | border-color | rgba(107,30,58,0.45) |
|
||||
| body.is-desk .site-form | box-shadow | "0 0 0 1px rgba(212,175,55,.12), 0 18px 48px rgba(0,0,0,.35)" |
|
||||
| body.is-desk .content.cards | margin-top | var(--space-6) |
|
||||
| ul.nav li:first-child a | font-family | var(--display) |
|
||||
| ul.nav li:first-child a | font-weight | "400" |
|
||||
| ul.nav li:first-child a | color | var(--gold) |
|
||||
| ul.nav li:first-child a | font-size | "1.85rem" |
|
||||
| ul.nav li:first-child a | letter-spacing | "0.06em" |
|
||||
| ul.nav li:first-child a | padding | "0.1rem 0.2rem 0.1rem 0" |
|
||||
| ul.nav li:first-child a:hover | background | transparent |
|
||||
| ul.nav li:first-child a:hover | color | #f5e6c8 |
|
||||
| .side-label | display | block |
|
||||
| .side-label | font-size | "0" |
|
||||
| .side-label | margin | "0 0 var(--space-4)" |
|
||||
| .side-label::before | content | '"Path"' |
|
||||
| .side-label::before | display | block |
|
||||
| .side-label::before | font-size | "0.68rem" |
|
||||
| .side-label::before | letter-spacing | "0.28em" |
|
||||
| .side-label::before | text-transform | uppercase |
|
||||
| .side-label::before | color | var(--gold-dim) |
|
||||
| .side-label::before | font-weight | "400" |
|
||||
| ul.side-nav | list-style | none |
|
||||
| ul.side-nav | margin | "0" |
|
||||
| ul.side-nav | padding | "0" |
|
||||
| ul.side-nav | display | grid |
|
||||
| ul.side-nav | gap | "2px" |
|
||||
| ul.side-nav | border-left | 1px solid var(--border) |
|
||||
| ul.side-nav | padding-left | "0.85rem" |
|
||||
| ul.side-nav | margin-left | "0.25rem" |
|
||||
| ul.side-nav a | display | block |
|
||||
| ul.side-nav a | text-decoration | none |
|
||||
| ul.side-nav a | color | var(--paper-dim) |
|
||||
| ul.side-nav a | padding | "0.45rem 0.35rem" |
|
||||
| ul.side-nav a | border-radius | "0" |
|
||||
| ul.side-nav a | font-weight | "400" |
|
||||
| ul.side-nav a | font-size | "0.88rem" |
|
||||
| ul.side-nav a | letter-spacing | "0.06em" |
|
||||
| ul.side-nav a | border | "0" |
|
||||
| ul.side-nav a | position | relative |
|
||||
| ul.side-nav a:hover | background | transparent |
|
||||
| ul.side-nav a:hover | border-color | transparent |
|
||||
| ul.side-nav a:hover | color | var(--gold) |
|
||||
| ul.side-nav a:hover | text-decoration | none |
|
||||
| ul.side-nav a:hover | box-shadow | none |
|
||||
| ul.foot-nav | display | flex |
|
||||
| ul.foot-nav | gap | var(--space-4) |
|
||||
| ul.foot-nav | list-style | none |
|
||||
| ul.foot-nav | margin | "0" |
|
||||
| ul.foot-nav | padding | "0" |
|
||||
| ul.foot-nav a | color | var(--paper-faint) |
|
||||
| ul.foot-nav a | font-weight | "400" |
|
||||
| ul.foot-nav a | letter-spacing | "0.1em" |
|
||||
| ul.foot-nav a | font-size | "0.78rem" |
|
||||
| ul.foot-nav a:hover | color | var(--gold) |
|
||||
| .content.cards | display | grid |
|
||||
| .content.cards | gap | var(--space-4) |
|
||||
| .content.cards | margin-top | "0" |
|
||||
| .content.cards | grid-template-columns | "repeat(auto-fill, minmax(16rem, 1fr))" |
|
||||
| article.card | background | "rgba(0,0,0,.35)" |
|
||||
| article.card | border | 1px solid var(--border-soft) |
|
||||
| article.card | border-radius | var(--radius-sm) |
|
||||
| article.card | padding | "1.35rem 1.15rem" |
|
||||
| article.card | box-shadow | none |
|
||||
| article.card | transition | "border-color .35s ease, box-shadow .35s ease, transform .35s ease" |
|
||||
| article.card:hover | transform | "translateY(-3px)" |
|
||||
| article.card:hover | box-shadow | var(--shadow-card) |
|
||||
| article.card:hover | border-color | var(--gold-dim) |
|
||||
| .site-form | background | var(--glass) |
|
||||
| .site-form | border | 1px solid var(--border) |
|
||||
| .site-form | border-radius | var(--radius) |
|
||||
| .site-form | padding | "var(--space-6) var(--space-6) var(--space-7, 1.75rem)" |
|
||||
| .site-form | margin | "0 0 var(--space-6)" |
|
||||
| .site-form | max-width | "100%" |
|
||||
| .site-form | width | "100%" |
|
||||
| .site-form | box-shadow | var(--shadow) |
|
||||
| .site-form | backdrop-filter | blur(16px) |
|
||||
| .site-form | -webkit-backdrop-filter | blur(16px) |
|
||||
| .site-form .meta | display | none |
|
||||
| .site-form form | display | grid |
|
||||
| .site-form form | grid-template-columns | "minmax(0, 1fr) minmax(0, 1fr)" |
|
||||
| .site-form form | column-gap | var(--space-5) |
|
||||
| .site-form form | row-gap | var(--space-5) |
|
||||
| .site-form form | gap | var(--space-5) |
|
||||
| .site-form form | margin | "0" |
|
||||
| .site-form form | width | "100%" |
|
||||
| .site-form form | max-width | "100%" |
|
||||
| .site-form label | display | grid |
|
||||
| .site-form label | gap | var(--space-2) |
|
||||
| .site-form label | margin | "0" |
|
||||
| .site-form label | min-width | "0" |
|
||||
| .site-form label | font-weight | "400" |
|
||||
| .site-form label | color | var(--gold) |
|
||||
| .site-form label | font-size | "0.78rem" |
|
||||
| .site-form label | letter-spacing | "0.16em" |
|
||||
| .site-form label | text-transform | uppercase |
|
||||
| .site-form label:nth-child(1) | grid-column | "1" |
|
||||
| .site-form label:nth-child(2) | grid-column | "2" |
|
||||
| .site-form label:nth-child(n+3) | grid-column | "1 / -1" |
|
||||
| .site-form .actions | grid-column | "1 / -1" |
|
||||
| .site-form input | -webkit-appearance | none |
|
||||
| .site-form textarea | -webkit-appearance | none |
|
||||
| .site-form input | appearance | none |
|
||||
| .site-form textarea | appearance | none |
|
||||
| .site-form input | box-sizing | border-box |
|
||||
| .site-form textarea | box-sizing | border-box |
|
||||
| .site-form input | display | block |
|
||||
| .site-form textarea | display | block |
|
||||
| .site-form input | width | "100%" |
|
||||
| .site-form textarea | width | "100%" |
|
||||
| .site-form input | height | "2.75rem" |
|
||||
| .site-form textarea | min-height | "10rem" |
|
||||
| .site-form label:nth-child(4) textarea | min-height | "14rem" |
|
||||
| .site-form textarea | resize | vertical |
|
||||
| .site-form input | padding | "0 0.9rem" |
|
||||
| .site-form textarea | padding | "0.75rem 0.9rem" |
|
||||
| .site-form input | border | 1px solid var(--border) |
|
||||
| .site-form textarea | border | 1px solid var(--border) |
|
||||
| .site-form input | border-radius | var(--radius-sm) |
|
||||
| .site-form textarea | border-radius | var(--radius-sm) |
|
||||
| .site-form input | background | "rgba(0,0,0,.4)" |
|
||||
| .site-form textarea | background | "rgba(0,0,0,.4)" |
|
||||
| .site-form input | color | var(--paper) |
|
||||
| .site-form textarea | color | var(--paper) |
|
||||
| .site-form input | font | inherit |
|
||||
| .site-form textarea | font | inherit |
|
||||
| .site-form input | font-size | "0.95rem" |
|
||||
| .site-form textarea | font-size | "0.95rem" |
|
||||
| .site-form input | line-height | "1.4" |
|
||||
| .site-form textarea | line-height | "1.65" |
|
||||
| .site-form input | transition | "border-color .2s ease, box-shadow .2s ease" |
|
||||
| .site-form textarea | transition | "border-color .2s ease, box-shadow .2s ease" |
|
||||
| .site-form input:hover | border-color | var(--gold-dim) |
|
||||
| .site-form textarea:hover | border-color | var(--gold-dim) |
|
||||
| .site-form input:focus | outline | none |
|
||||
| .site-form textarea:focus | outline | none |
|
||||
| .site-form input:focus | border-color | var(--gold) |
|
||||
| .site-form textarea:focus | border-color | var(--gold) |
|
||||
| .site-form input:focus | box-shadow | var(--ring) |
|
||||
| .site-form textarea:focus | box-shadow | var(--ring) |
|
||||
| .site-form input[readonly] | background | "rgba(0,0,0,.25)" |
|
||||
| .site-form input[readonly] | color | var(--paper-faint) |
|
||||
| .site-form .err | color | var(--danger) |
|
||||
| .site-form .err | font-size | "0.8rem" |
|
||||
| .site-form .err | font-weight | "500" |
|
||||
| .site-form .err | letter-spacing | "0.04em" |
|
||||
| .site-form .actions | display | flex |
|
||||
| .site-form .actions | align-items | center |
|
||||
| .site-form .actions | gap | var(--space-4) |
|
||||
| .site-form .actions | margin-top | var(--space-2) |
|
||||
| .site-form .actions | flex-wrap | wrap |
|
||||
| .site-form button | -webkit-appearance | none |
|
||||
| .site-form button | appearance | none |
|
||||
| .site-form button | height | "2.75rem" |
|
||||
| .site-form button | padding | "0 1.35rem" |
|
||||
| .site-form button | background | "linear-gradient(135deg, #f5e6c8, var(--gold))" |
|
||||
| .site-form button | color | var(--ink) |
|
||||
| .site-form button | border | "0" |
|
||||
| .site-form button | border-radius | 999px |
|
||||
| .site-form button | font-weight | "600" |
|
||||
| .site-form button | font-size | "0.85rem" |
|
||||
| .site-form button | letter-spacing | "0.12em" |
|
||||
| .site-form button | cursor | pointer |
|
||||
| .site-form button | box-shadow | "0 8px 28px rgba(212,175,55,.28)" |
|
||||
| .site-form button | transition | "transform .2s ease, box-shadow .2s ease, filter .2s ease" |
|
||||
| .site-form button:hover | filter | brightness(1.06) |
|
||||
| .site-form button:hover | transform | "translateY(-1px)" |
|
||||
| .site-form button:hover | box-shadow | "0 12px 36px rgba(212,175,55,.4)" |
|
||||
| .site-form .actions a | color | var(--paper-faint) |
|
||||
| .site-form .actions a | font-weight | "400" |
|
||||
| .site-form .actions a | text-decoration | none |
|
||||
| .site-form .actions a | font-size | "0.85rem" |
|
||||
| .site-form .actions a | letter-spacing | "0.08em" |
|
||||
| .site-form .actions a:hover | color | var(--gold) |
|
||||
| .flash.err | color | var(--danger) |
|
||||
| .flash.err | font-weight | "500" |
|
||||
|
||||
*`widgets`*
|
||||
|
||||
## css
|
||||
|
||||
**v = > vars**
|
||||
**m = > motion**
|
||||
**l = > layout**
|
||||
**r = > responsive**
|
||||
**c = > chrome**
|
||||
**w = > widgets**
|
||||
**css_v = > web.make_style name="vars" table=v**
|
||||
**css_m = > web.make_style name="motion" table=m**
|
||||
**css_l = > web.make_style name="layout" table=l**
|
||||
**css_r = > web.make_style name="responsive" table=r**
|
||||
**css_c = > web.make_style name="chrome" table=c**
|
||||
**css_w = > web.make_style name="widgets" table=w**
|
||||
|
||||
`parts` =
|
||||
|
||||
| css |
|
||||
|-----|
|
||||
| `css_v` |
|
||||
| `css_m` |
|
||||
| `css_l` |
|
||||
| `css_r` |
|
||||
| `css_c` |
|
||||
| `css_w` |
|
||||
|
||||
**out = > text.str_join xs=`parts` sep=""**
|
||||
*out*
|
||||
@@ -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
|
||||
@@ -0,0 +1 @@
|
||||
1.0.6
|
||||
+182
-7
@@ -38,6 +38,18 @@ them into CSS — 样式即数据、装配即函数.
|
||||
> ensure_plugin
|
||||
*> web_style name=`name` table=`table` strict=`strict`*
|
||||
|
||||
## make_intro
|
||||
+ `table`
|
||||
|
||||
Assemble an intro bind table (`|属性|值|样式|` / `|front|back|style|`) into an
|
||||
HTML fragment for `.main-intro`. Same slot vocabulary as `compose_intro`
|
||||
(`kicker`/`title`/`lede`/`claim`/`step`, plus ZH aliases). The `样式` column is
|
||||
treated as a class name only here — prefer `page.compose_intro` when styles
|
||||
should resolve from `shell.*` tables into `styles_css`.
|
||||
|
||||
> ensure_plugin
|
||||
*> web_intro table=`table`*
|
||||
|
||||
## make_images
|
||||
+ `table`
|
||||
|
||||
@@ -230,6 +242,32 @@ Assemble main from a bind table (`|属性|值|样式|` or `|front|back|css|`).
|
||||
|
||||
*> web_compose_main page=`self` main=`main`*
|
||||
|
||||
## compose_list
|
||||
+ `main`
|
||||
+ `query`=None
|
||||
+ `order`=""
|
||||
+ `target`=""
|
||||
|
||||
Secondary list bind (e.g. comments on a detail page). Same bind shape as compose_main.
|
||||
Optional query supports route param placeholders; optional target injects into an intro element id.
|
||||
|
||||
*> web_compose_list page=`self` main=`main` query=`query` order=`order` target=`target`*
|
||||
|
||||
## compose_intro
|
||||
+ `intro`
|
||||
|
||||
Assemble page intro from the same bind shape as `compose_main`
|
||||
(`|属性|值|样式|` / `|front|back|style|`). `值` is literal copy (light
|
||||
`[label](url)` / `**bold**`); `样式` resolves `shell.*` named
|
||||
tables into `styles_css` like `card_title`. Consecutive `claim` / `step` rows
|
||||
group into `.claim` / `.steps`. Slot aliases: `kicker`/`眉题`, `title`/`标题`,
|
||||
`lede`/`导语`, `claim`/`标签`, `step`/`步骤`, plus `mount`/`插槽` and
|
||||
`html`/`原文`. Replaces string `intro=` HTML. In `.mq.md` table cells, avoid
|
||||
inline `` `code` `` — backtick refs are Marqdo variables; quote long prose
|
||||
and use plain filenames or `[label](url)` links instead.
|
||||
|
||||
*> web_compose_intro page=`self` intro=`intro`*
|
||||
|
||||
## query
|
||||
+ `query`
|
||||
|
||||
@@ -318,6 +356,50 @@ Embed a form into the page main slot. Optional `target` / `form_slot` (CSS id, e
|
||||
|
||||
*> web_compose_form page=`self` form=`form` id=`id` target=`target`*
|
||||
|
||||
## compose_form_load
|
||||
+ `table`
|
||||
+ `id_param`="id"
|
||||
|
||||
Prefill the composed form from DB using route/query `id` (desk edit pages).
|
||||
|
||||
*> web_compose_form_load page=`self` table=`table` id_param=`id_param`*
|
||||
|
||||
## compose_auth_form
|
||||
+ `action`
|
||||
+ `submit`=""
|
||||
+ `form_id`=""
|
||||
+ `err_id`=""
|
||||
+ `target`=None
|
||||
+ `next`=""
|
||||
+ `kind`=""
|
||||
|
||||
Progressive-enhancement login/register form: server injects `_csrf` / `next`,
|
||||
re-renders the same branded page on failure. No author JS.
|
||||
|
||||
*> web_compose_auth_form page=`self` action=`action` submit=`submit` form_id=`form_id` err_id=`err_id` target=`target` next=`next` kind=`kind`*
|
||||
|
||||
## compose_nav_brand
|
||||
+ `title`=""
|
||||
+ `href`="/"
|
||||
+ `logo`=""
|
||||
+ `logo_light`=""
|
||||
+ `theme_key`="mq-theme"
|
||||
|
||||
SSR topnav brand (logo + title), theme toggle, and drawer button. Interactive
|
||||
behavior stays in `client.mq.md` via `compose_client` / `client_embed`.
|
||||
|
||||
*> web_compose_nav_brand page=`self` title=`title` href=`href` logo=`logo` logo_light=`logo_light` theme_key=`theme_key`*
|
||||
|
||||
## compose_client
|
||||
+ `source`
|
||||
+ `bridge`="/static/marqdo-bridge.js"
|
||||
+ `wasm`="/static/marqdo_wasm.wasm"
|
||||
|
||||
Stamp `page.client` so render injects official bridge auto-mount (`data-mq-wasm` /
|
||||
`data-mq-source-url`). Build with `marqdo wasm build -o static` first.
|
||||
|
||||
*> web_compose_client page=`self` source=`source` bridge=`bridge` wasm=`wasm`*
|
||||
|
||||
## render
|
||||
+ `db`=None
|
||||
|
||||
@@ -583,6 +665,15 @@ Field table + rules table; submit writes through `# db`.
|
||||
|
||||
*> web_form_rules form=`self` rules=`rules`*
|
||||
|
||||
## labels
|
||||
+ `submit`="Submit"
|
||||
+ `cancel`="cancel"
|
||||
+ `cancel_href`=""
|
||||
|
||||
Localized submit / cancel copy for rendered forms.
|
||||
|
||||
*> web_form_labels form=`self` submit=`submit` cancel=`cancel` cancel_href=`cancel_href`*
|
||||
|
||||
## validate
|
||||
+ `rules`=None
|
||||
+ `data`
|
||||
@@ -616,7 +707,7 @@ Field table + rules table; submit writes through `# db`.
|
||||
+ `layout`=None
|
||||
+ `asset_version`=None
|
||||
|
||||
Construct an app. `admin=True` mounts the built-in CRUD UI under `admin_prefix` (default `/admin`). When `admin=False`, that prefix is not reserved — you may `route` your own pages there. Optional `login_redirect` / `logout_redirect` override post-auth landing. Optional `shell_css` / `layout` / `asset_version` become defaults for pages that do not set their own (see `page.shell_css` / `page.layout` / `page.asset_version`).
|
||||
Construct an app. `admin=True` mounts the built-in **table browser** (not a CMS) under `admin_prefix` (default `/admin`). When `admin=False`, that prefix is not reserved and is not auto-gated — declare your own `route` + `gate` desk. Optional `login_redirect` / `logout_redirect` override post-auth landing. Optional `shell_css` / `layout` / `asset_version` become defaults for pages that do not set their own (see `page.shell_css` / `page.layout` / `page.asset_version`).
|
||||
|
||||
> ensure_plugin
|
||||
*> web_app_new page=`page` db=`db` admin=`admin` host=`host` port=`port` admin_prefix=`admin_prefix` login_redirect=`login_redirect` logout_redirect=`logout_redirect` shell_css=`shell_css` layout=`layout` asset_version=`asset_version`*
|
||||
@@ -706,10 +797,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`
|
||||
@@ -718,21 +812,59 @@ 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"
|
||||
+ `session_url`=None
|
||||
|
||||
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). Optional `session_url` (`redis://…` / `rediss://…`) stores sessions in Redis separately from the Postgres/SQLite app DB; omit to keep `_marqdo_sessions` (or in-memory). With OIDC, do not set `logout_redirect` to a login path (it would bounce to the IdP); conflicting values fall back to `/`.
|
||||
|
||||
*> 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` session_url=`session_url`*
|
||||
|
||||
## oidc
|
||||
+ `issuer`=None
|
||||
+ `client_id`
|
||||
+ `client_secret`
|
||||
+ `redirect_uri`
|
||||
+ `scopes`="openid profile email"
|
||||
+ `callback_path`=None
|
||||
+ `authorize_url`=None
|
||||
+ `token_url`=None
|
||||
+ `userinfo_url`=None
|
||||
|
||||
Enable OAuth 2.0 authorization-code / OIDC login (e.g. CFLMY IdP). When set, `login_path` / `register_path` / desk login redirect to the IdP; the `redirect_uri` callback exchanges the code and opens a local session. userinfo `is_admin` / `admin_role` map to local role `admin`; otherwise `default_role`. Secrets stay server-side; PKCE S256 is always sent.
|
||||
|
||||
*> web_app_oidc app=`self` issuer=`issuer` client_id=`client_id` client_secret=`client_secret` redirect_uri=`redirect_uri` scopes=`scopes` callback_path=`callback_path` authorize_url=`authorize_url` token_url=`token_url` userinfo_url=`userinfo_url`*
|
||||
|
||||
## 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
|
||||
+ `desk`=False
|
||||
|
||||
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`. By default **no** `/_rbac/*` routes; set `desk=True` to mount the API and `GET /_rbac/desk` (needs `roles:manage`). Permission gates work either way.
|
||||
|
||||
*> web_app_rbac app=`self` catalog=`catalog` desk=`desk`*
|
||||
|
||||
## 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
|
||||
@@ -816,6 +948,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
|
||||
|
||||
+181
-8
@@ -35,6 +35,16 @@ import table:lib/table.mq.md
|
||||
> 确保插件
|
||||
*> web_style name=`名` table=`表` strict=`严格`*
|
||||
|
||||
## 引言装配
|
||||
+ `表`
|
||||
|
||||
把引言绑定表(`|属性|值|样式|` / `|front|back|style|`)装配成 `.main-intro` HTML 片段。
|
||||
槽位与 `页面.引言装配` 相同。此处 `样式` 只当 class 名;要从 `shell.*` 解析进
|
||||
`styles_css` 请用 `页面.引言装配`。
|
||||
|
||||
> 确保插件
|
||||
*> web_intro table=`表`*
|
||||
|
||||
## 图片装配
|
||||
+ `表`
|
||||
|
||||
@@ -217,6 +227,31 @@ import table:lib/table.mq.md
|
||||
|
||||
*> web_compose_main page=`self` main=`主体`*
|
||||
|
||||
## 列表装配
|
||||
+ `主体`
|
||||
+ `条件`=None
|
||||
+ `排序`=""
|
||||
+ `插槽`=""
|
||||
|
||||
详情页副绑定(如评论列表)。绑定表形同 `主体装配`;`条件` 支持 `{参数}`;
|
||||
可选 `插槽`(元素 id)把列表注入引言 HTML(同表单插槽)。
|
||||
`插槽=rail` / `轨` / `新闻轨` 时渲染为右侧 `aside.side-rail`(量子新闻轨),并为 body 加上 `has-rail`。
|
||||
|
||||
*> web_compose_list page=`self` main=`主体` query=`条件` order=`排序` target=`插槽`*
|
||||
|
||||
## 引言装配
|
||||
+ `引言`
|
||||
|
||||
与 `主体装配` 同一绑定表形(`|属性|值|样式|`)。`值` 为文案(支持轻量
|
||||
`[文](url)` / `**粗**`);`样式` 解析 `shell.*` 具名表写入
|
||||
`styles_css`(同 `card_title`)。连续 `claim`/`标签`、`step`/`步骤` 会分组。
|
||||
槽位别名:`kicker`/`眉题`、`title`/`标题`、`lede`/`导语`、`claim`/`标签`、
|
||||
`step`/`步骤`,以及 `mount`/`插槽`、`html`/`原文`。用于替代字符串 `引言=` HTML。
|
||||
在 `.mq.md` 表单元格里请勿写行内 `` `code` ``(反引号是 Marqdo 变量语法);
|
||||
长文加引号,文件名用纯文本或 `[文](url)`。
|
||||
|
||||
*> web_compose_intro page=`self` intro=`引言`*
|
||||
|
||||
## 查询条件
|
||||
+ `条件`
|
||||
|
||||
@@ -300,6 +335,51 @@ SEO / OpenGraph 元数据表(`|键|值|`)。如 `title`、`description`、`c
|
||||
|
||||
*> web_compose_form page=`self` form=`表单` id=`id` target=`表单插槽`*
|
||||
|
||||
## 表单载入
|
||||
+ `表`
|
||||
+ `id参数`="id"
|
||||
|
||||
编辑页:按路由/查询参数中的 id 从数据库预填已装配表单,无需作者 JS 拉行。
|
||||
|
||||
*> web_compose_form_load page=`self` table=`表` id_param=`id参数`*
|
||||
|
||||
## 鉴权表单
|
||||
+ `动作`
|
||||
+ `提交`=""
|
||||
+ `表单id`=""
|
||||
+ `错误id`=""
|
||||
+ `表单插槽`=None
|
||||
+ `回跳`=""
|
||||
+ `种类`=""
|
||||
|
||||
装配原生登录/注册表单(隐藏 `_csrf` / `next`,失败时服务端回渲同一页 flash)。
|
||||
`动作` 为 POST 路径(如 `/login`、`/desk/login`、`/register`)。可选 `表单插槽`
|
||||
把表单注入引言 HTML;`回跳` 为默认 `next`(写作台登录用 `/desk`)。
|
||||
无需站点业务 JS。
|
||||
|
||||
*> web_compose_auth_form page=`self` action=`动作` submit=`提交` form_id=`表单id` err_id=`错误id` target=`表单插槽` next=`回跳` kind=`种类`*
|
||||
|
||||
## 导航品牌
|
||||
+ `标题`=""
|
||||
+ `链接`="/"
|
||||
+ `标志`=""
|
||||
+ `浅色标志`=""
|
||||
+ `主题键`="mq-theme"
|
||||
|
||||
SSR 顶栏刊名 Logo、主题切换钮与目录抽屉钮。交互写在 `client.mq.md`,配合 `客户端`。
|
||||
|
||||
*> web_compose_nav_brand page=`self` title=`标题` href=`链接` logo=`标志` logo_light=`浅色标志` theme_key=`主题键`*
|
||||
|
||||
## 客户端
|
||||
+ `源`
|
||||
+ `桥`="/static/marqdo-bridge.js"
|
||||
+ `wasm`="/static/marqdo_wasm.wasm"
|
||||
|
||||
写入 `page.client`,渲染时注入官方 bridge 自启(`data-mq-wasm` / `data-mq-source-url`)。
|
||||
先 `marqdo wasm build -o public`(或站点 static 目录)。
|
||||
|
||||
*> web_compose_client page=`self` source=`源` bridge=`桥` wasm=`wasm`*
|
||||
|
||||
## 渲染
|
||||
+ `数据库`=None
|
||||
|
||||
@@ -543,7 +623,7 @@ SEO / OpenGraph 元数据表(`|键|值|`)。如 `title`、`description`、`c
|
||||
+ `动作`=插入
|
||||
+ `id`=None
|
||||
|
||||
字段表 + 校验表;提交经 `# 数据库` 写入。
|
||||
字段表 + 校验表;提交经 `# 数据库` 写入。`动作` 为 `插入` / `更新` / `删除`(英:`insert` / `update` / `delete`)。删除按 `id` 删行,字段表可只读展示上下文。站点后台用「列表 + 表单页」声明即可,不必改插件。
|
||||
|
||||
> 确保插件
|
||||
*> web_form_new table=`表` action=`动作` id=`id`*
|
||||
@@ -558,6 +638,15 @@ SEO / OpenGraph 元数据表(`|键|值|`)。如 `title`、`description`、`c
|
||||
|
||||
*> web_form_rules form=`self` rules=`规则`*
|
||||
|
||||
## 文案
|
||||
+ `提交`="提交"
|
||||
+ `取消`="取消"
|
||||
+ `取消链接`=""
|
||||
|
||||
表单提交钮 / 取消链接文案(默认英文 Submit/cancel 由渲染层回退)。
|
||||
|
||||
*> web_form_labels form=`self` submit=`提交` cancel=`取消` cancel_href=`取消链接`*
|
||||
|
||||
## 校验
|
||||
+ `规则`=None
|
||||
+ `数据`
|
||||
@@ -591,7 +680,7 @@ SEO / OpenGraph 元数据表(`|键|值|`)。如 `title`、`description`、`c
|
||||
+ `布局`=None
|
||||
+ `资源版本`=None
|
||||
|
||||
构造应用。`后台=真` 时在 `后台前缀`(默认 `/admin`)挂载内置 CRUD。`后台=假` 时该前缀不再保留,可自行 `路由` 到 `/admin…`。可选 `登录回跳` / `登出回跳`。可选 `壳样式` / `布局` / `资源版本` 作为未自设页面的默认(见 `页面.壳样式` / `页面.布局` / `页面.资源版本`)。
|
||||
构造应用。`后台=真` 时在 `后台前缀`(默认 `/admin`)挂载**内置表浏览器**(不是 CMS)。`后台=假` 时该前缀不保留、不自动门禁,可自行 `路由` + `门禁` 做写作台。可选 `登录回跳` / `登出回跳`。可选 `壳样式` / `布局` / `资源版本` 作为未自设页面的默认(见 `页面.壳样式` / `页面.布局` / `页面.资源版本`)。
|
||||
|
||||
> 确保插件
|
||||
*> web_app_new page=`页面` db=`数据库` admin=`后台` host=`主机` port=`端口` admin_prefix=`后台前缀` login_redirect=`登录回跳` logout_redirect=`登出回跳` shell_css=`壳样式` layout=`布局` asset_version=`资源版本`*
|
||||
@@ -676,10 +765,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=`在场`*
|
||||
|
||||
## 鉴权
|
||||
+ `用户表`
|
||||
@@ -688,21 +780,59 @@ SEO / OpenGraph 元数据表(`|键|值|`)。如 `title`、`description`、`c
|
||||
+ `登录回跳`=None
|
||||
+ `登出回跳`=None
|
||||
+ `登录路径`=None
|
||||
+ `注册`=假
|
||||
+ `注册路径`=/register
|
||||
+ `默认角色`="member"
|
||||
+ `会话地址`=None
|
||||
|
||||
在保持 `后台=真` 的同时,为 `{后台前缀}` 加段边界前缀门禁(默认 `/admin`)。未登录 重定向 到 `登录路径`(默认 `{前缀}/login`,自动排除)。不会匹配 `/admin-publish` 这类旁系路径。
|
||||
在保持 `后台=真` 的同时,为 `{后台前缀}` 加段边界前缀门禁(默认 `/admin`)。未登录 重定向 到 `登录路径`(默认 `{前缀}/login`,自动排除)。不会匹配 `/admin-publish` 这类旁系路径。`注册=真` 且已 `启用权限` 时开放 `注册路径`(写入 `web_users` 并赋默认角色)。`会话地址` 可选:`redis://…` / `rediss://…` 将会话存 Redis(与 Postgres/SQLite 业务库分离);缺省仍落在业务库的 `_marqdo_sessions` 或内存。启用统一身份时,`登出回跳` 勿设为登录页(会立刻再跳 IdP);默认/冲突时落首页 `/`。
|
||||
|
||||
*> 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=`默认角色` session_url=`会话地址`*
|
||||
|
||||
## 统一身份
|
||||
+ `发行方`=None
|
||||
+ `客户端编号`
|
||||
+ `客户端密钥`
|
||||
+ `回调`
|
||||
+ `范围`="openid profile email"
|
||||
+ `回调路径`=None
|
||||
+ `授权地址`=None
|
||||
+ `令牌地址`=None
|
||||
+ `用户信息地址`=None
|
||||
|
||||
接入 OIDC / OAuth 2.0 授权码(如 [CFLMY 统一身份](https://id.cflmy.cn/api-docs))。listen 后:`登录路径` / `注册路径` / 后台登录页 302 到 IdP;回调 `回调`(默认 `/oidc/callback`)换票并建本地会话。userinfo 的 `is_admin` / `admin_role` 映射为本地角色 `admin`(写作台权限),否则为 `默认角色`。`client_secret` 仅服务端;推荐配 PKCE(框架已启用 S256)。
|
||||
|
||||
*> web_app_oidc app=`self` issuer=`发行方` client_id=`客户端编号` client_secret=`客户端密钥` redirect_uri=`回调` scopes=`范围` callback_path=`回调路径` authorize_url=`授权地址` token_url=`令牌地址` userinfo_url=`用户信息地址`*
|
||||
|
||||
## 门禁
|
||||
+ `路径`
|
||||
+ `角色`=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`。默认**不**挂 `/_rbac/*`;`管理台=真` 时才开放 API 与 `GET /_rbac/desk`(需 `roles:manage`)。门禁 `权限=` 在两种模式下均可用。
|
||||
|
||||
*> web_app_rbac app=`self` catalog=`目录` desk=`管理台`*
|
||||
|
||||
## 租户
|
||||
+ `模式`
|
||||
+ `参数`=None
|
||||
+ `列`=tenant_id
|
||||
+ `默认作用域`=假
|
||||
|
||||
启用多租户解析:`模式` 为 `path`(查询参数或 `/t/{id}/…`)、`subdomain` 或 `header`。`参数` 为路径/查询键或请求头名。`默认作用域=真` 时 JSON 路由与表单插入自动按 `列`(默认 `tenant_id`)过滤/盖戳。单路由可用表列 `租户作用域` 覆盖。
|
||||
|
||||
*> web_app_tenant app=`self` mode=`模式` param=`参数` column=`列` default_scope=`默认作用域`*
|
||||
|
||||
## 相册
|
||||
+ `路径`=/gallery
|
||||
@@ -786,6 +916,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
|
||||
|
||||
@@ -44,6 +44,42 @@ Build set_class effect map.
|
||||
**`m` = > table.put in=None at=sel value=class**
|
||||
*> table.put in=None at="set_class" value=m*
|
||||
|
||||
## add_class
|
||||
+ `sel`
|
||||
+ `class`
|
||||
|
||||
Build add_class effect map (classList.add; space-separated names OK).
|
||||
|
||||
**`m` = > table.put in=None at=sel value=class**
|
||||
*> table.put in=None at="add_class" value=m*
|
||||
|
||||
## remove_class
|
||||
+ `sel`
|
||||
+ `class`
|
||||
|
||||
Build remove_class effect map.
|
||||
|
||||
**`m` = > table.put in=None at=sel value=class**
|
||||
*> table.put in=None at="remove_class" value=m*
|
||||
|
||||
## toggle_class
|
||||
+ `sel`
|
||||
+ `class`
|
||||
|
||||
Build toggle_class effect map.
|
||||
|
||||
**`m` = > table.put in=None at=sel value=class**
|
||||
*> table.put in=None at="toggle_class" value=m*
|
||||
|
||||
## set_style
|
||||
+ `sel`
|
||||
+ `style`
|
||||
|
||||
Build set_style effect map; style is a map of CSS properties or a cssText string.
|
||||
|
||||
**`m` = > table.put in=None at=sel value=style**
|
||||
*> table.put in=None at="set_style" value=m*
|
||||
|
||||
## set_attr
|
||||
+ `sel`
|
||||
+ `attrs`
|
||||
@@ -154,6 +190,54 @@ focus.
|
||||
|
||||
*> table.put in=None at="navigate" value=spec*
|
||||
|
||||
## store_set
|
||||
+ `key`
|
||||
+ `value`
|
||||
+ `scope`="memory"
|
||||
+ `then`=""
|
||||
|
||||
In-memory (or local/session) key write for SPA client state. Prefer `scope=memory` for tab-local app state.
|
||||
Optional `then` is called after the write with `{ok, op, key, scope}`.
|
||||
|
||||
`spec` =
|
||||
|
||||
| op | key | value | scope |
|
||||
|----|-----|-------|-------|
|
||||
| set | `key` | `value` | `scope` |
|
||||
|
||||
1. `then` != ""
|
||||
**`spec` = > table.put in=spec at="then" value=then**
|
||||
*> 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`
|
||||
|
||||
|
||||
@@ -43,6 +43,42 @@ import table:lib/table.mq.md
|
||||
**`m` = > table.put in=None at=选择器 value=类**
|
||||
*> table.put in=None at="set_class" value=m*
|
||||
|
||||
## 加类
|
||||
+ `选择器`
|
||||
+ `类`
|
||||
|
||||
构造 add_class 效应(classList.add;可用空格分隔多个类名)。
|
||||
|
||||
**`m` = > table.put in=None at=选择器 value=类**
|
||||
*> table.put in=None at="add_class" value=m*
|
||||
|
||||
## 去类
|
||||
+ `选择器`
|
||||
+ `类`
|
||||
|
||||
构造 remove_class 效应。
|
||||
|
||||
**`m` = > table.put in=None at=选择器 value=类**
|
||||
*> table.put in=None at="remove_class" value=m*
|
||||
|
||||
## 切类
|
||||
+ `选择器`
|
||||
+ `类`
|
||||
|
||||
构造 toggle_class 效应。
|
||||
|
||||
**`m` = > table.put in=None at=选择器 value=类**
|
||||
*> table.put in=None at="toggle_class" value=m*
|
||||
|
||||
## 设样式
|
||||
+ `选择器`
|
||||
+ `样式`
|
||||
|
||||
构造 set_style 效应;样式为属性表或 cssText 字符串。
|
||||
|
||||
**`m` = > table.put in=None at=选择器 value=样式**
|
||||
*> table.put in=None at="set_style" value=m*
|
||||
|
||||
## 设属性
|
||||
+ `选择器`
|
||||
+ `属性`
|
||||
@@ -153,6 +189,54 @@ import table:lib/table.mq.md
|
||||
|
||||
*> table.put in=None at="navigate" value=spec*
|
||||
|
||||
## 存设
|
||||
+ `键`
|
||||
+ `值`
|
||||
+ `作用域`="memory"
|
||||
+ `然后`=""
|
||||
|
||||
SPA 客户端状态写入。优先 `作用域=memory`(页内内存)。
|
||||
可选 `然后`:写入后回调,参数含 `{ok, op, key, scope}`。
|
||||
|
||||
`spec` =
|
||||
|
||||
| op | key | value | scope |
|
||||
|----|-----|-------|-------|
|
||||
| set | `键` | `值` | `作用域` |
|
||||
|
||||
1. `然后` != ""
|
||||
**`spec` = > table.put in=spec at="then" value=然后**
|
||||
*> 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"
|
||||
)
|
||||
|
||||
@@ -173,6 +174,27 @@ func web_form_rules(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
return replyJSON(outJSON, errMsg, form.SetRules(formBag, args["rules"]), nil)
|
||||
}
|
||||
|
||||
//export web_form_labels
|
||||
func web_form_labels(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
if err != nil {
|
||||
return replyJSON(outJSON, errMsg, nil, err)
|
||||
}
|
||||
submit, _ := argStr(args, "submit")
|
||||
if submit == "" {
|
||||
submit, _ = argStr(args, "提交")
|
||||
}
|
||||
cancel, _ := argStr(args, "cancel")
|
||||
if cancel == "" {
|
||||
cancel, _ = argStr(args, "取消")
|
||||
}
|
||||
cancelHref, _ := argStr(args, "cancel_href")
|
||||
if cancelHref == "" {
|
||||
cancelHref, _ = argStr(args, "取消链接")
|
||||
}
|
||||
return replyJSON(outJSON, errMsg, form.SetLabels(asPageMap(args["form"]), submit, cancel, cancelHref), nil)
|
||||
}
|
||||
|
||||
//export web_form_validate
|
||||
func web_form_validate(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
@@ -480,6 +502,16 @@ func web_app_auth(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
return replyJSON(outJSON, errMsg, out, err)
|
||||
}
|
||||
|
||||
//export web_app_oidc
|
||||
func web_app_oidc(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.OIDC(asPageMap(args["app"]), args)
|
||||
return replyJSON(outJSON, errMsg, out, err)
|
||||
}
|
||||
|
||||
//export web_app_gate
|
||||
func web_app_gate(argsJSON *C.char, outJSON **C.char, errMsg **C.char) C.int {
|
||||
args, err := parseArgs(argsJSON)
|
||||
@@ -493,3 +525,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)
|
||||
}
|
||||
@@ -15,13 +15,19 @@ require (
|
||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/jackc/pgpassfile v1.0.0 // indirect
|
||||
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
|
||||
github.com/jackc/pgx/v5 v5.7.4 // indirect
|
||||
github.com/jackc/puddle/v2 v2.2.2 // indirect
|
||||
github.com/mattn/go-isatty v0.0.24 // indirect
|
||||
github.com/ncruces/go-strftime v1.0.0 // indirect
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||
github.com/yuin/goldmark v1.7.8 // indirect
|
||||
github.com/yuin/gopher-lua v1.1.1 // indirect
|
||||
go.uber.org/atomic v1.11.0 // indirect
|
||||
golang.org/x/sync v0.22.0 // indirect
|
||||
golang.org/x/sys v0.47.0 // indirect
|
||||
golang.org/x/text v0.28.0 // indirect
|
||||
modernc.org/libc v1.75.6 // indirect
|
||||
modernc.org/mathutil v1.7.1 // indirect
|
||||
modernc.org/memory v1.12.1 // indirect
|
||||
|
||||
@@ -8,6 +8,7 @@ github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
||||
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
||||
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||
@@ -20,6 +21,14 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN
|
||||
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
|
||||
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
|
||||
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
||||
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
||||
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
|
||||
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
|
||||
github.com/jackc/pgx/v5 v5.7.4 h1:9wKznZrhWa2QiHL+NjTSPP6yjl3451BX3imWDnokYlg=
|
||||
github.com/jackc/pgx/v5 v5.7.4/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
|
||||
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
|
||||
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
|
||||
github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
|
||||
github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
|
||||
github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI=
|
||||
@@ -32,8 +41,11 @@ github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq
|
||||
github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4=
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
|
||||
github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
|
||||
github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
|
||||
github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
|
||||
@@ -50,8 +62,12 @@ golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
|
||||
golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
||||
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
|
||||
golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
|
||||
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
|
||||
golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE=
|
||||
golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
modernc.org/cc/v4 v4.29.2 h1:h6+9ciCnPKutf4I03CvheAvDLX7+IHlqR6Iy6J+cgd8=
|
||||
modernc.org/cc/v4 v4.29.2/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI=
|
||||
modernc.org/ccgo/v4 v4.35.0 h1:F+TUsmw09QxLzmi3aeYYGxjAXarmZaKgj3mKQHNaA8w=
|
||||
|
||||
@@ -6,7 +6,9 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/assets"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/oidc"
|
||||
"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,12 +196,33 @@ 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
|
||||
}
|
||||
if v := firstStr(opts, "session_url", "会话地址", "redis_url", "Redis"); v != "" {
|
||||
out["session_url"] = v
|
||||
authBag["session_url"] = v
|
||||
}
|
||||
out["auth"] = authBag
|
||||
gates := gatesOf(out)
|
||||
if !hasAdminGate(gates, prefix) {
|
||||
// Auto-gate the built-in admin prefix only when admin=true. Custom desks
|
||||
// (admin=false) declare their own gates and must not inherit /admin noise.
|
||||
if boolish(out["admin"]) && !hasAdminGate(gates, prefix) {
|
||||
gates = append(gates, map[string]any{
|
||||
"path": prefix,
|
||||
"roles": []any{"admin"},
|
||||
@@ -207,15 +230,62 @@ func Auth(appBag map[string]any, users any, opts map[string]any) (map[string]any
|
||||
"on_deny": "redirect",
|
||||
"exclude": []any{loginPath},
|
||||
})
|
||||
out["gates"] = gates
|
||||
} else {
|
||||
out["gates"] = gates
|
||||
}
|
||||
out["gates"] = gates
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// OIDC configures OAuth2/OIDC authorization-code login (CFLMY IdP or compatible).
|
||||
// When enabled, GET/POST on login_path and register_path redirect to the IdP;
|
||||
// callback at redirect_uri path establishes the local session. IdP is_admin /
|
||||
// admin_role map to local role "admin".
|
||||
func OIDC(appBag map[string]any, opts map[string]any) (map[string]any, error) {
|
||||
if opts == nil {
|
||||
opts = map[string]any{}
|
||||
}
|
||||
cfg := oidc.ParseConfig(opts)
|
||||
if !cfg.Enabled() {
|
||||
return nil, fmt.Errorf("oidc: need client_id, client_secret, redirect_uri, and issuer (or authorize_url)")
|
||||
}
|
||||
out := clone(appBag)
|
||||
bag := map[string]any{
|
||||
"issuer": cfg.Issuer,
|
||||
"client_id": cfg.ClientID,
|
||||
"client_secret": cfg.ClientSecret,
|
||||
"redirect_uri": cfg.RedirectURI,
|
||||
"scopes": cfg.ScopesCSV(),
|
||||
"callback_path": cfg.Callback(),
|
||||
}
|
||||
if cfg.AuthorizeURL != "" {
|
||||
bag["authorize_url"] = cfg.AuthorizeURL
|
||||
}
|
||||
if cfg.TokenURL != "" {
|
||||
bag["token_url"] = cfg.TokenURL
|
||||
}
|
||||
if cfg.UserInfoURL != "" {
|
||||
bag["userinfo_url"] = cfg.UserInfoURL
|
||||
}
|
||||
out["oidc"] = bag
|
||||
authBag, _ := out["auth"].(map[string]any)
|
||||
if authBag == nil {
|
||||
authBag = map[string]any{}
|
||||
} else {
|
||||
authBag = clone(authBag)
|
||||
}
|
||||
authBag["oidc"] = true
|
||||
out["auth"] = authBag
|
||||
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 +295,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 +304,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 +323,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 +336,31 @@ 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: catalog/目录 (optional seed table); desk/管理台 (bool, default false) —
|
||||
// when true, listen mounts /_rbac/* API + desk UI; permission gates work either way.
|
||||
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
|
||||
authBag["rbac_desk"] = false
|
||||
if opts != nil {
|
||||
if v, ok := first(opts, "catalog", "目录"); ok && v != nil {
|
||||
authBag["permission_catalog"] = v
|
||||
}
|
||||
if v, ok := first(opts, "desk", "管理台"); ok {
|
||||
authBag["rbac_desk"] = boolish(v)
|
||||
}
|
||||
}
|
||||
out["auth"] = authBag
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// NormalizeAdminPrefix cleans and validates admin_prefix.
|
||||
func NormalizeAdminPrefix(raw string) (string, error) {
|
||||
path, err := cleanMountPath(raw)
|
||||
|
||||
@@ -114,6 +114,50 @@ func TestAuthDefaultGate(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestAuthNoAutoGateWhenAdminOff(t *testing.T) {
|
||||
a := app.New(map[string]any{"admin": false})
|
||||
out, err := app.Auth(a, []any{}, map[string]any{"login_path": "/login"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if gates, ok := out["gates"].([]any); ok && len(gates) != 0 {
|
||||
t.Fatalf("expected no auto gate when admin=false, got %v", gates)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRbacDeskOptIn(t *testing.T) {
|
||||
a := app.New(map[string]any{"admin": false})
|
||||
out, err := app.Rbac(a, nil)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
authBag := out["auth"].(map[string]any)
|
||||
if !boolishTest(authBag["rbac"]) || boolishTest(authBag["rbac_desk"]) {
|
||||
t.Fatalf("default rbac_desk should be false: %v", authBag)
|
||||
}
|
||||
out2, err := app.Rbac(a, map[string]any{"管理台": true})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !boolishTest(out2["auth"].(map[string]any)["rbac_desk"]) {
|
||||
t.Fatal("expected rbac_desk true")
|
||||
}
|
||||
}
|
||||
|
||||
func boolishTest(v any) bool {
|
||||
switch x := v.(type) {
|
||||
case bool:
|
||||
return x
|
||||
case string:
|
||||
s := strings.ToLower(strings.TrimSpace(x))
|
||||
return s == "1" || s == "true" || s == "yes" || s == "真"
|
||||
case float64:
|
||||
return x != 0
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
func TestAuthCustomPrefix(t *testing.T) {
|
||||
a := app.New(map[string]any{"admin": true})
|
||||
out, err := app.Auth(a, []any{}, map[string]any{
|
||||
|
||||
@@ -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).
|
||||
|
||||
@@ -152,14 +152,10 @@ func ComposeComponents(page any, layout any, callLib CallLib) (any, error) {
|
||||
return obj, nil
|
||||
}
|
||||
|
||||
// ComposeMain merges a main bind table into a page bag.
|
||||
func ComposeMain(page any, mainTable any, callLib CallLib) (any, error) {
|
||||
obj := asObject(page)
|
||||
func resolveBinds(mainTable any, callLib CallLib) (binds []any, css string, err error) {
|
||||
raw := table.AsBind(mainTable)
|
||||
arr, _ := raw.([]any)
|
||||
binds := make([]any, 0, len(arr))
|
||||
css := strField(obj, "styles_css")
|
||||
|
||||
binds = make([]any, 0, len(arr))
|
||||
for _, b := range arr {
|
||||
bm, ok := b.(map[string]any)
|
||||
if !ok {
|
||||
@@ -191,7 +187,7 @@ func ComposeMain(page any, mainTable any, callLib CallLib) (any, error) {
|
||||
case table.SitePathLibMember:
|
||||
st, err := callLib(sp.Lib + "." + sp.Member)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return nil, "", err
|
||||
}
|
||||
css += table.AsCSSNamed(sp.Member, st)
|
||||
cssName = sp.Member
|
||||
@@ -207,6 +203,17 @@ func ComposeMain(page any, mainTable any, callLib CallLib) (any, error) {
|
||||
"css": cssName,
|
||||
})
|
||||
}
|
||||
return binds, css, nil
|
||||
}
|
||||
|
||||
// ComposeMain merges a main bind table into a page bag.
|
||||
func ComposeMain(page any, mainTable any, callLib CallLib) (any, error) {
|
||||
obj := asObject(page)
|
||||
binds, cssExtra, err := resolveBinds(mainTable, callLib)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
css := strField(obj, "styles_css") + cssExtra
|
||||
|
||||
if t, ok := table.BindTableName(binds); ok {
|
||||
obj["table"] = t
|
||||
@@ -234,6 +241,41 @@ func ComposeMain(page any, mainTable any, callLib CallLib) (any, error) {
|
||||
return obj, nil
|
||||
}
|
||||
|
||||
// ComposeList appends a secondary bind (detail + child list), with optional
|
||||
// query/order/target (inject into intro element id, same as form_target).
|
||||
func ComposeList(page any, mainTable any, query any, order, target string, callLib CallLib) (any, error) {
|
||||
obj := asObject(page)
|
||||
binds, cssExtra, err := resolveBinds(mainTable, callLib)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if cssExtra != "" {
|
||||
prev := strField(obj, "styles_css")
|
||||
if prev != "" {
|
||||
obj["styles_css"] = prev + cssExtra
|
||||
} else {
|
||||
obj["styles_css"] = cssExtra
|
||||
}
|
||||
}
|
||||
entry := map[string]any{"main": binds}
|
||||
if query != nil {
|
||||
entry["query"] = query
|
||||
}
|
||||
if strings.TrimSpace(order) != "" {
|
||||
entry["order"] = strings.TrimSpace(order)
|
||||
}
|
||||
if t := strings.TrimSpace(target); t != "" {
|
||||
entry["target"] = t
|
||||
}
|
||||
lists := []any{}
|
||||
if existing, ok := obj["lists"].([]any); ok {
|
||||
lists = append(lists, existing...)
|
||||
}
|
||||
lists = append(lists, entry)
|
||||
obj["lists"] = lists
|
||||
return obj, nil
|
||||
}
|
||||
|
||||
// ComposeForm embeds a form into the page main slot.
|
||||
func ComposeForm(page any, form any, formID string, formTarget *string) (any, error) {
|
||||
id := strings.TrimSpace(formID)
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
package compose
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// ComposeAuthForm stamps page.auth_form for progressive-enhancement login/register.
|
||||
// action is the form POST path (e.g. /login, /desk/login, /register).
|
||||
func ComposeAuthForm(page any, action, submit, formID, errID, target, nextDefault, kind string) (any, error) {
|
||||
action = strings.TrimSpace(action)
|
||||
if action == "" {
|
||||
return nil, fmt.Errorf("compose_auth_form requires non-empty action")
|
||||
}
|
||||
obj := asObject(page)
|
||||
kind = strings.TrimSpace(strings.ToLower(kind))
|
||||
if kind == "" {
|
||||
if strings.Contains(strings.ToLower(action), "register") {
|
||||
kind = "register"
|
||||
} else {
|
||||
kind = "login"
|
||||
}
|
||||
}
|
||||
spec := map[string]any{
|
||||
"action": action,
|
||||
"kind": kind,
|
||||
}
|
||||
if s := strings.TrimSpace(submit); s != "" {
|
||||
spec["submit"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(formID); s != "" {
|
||||
spec["form_id"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(errID); s != "" {
|
||||
spec["err_id"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(target); s != "" {
|
||||
spec["target"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(nextDefault); s != "" {
|
||||
spec["next"] = s
|
||||
}
|
||||
obj["auth_form"] = spec
|
||||
return obj, nil
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package compose
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// ComposeFormLoad stamps page.form_load so render prefills the composed form
|
||||
// from DB by route/query id (desk edit pages without author JS).
|
||||
func ComposeFormLoad(page any, table, idParam string) (any, error) {
|
||||
obj := asObject(page)
|
||||
table = strings.TrimSpace(table)
|
||||
if table == "" {
|
||||
return nil, fmt.Errorf("compose_form_load requires non-empty table")
|
||||
}
|
||||
spec := map[string]any{"table": table}
|
||||
if s := strings.TrimSpace(idParam); s != "" {
|
||||
spec["id_param"] = s
|
||||
} else {
|
||||
spec["id_param"] = "id"
|
||||
}
|
||||
obj["form_load"] = spec
|
||||
return obj, nil
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package compose
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestComposeFormLoad(t *testing.T) {
|
||||
page := map[string]any{"title": "Edit"}
|
||||
out, err := ComposeFormLoad(page, "posts", "")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
obj, ok := out.(map[string]any)
|
||||
if !ok {
|
||||
t.Fatalf("want map, got %T", out)
|
||||
}
|
||||
load, ok := obj["form_load"].(map[string]any)
|
||||
if !ok {
|
||||
t.Fatalf("missing form_load: %#v", obj)
|
||||
}
|
||||
if load["table"] != "posts" {
|
||||
t.Fatalf("table=%v", load["table"])
|
||||
}
|
||||
if load["id_param"] != "id" {
|
||||
t.Fatalf("id_param=%v", load["id_param"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestComposeFormLoadRequiresTable(t *testing.T) {
|
||||
_, err := ComposeFormLoad(map[string]any{}, " ", "id")
|
||||
if err == nil {
|
||||
t.Fatal("expected error for empty table")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,437 @@
|
||||
package compose
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"html"
|
||||
"strings"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/table"
|
||||
)
|
||||
|
||||
// ComposeIntro binds an intro table (|属性|值|样式| / |front|back|style|) onto the
|
||||
// page — same shape as ComposeMain. Literals go in 值/back; 样式 resolves like
|
||||
// card_title into styles_css + element class names. Sets page.intro HTML.
|
||||
//
|
||||
// Unlike AsBind, the 值/back column is not NormalizeRef'd so inline `code`
|
||||
// markers survive for richText.
|
||||
func ComposeIntro(page any, introTable any, callLib CallLib) (any, error) {
|
||||
obj := asObject(page)
|
||||
arr := asIntroRows(introTable)
|
||||
css := strField(obj, "styles_css")
|
||||
seenStyle := map[string]bool{}
|
||||
binds := make([]map[string]any, 0, len(arr))
|
||||
|
||||
for _, bm := range arr {
|
||||
front := table.NormalizeRef(strField(bm, "front"))
|
||||
backRaw := strings.TrimSpace(strField(bm, "back"))
|
||||
cssRaw := table.NormalizeRef(strField(bm, "css"))
|
||||
|
||||
back := backRaw
|
||||
switch sp := table.ParseSitePath(backRaw); sp.Kind {
|
||||
case table.SitePathLibMember:
|
||||
// Intro copy is almost always prose; only resolve clear lib.member refs
|
||||
// that look like style/module paths (no spaces).
|
||||
if !strings.ContainsAny(backRaw, " \t\n") {
|
||||
v, err := callLib(sp.Lib + "." + sp.Member)
|
||||
if err != nil {
|
||||
back = sp.Lib + "." + sp.Member
|
||||
} else if s, ok := v.(string); ok {
|
||||
back = s
|
||||
} else {
|
||||
back = fmt.Sprint(v)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
cssName := ""
|
||||
if cssRaw != "" {
|
||||
switch sp := table.ParseSitePath(cssRaw); sp.Kind {
|
||||
case table.SitePathLibMember:
|
||||
cssName = sp.Member
|
||||
if !seenStyle[cssName] {
|
||||
st, err := callLib(sp.Lib + "." + sp.Member)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
css += table.AsCSSNamed(sp.Member, st)
|
||||
seenStyle[cssName] = true
|
||||
}
|
||||
case table.SitePathPlain:
|
||||
cssName = sp.Plain
|
||||
case table.SitePathDbField:
|
||||
cssName = table.NormalizeRef(cssRaw)
|
||||
}
|
||||
}
|
||||
|
||||
if front == "" && back == "" {
|
||||
continue
|
||||
}
|
||||
binds = append(binds, map[string]any{
|
||||
"front": front,
|
||||
"back": back,
|
||||
"css": cssName,
|
||||
})
|
||||
}
|
||||
|
||||
obj["intro"] = RenderIntroHTML(binds)
|
||||
obj["intro_bind"] = binds
|
||||
if css != "" {
|
||||
obj["styles_css"] = css
|
||||
}
|
||||
return obj, nil
|
||||
}
|
||||
|
||||
// MakeIntroHTML builds intro HTML from a bind table without resolving lib styles
|
||||
// (css column used as class name as-is). Preserves backticks in 值/back.
|
||||
func MakeIntroHTML(introTable any) string {
|
||||
arr := asIntroRows(introTable)
|
||||
binds := make([]map[string]any, 0, len(arr))
|
||||
for _, bm := range arr {
|
||||
front := table.NormalizeRef(strField(bm, "front"))
|
||||
back := strings.TrimSpace(strField(bm, "back"))
|
||||
cssName := table.NormalizeRef(strField(bm, "css"))
|
||||
if front == "" && back == "" {
|
||||
continue
|
||||
}
|
||||
binds = append(binds, map[string]any{
|
||||
"front": front,
|
||||
"back": back,
|
||||
"css": cssName,
|
||||
})
|
||||
}
|
||||
return RenderIntroHTML(binds)
|
||||
}
|
||||
|
||||
func asIntroRows(v any) []map[string]any {
|
||||
switch t := v.(type) {
|
||||
case []any:
|
||||
out := make([]map[string]any, 0, len(t))
|
||||
for _, row := range t {
|
||||
m, ok := row.(map[string]any)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
front, back, css := "", "", ""
|
||||
if x, ok := pickIntro(m, []string{"属性", "前端变量", "front", "field"}); ok {
|
||||
front = cellIntro(x)
|
||||
}
|
||||
if x, ok := pickIntro(m, []string{"值", "后端数据库", "back", "db", "text", "文"}); ok {
|
||||
back = cellIntro(x)
|
||||
}
|
||||
if x, ok := pickIntro(m, []string{"样式", "绑定css样式", "css", "class", "style"}); ok {
|
||||
css = cellIntro(x)
|
||||
}
|
||||
if front != "" || back != "" {
|
||||
out = append(out, map[string]any{"front": front, "back": back, "css": css})
|
||||
}
|
||||
}
|
||||
return out
|
||||
case map[string]any:
|
||||
// Column-oriented map of lists (GFM multi-row table).
|
||||
fronts, backs, csses := []string{}, []string{}, []string{}
|
||||
if x, ok := pickIntro(t, []string{"属性", "前端变量", "front", "field"}); ok {
|
||||
fronts = asIntroStrList(x)
|
||||
}
|
||||
if x, ok := pickIntro(t, []string{"值", "后端数据库", "back", "db", "text", "文"}); ok {
|
||||
backs = asIntroStrList(x)
|
||||
}
|
||||
if x, ok := pickIntro(t, []string{"样式", "绑定css样式", "css", "class", "style"}); ok {
|
||||
csses = asIntroStrList(x)
|
||||
}
|
||||
n := len(fronts)
|
||||
if len(backs) > n {
|
||||
n = len(backs)
|
||||
}
|
||||
out := make([]map[string]any, 0, n)
|
||||
for i := 0; i < n; i++ {
|
||||
front, back, css := "", "", ""
|
||||
if i < len(fronts) {
|
||||
front = fronts[i]
|
||||
}
|
||||
if i < len(backs) {
|
||||
back = backs[i]
|
||||
}
|
||||
if i < len(csses) {
|
||||
css = csses[i]
|
||||
}
|
||||
if front != "" || back != "" {
|
||||
out = append(out, map[string]any{"front": front, "back": back, "css": css})
|
||||
}
|
||||
}
|
||||
return out
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func asIntroStrList(v any) []string {
|
||||
switch t := v.(type) {
|
||||
case []any:
|
||||
out := make([]string, 0, len(t))
|
||||
for _, x := range t {
|
||||
out = append(out, cellIntro(x))
|
||||
}
|
||||
return out
|
||||
case []string:
|
||||
return t
|
||||
default:
|
||||
s := cellIntro(v)
|
||||
if s == "" {
|
||||
return nil
|
||||
}
|
||||
return []string{s}
|
||||
}
|
||||
}
|
||||
|
||||
func pickIntro(m map[string]any, keys []string) (any, bool) {
|
||||
for _, k := range keys {
|
||||
if v, ok := m[k]; ok {
|
||||
return v, true
|
||||
}
|
||||
}
|
||||
return nil, false
|
||||
}
|
||||
|
||||
func cellIntro(v any) string {
|
||||
switch t := v.(type) {
|
||||
case nil:
|
||||
return ""
|
||||
case string:
|
||||
return t
|
||||
case bool:
|
||||
if t {
|
||||
return "true"
|
||||
}
|
||||
return "false"
|
||||
case float64:
|
||||
if t == float64(int64(t)) {
|
||||
return fmt.Sprintf("%d", int64(t))
|
||||
}
|
||||
return fmt.Sprintf("%v", t)
|
||||
default:
|
||||
return fmt.Sprint(t)
|
||||
}
|
||||
}
|
||||
|
||||
// RenderIntroHTML turns normalized intro binds into .main-intro inner HTML.
|
||||
func RenderIntroHTML(binds []map[string]any) string {
|
||||
if len(binds) == 0 {
|
||||
return ""
|
||||
}
|
||||
var out strings.Builder
|
||||
i := 0
|
||||
for i < len(binds) {
|
||||
front := strings.TrimSpace(strField(binds[i], "front"))
|
||||
kind := introKind(front)
|
||||
switch kind {
|
||||
case "claim":
|
||||
j := i
|
||||
for j < len(binds) && introKind(strField(binds[j], "front")) == "claim" {
|
||||
j++
|
||||
}
|
||||
out.WriteString(`<p class="claim">`)
|
||||
for _, row := range binds[i:j] {
|
||||
cls := classAttr(strField(row, "css"))
|
||||
out.WriteString(fmt.Sprintf("<span%s>%s</span>", cls, richText(strField(row, "back"))))
|
||||
}
|
||||
out.WriteString(`</p>`)
|
||||
i = j
|
||||
case "step":
|
||||
j := i
|
||||
for j < len(binds) && introKind(strField(binds[j], "front")) == "step" {
|
||||
j++
|
||||
}
|
||||
out.WriteString(`<ol class="steps">`)
|
||||
for _, row := range binds[i:j] {
|
||||
cls := classAttr(strField(row, "css"))
|
||||
out.WriteString(fmt.Sprintf("<li%s>%s</li>", cls, richText(strField(row, "back"))))
|
||||
}
|
||||
out.WriteString(`</ol>`)
|
||||
i = j
|
||||
case "mount":
|
||||
id := strField(binds[i], "back")
|
||||
if id == "" {
|
||||
id = front
|
||||
}
|
||||
id = strings.TrimPrefix(id, "#")
|
||||
out.WriteString(fmt.Sprintf(`<div id="%s"></div>`, html.EscapeString(id)))
|
||||
i++
|
||||
case "html":
|
||||
out.WriteString(strField(binds[i], "back"))
|
||||
i++
|
||||
default:
|
||||
tag, baseClass := introTagClass(kind, front)
|
||||
cssName := strField(binds[i], "css")
|
||||
cls := mergeClass(baseClass, cssName)
|
||||
out.WriteString(fmt.Sprintf("<%s%s>%s</%s>", tag, classAttr(cls), richText(strField(binds[i], "back")), tag))
|
||||
i++
|
||||
}
|
||||
}
|
||||
return out.String()
|
||||
}
|
||||
|
||||
func introKind(front string) string {
|
||||
s := strings.ToLower(strings.TrimSpace(front))
|
||||
switch s {
|
||||
case "kicker", "eyebrow", "眉题":
|
||||
return "kicker"
|
||||
case "title", "h1", "标题":
|
||||
return "title"
|
||||
case "lede", "lead", "导语":
|
||||
return "lede"
|
||||
case "claim", "badge", "标签":
|
||||
return "claim"
|
||||
case "step", "步骤":
|
||||
return "step"
|
||||
case "h2", "小标题":
|
||||
return "h2"
|
||||
case "p", "段落":
|
||||
return "p"
|
||||
case "mount", "插槽", "slot":
|
||||
return "mount"
|
||||
case "html", "原文", "raw":
|
||||
return "html"
|
||||
default:
|
||||
return s
|
||||
}
|
||||
}
|
||||
|
||||
func introTagClass(kind, front string) (tag, baseClass string) {
|
||||
switch kind {
|
||||
case "kicker":
|
||||
return "p", "kicker"
|
||||
case "title":
|
||||
return "h1", ""
|
||||
case "lede":
|
||||
return "p", "lede"
|
||||
case "h2":
|
||||
return "h2", ""
|
||||
case "p":
|
||||
return "p", ""
|
||||
default:
|
||||
if front != "" {
|
||||
return "p", front
|
||||
}
|
||||
return "p", ""
|
||||
}
|
||||
}
|
||||
|
||||
func mergeClass(base, style string) string {
|
||||
base = strings.TrimSpace(base)
|
||||
style = strings.TrimSpace(style)
|
||||
switch {
|
||||
case base == "":
|
||||
return style
|
||||
case style == "" || style == base:
|
||||
return base
|
||||
default:
|
||||
return base + " " + style
|
||||
}
|
||||
}
|
||||
|
||||
func classAttr(class string) string {
|
||||
class = strings.TrimSpace(class)
|
||||
if class == "" {
|
||||
return ""
|
||||
}
|
||||
return ` class="` + html.EscapeString(class) + `"`
|
||||
}
|
||||
|
||||
// richText escapes text then applies a tiny Markdown subset: [label](url), `code`, **bold**.
|
||||
func richText(s string) string {
|
||||
if s == "" {
|
||||
return ""
|
||||
}
|
||||
type span struct {
|
||||
kind string // text|a|code|strong
|
||||
a string
|
||||
b string
|
||||
}
|
||||
var spans []span
|
||||
rest := s
|
||||
for len(rest) > 0 {
|
||||
// find earliest special
|
||||
iLink := strings.Index(rest, "[")
|
||||
iCode := strings.Index(rest, "`")
|
||||
iBold := strings.Index(rest, "**")
|
||||
next := -1
|
||||
which := ""
|
||||
if iLink >= 0 && (next < 0 || iLink < next) {
|
||||
next, which = iLink, "a"
|
||||
}
|
||||
if iCode >= 0 && (next < 0 || iCode < next) {
|
||||
next, which = iCode, "code"
|
||||
}
|
||||
if iBold >= 0 && (next < 0 || iBold < next) {
|
||||
next, which = iBold, "strong"
|
||||
}
|
||||
if next < 0 {
|
||||
spans = append(spans, span{kind: "text", a: rest})
|
||||
break
|
||||
}
|
||||
if next > 0 {
|
||||
spans = append(spans, span{kind: "text", a: rest[:next]})
|
||||
}
|
||||
rest = rest[next:]
|
||||
switch which {
|
||||
case "a":
|
||||
// [label](url)
|
||||
endLabel := strings.Index(rest, "](")
|
||||
if endLabel < 0 {
|
||||
spans = append(spans, span{kind: "text", a: rest[:1]})
|
||||
rest = rest[1:]
|
||||
continue
|
||||
}
|
||||
endURL := strings.Index(rest[endLabel+2:], ")")
|
||||
if endURL < 0 {
|
||||
spans = append(spans, span{kind: "text", a: rest[:1]})
|
||||
rest = rest[1:]
|
||||
continue
|
||||
}
|
||||
label := rest[1:endLabel]
|
||||
url := rest[endLabel+2 : endLabel+2+endURL]
|
||||
spans = append(spans, span{kind: "a", a: label, b: url})
|
||||
rest = rest[endLabel+2+endURL+1:]
|
||||
case "code":
|
||||
end := strings.Index(rest[1:], "`")
|
||||
if end < 0 {
|
||||
spans = append(spans, span{kind: "text", a: rest[:1]})
|
||||
rest = rest[1:]
|
||||
continue
|
||||
}
|
||||
spans = append(spans, span{kind: "code", a: rest[1 : 1+end]})
|
||||
rest = rest[1+end+1:]
|
||||
case "strong":
|
||||
end := strings.Index(rest[2:], "**")
|
||||
if end < 0 {
|
||||
spans = append(spans, span{kind: "text", a: rest[:2]})
|
||||
rest = rest[2:]
|
||||
continue
|
||||
}
|
||||
spans = append(spans, span{kind: "strong", a: rest[2 : 2+end]})
|
||||
rest = rest[2+end+2:]
|
||||
}
|
||||
}
|
||||
var out strings.Builder
|
||||
for _, sp := range spans {
|
||||
switch sp.kind {
|
||||
case "a":
|
||||
out.WriteString(`<a href="`)
|
||||
out.WriteString(html.EscapeString(sp.b))
|
||||
out.WriteString(`">`)
|
||||
out.WriteString(html.EscapeString(sp.a))
|
||||
out.WriteString(`</a>`)
|
||||
case "code":
|
||||
out.WriteString(`<code>`)
|
||||
out.WriteString(html.EscapeString(sp.a))
|
||||
out.WriteString(`</code>`)
|
||||
case "strong":
|
||||
out.WriteString(`<strong>`)
|
||||
out.WriteString(html.EscapeString(sp.a))
|
||||
out.WriteString(`</strong>`)
|
||||
default:
|
||||
out.WriteString(html.EscapeString(sp.a))
|
||||
}
|
||||
}
|
||||
return out.String()
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package compose
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestComposeListAppends(t *testing.T) {
|
||||
page := map[string]any{"title": "p"}
|
||||
main := []any{
|
||||
map[string]any{"front": "title", "back": "comments.author", "css": ""},
|
||||
map[string]any{"front": "body", "back": "comments.body", "css": ""},
|
||||
}
|
||||
q := []any{map[string]any{"field": "post_slug", "op": "=", "value": "{slug}"}}
|
||||
out, err := ComposeList(page, main, q, "-created_at", "#comment-list", func(string) (any, error) {
|
||||
return nil, nil
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
m := out.(map[string]any)
|
||||
lists, ok := m["lists"].([]any)
|
||||
if !ok || len(lists) != 1 {
|
||||
t.Fatalf("lists=%v", m["lists"])
|
||||
}
|
||||
entry := lists[0].(map[string]any)
|
||||
if entry["order"] != "-created_at" || entry["target"] != "#comment-list" {
|
||||
t.Fatalf("entry=%v", entry)
|
||||
}
|
||||
if entry["query"] == nil {
|
||||
t.Fatal("missing query")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
package compose
|
||||
|
||||
import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
// ComposeNavBrand stamps page.nav_brand for SSR topnav lockup (logo + title),
|
||||
// theme toggle, and drawer button chrome. Client WASM only wires behavior.
|
||||
func ComposeNavBrand(page any, title, href, logo, logoLight, themeKey string) (any, error) {
|
||||
obj := asObject(page)
|
||||
spec := map[string]any{}
|
||||
if s := strings.TrimSpace(title); s != "" {
|
||||
spec["title"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(href); s != "" {
|
||||
spec["href"] = s
|
||||
} else {
|
||||
spec["href"] = "/"
|
||||
}
|
||||
if s := strings.TrimSpace(logo); s != "" {
|
||||
spec["logo"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(logoLight); s != "" {
|
||||
spec["logo_light"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(themeKey); s != "" {
|
||||
spec["theme_key"] = s
|
||||
} else {
|
||||
spec["theme_key"] = "mq-theme"
|
||||
}
|
||||
obj["nav_brand"] = spec
|
||||
return obj, nil
|
||||
}
|
||||
|
||||
// ComposeClient stamps page.client so render injects official bridge auto-mount
|
||||
// (data-mq-wasm / data-mq-source-url). Authors ship client.mq.md, not business JS.
|
||||
func ComposeClient(page any, bridge, wasm, source string) (any, error) {
|
||||
obj := asObject(page)
|
||||
spec := map[string]any{}
|
||||
if s := strings.TrimSpace(bridge); s != "" {
|
||||
spec["bridge"] = s
|
||||
} else {
|
||||
spec["bridge"] = "/static/marqdo-bridge.js"
|
||||
}
|
||||
if s := strings.TrimSpace(wasm); s != "" {
|
||||
spec["wasm"] = s
|
||||
} else {
|
||||
spec["wasm"] = "/static/marqdo_wasm.wasm"
|
||||
}
|
||||
if s := strings.TrimSpace(source); s != "" {
|
||||
spec["source"] = s
|
||||
}
|
||||
obj["client"] = spec
|
||||
return obj, nil
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package compose_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/compose"
|
||||
)
|
||||
|
||||
func TestComposeNavBrandAndClient(t *testing.T) {
|
||||
page := map[string]any{"title": "t"}
|
||||
out, err := compose.ComposeNavBrand(page, "求道量子", "/", "/static/logo.png", "/static/logo-light.png", "mq-theme")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
m := out.(map[string]any)
|
||||
b, ok := m["nav_brand"].(map[string]any)
|
||||
if !ok || b["title"] != "求道量子" || b["logo"] != "/static/logo.png" {
|
||||
t.Fatalf("nav_brand: %#v", m["nav_brand"])
|
||||
}
|
||||
out, err = compose.ComposeClient(m, "", "", "/static/client.mq.md")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
m = out.(map[string]any)
|
||||
c, ok := m["client"].(map[string]any)
|
||||
if !ok || c["source"] != "/static/client.mq.md" {
|
||||
t.Fatalf("client: %#v", m["client"])
|
||||
}
|
||||
if c["bridge"] != "/static/marqdo-bridge.js" {
|
||||
t.Fatalf("bridge default: %#v", c)
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,80 @@
|
||||
package compose_test
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/compose"
|
||||
)
|
||||
|
||||
func TestComposeIntroBindAndRichText(t *testing.T) {
|
||||
page := map[string]any{"title": "Home"}
|
||||
intro := []any{
|
||||
map[string]any{"属性": "kicker", "值": "WWW Demo", "样式": "shell.kicker"},
|
||||
map[string]any{"属性": "title", "值": "Marqdo", "样式": "shell.intro_title"},
|
||||
map[string]any{"属性": "lede", "值": "Zero author `JS`.", "样式": "shell.lede"},
|
||||
map[string]any{"属性": "claim", "值": "0 JS", "样式": "shell.claim"},
|
||||
map[string]any{"属性": "claim", "值": "GFM", "样式": "shell.claim"},
|
||||
map[string]any{"属性": "step", "值": "Open [New](/new) now.", "样式": "shell.step"},
|
||||
map[string]any{"属性": "step", "值": "Compare source.", "样式": "shell.step"},
|
||||
}
|
||||
callLib := func(path string) (any, error) {
|
||||
switch path {
|
||||
case "shell.kicker", "shell.intro_title", "shell.lede", "shell.claim", "shell.step":
|
||||
return map[string]any{
|
||||
"property": []any{"color"},
|
||||
"value": []any{"red"},
|
||||
}, nil
|
||||
default:
|
||||
t.Fatalf("unexpected callLib %q", path)
|
||||
return nil, nil
|
||||
}
|
||||
}
|
||||
out, err := compose.ComposeIntro(page, intro, callLib)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
obj := out.(map[string]any)
|
||||
html, _ := obj["intro"].(string)
|
||||
for _, want := range []string{
|
||||
`class="kicker"`,
|
||||
`<h1 class="intro_title">Marqdo</h1>`,
|
||||
`<code>JS</code>`,
|
||||
`<p class="claim">`,
|
||||
`<span class="claim">0 JS</span>`,
|
||||
`<ol class="steps">`,
|
||||
`<a href="/new">New</a>`,
|
||||
} {
|
||||
if !strings.Contains(html, want) {
|
||||
t.Fatalf("missing %q in html=%q", want, html)
|
||||
}
|
||||
}
|
||||
css, _ := obj["styles_css"].(string)
|
||||
if !strings.Contains(css, ".kicker") || !strings.Contains(css, ".intro_title") {
|
||||
t.Fatalf("styles_css incomplete: %q", css)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMakeIntroHTMLZHAliases(t *testing.T) {
|
||||
tbl := []any{
|
||||
map[string]any{"属性": "眉题", "值": "演示", "样式": "kicker"},
|
||||
map[string]any{"属性": "标题", "值": "站名", "样式": "intro_title"},
|
||||
map[string]any{"属性": "标签", "值": "A", "样式": "claim"},
|
||||
map[string]any{"属性": "步骤", "值": "第一步", "样式": "step"},
|
||||
}
|
||||
html := compose.MakeIntroHTML(tbl)
|
||||
for _, want := range []string{
|
||||
`class="kicker"`,
|
||||
`<h1 class="intro_title">站名</h1>`,
|
||||
`<p class="claim">`,
|
||||
`<ol class="steps">`,
|
||||
} {
|
||||
if !strings.Contains(html, want) {
|
||||
t.Fatalf("missing %q in %q", want, html)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestComposeComponentsFakeCallLib(t *testing.T) {
|
||||
page := map[string]any{
|
||||
"title": "Home",
|
||||
|
||||
+101
-11
@@ -12,6 +12,7 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/table"
|
||||
_ "github.com/jackc/pgx/v5/stdlib"
|
||||
_ "modernc.org/sqlite"
|
||||
)
|
||||
|
||||
@@ -54,13 +55,27 @@ func pathOf(url string) string {
|
||||
}
|
||||
|
||||
func open(url string) (*sql.DB, error) {
|
||||
path := pathOf(url)
|
||||
poolMu.Lock()
|
||||
defer poolMu.Unlock()
|
||||
key := ResolveURL(url)
|
||||
if db, ok := pool[key]; ok {
|
||||
return db, nil
|
||||
}
|
||||
if IsPostgres(url) {
|
||||
db, err := sql.Open("pgx", key)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
db.SetMaxOpenConns(16)
|
||||
db.SetMaxIdleConns(4)
|
||||
if err := db.Ping(); err != nil {
|
||||
_ = db.Close()
|
||||
return nil, fmt.Errorf("postgres ping: %w", err)
|
||||
}
|
||||
pool[key] = db
|
||||
return db, nil
|
||||
}
|
||||
path := pathOf(url)
|
||||
if parent := filepath.Dir(path); parent != "" && parent != "." {
|
||||
if err := os.MkdirAll(parent, 0o755); err != nil {
|
||||
return nil, err
|
||||
@@ -78,6 +93,12 @@ func open(url string) (*sql.DB, error) {
|
||||
return db, nil
|
||||
}
|
||||
|
||||
// OpenSQL returns a pooled *sql.DB (sqlite or postgres). Prefer OpenSQLDB when
|
||||
// issuing `?` placeholders against Postgres (RBAC).
|
||||
func OpenSQL(url string) (*sql.DB, error) {
|
||||
return open(url)
|
||||
}
|
||||
|
||||
// ResetPool closes pooled connections and open transactions (tests).
|
||||
func ResetPool() {
|
||||
resetTxns()
|
||||
@@ -117,6 +138,17 @@ func sqlType(t string) string {
|
||||
}
|
||||
}
|
||||
|
||||
func sqlTypeFor(url, t string) string {
|
||||
ty := sqlType(t)
|
||||
if IsPostgres(url) && ty == "REAL" {
|
||||
return "DOUBLE PRECISION"
|
||||
}
|
||||
if IsPostgres(url) && ty == "BLOB" {
|
||||
return "BYTEA"
|
||||
}
|
||||
return ty
|
||||
}
|
||||
|
||||
func cellStr(v any) string {
|
||||
switch t := v.(type) {
|
||||
case nil:
|
||||
@@ -236,11 +268,15 @@ func Init(url, name string, fields any) (map[string]any, error) {
|
||||
nullable := boolField(m, []string{"nullable", "可空"}, true)
|
||||
unique := boolField(m, []string{"unique", "唯一"}, false)
|
||||
index := boolField(m, []string{"index", "索引"}, false)
|
||||
col := fmt.Sprintf(`"%s" %s`, colName, sqlType(ty))
|
||||
col := fmt.Sprintf(`"%s" %s`, colName, sqlTypeFor(url, ty))
|
||||
if colName == "id" && !hasPK {
|
||||
col += " PRIMARY KEY"
|
||||
if sqlType(ty) == "INTEGER" {
|
||||
col += " AUTOINCREMENT"
|
||||
if IsPostgres(url) && sqlType(ty) == "INTEGER" {
|
||||
col = fmt.Sprintf(`"%s" INTEGER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY`, colName)
|
||||
} else {
|
||||
col += " PRIMARY KEY"
|
||||
if sqlType(ty) == "INTEGER" {
|
||||
col += " AUTOINCREMENT"
|
||||
}
|
||||
}
|
||||
hasPK = true
|
||||
} else if !nullable {
|
||||
@@ -292,7 +328,26 @@ func Init(url, name string, fields any) (map[string]any, error) {
|
||||
}, nil
|
||||
}
|
||||
|
||||
func columnNames(c dbConn, tableName string) ([]string, error) {
|
||||
func columnNames(c dbConn, tableName string, dbURL string) ([]string, error) {
|
||||
if IsPostgres(dbURL) {
|
||||
rows, err := c.Query(`
|
||||
SELECT column_name FROM information_schema.columns
|
||||
WHERE table_schema = current_schema() AND table_name = ?
|
||||
ORDER BY ordinal_position`, tableName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var out []string
|
||||
for rows.Next() {
|
||||
var name string
|
||||
if err := rows.Scan(&name); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, name)
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
rows, err := c.Query(fmt.Sprintf(`PRAGMA table_info("%s")`, tableName))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -374,7 +429,7 @@ func Insert(url, tableName string, rows any, txnID ...string) (map[string]any, e
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
colsPresent, err := columnNames(c, tn)
|
||||
colsPresent, err := columnNames(c, tn, url)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -869,7 +924,7 @@ func Update(url, tableName, id string, row any, txnID ...string) (map[string]any
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
colsPresent, err := columnNames(c, tn)
|
||||
colsPresent, err := columnNames(c, tn, url)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -990,17 +1045,52 @@ type ColumnInfo struct {
|
||||
PK bool
|
||||
}
|
||||
|
||||
// TableInfo returns column metadata for a SQLite table.
|
||||
// TableInfo returns column metadata for a table (SQLite or Postgres).
|
||||
func TableInfo(url, tableName string) ([]ColumnInfo, error) {
|
||||
tn, err := ident(tableName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
db, err := open(url)
|
||||
c, err := connFor(url, "")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rows, err := db.Query(fmt.Sprintf(`PRAGMA table_info("%s")`, tn))
|
||||
if IsPostgres(url) {
|
||||
rows, err := c.Query(`
|
||||
SELECT c.column_name, c.data_type, c.is_nullable,
|
||||
CASE WHEN tc.constraint_type = 'PRIMARY KEY' THEN 1 ELSE 0 END AS is_pk
|
||||
FROM information_schema.columns c
|
||||
LEFT JOIN information_schema.key_column_usage kcu
|
||||
ON c.table_schema = kcu.table_schema AND c.table_name = kcu.table_name AND c.column_name = kcu.column_name
|
||||
LEFT JOIN information_schema.table_constraints tc
|
||||
ON kcu.constraint_name = tc.constraint_name AND kcu.table_schema = tc.table_schema
|
||||
AND tc.constraint_type = 'PRIMARY KEY'
|
||||
WHERE c.table_schema = current_schema() AND c.table_name = ?
|
||||
ORDER BY c.ordinal_position`, tn)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var out []ColumnInfo
|
||||
for rows.Next() {
|
||||
var name, dtype, nullable string
|
||||
var pk int
|
||||
if err := rows.Scan(&name, &dtype, &nullable, &pk); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if dtype == "" {
|
||||
dtype = "TEXT"
|
||||
}
|
||||
out = append(out, ColumnInfo{
|
||||
Name: name,
|
||||
SQLType: dtype,
|
||||
NotNull: strings.EqualFold(nullable, "NO"),
|
||||
PK: pk != 0,
|
||||
})
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
rows, err := c.Query(fmt.Sprintf(`PRAGMA table_info("%s")`, tn))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -0,0 +1,144 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// IsPostgres reports whether url selects the Postgres backend.
|
||||
func IsPostgres(url string) bool {
|
||||
lower := strings.ToLower(strings.TrimSpace(url))
|
||||
return strings.HasPrefix(lower, "postgres://") || strings.HasPrefix(lower, "postgresql://")
|
||||
}
|
||||
|
||||
// RewritePlaceholdersPG turns `?` into `$1,$2,…` for Postgres.
|
||||
func RewritePlaceholdersPG(sqlStmt string) string {
|
||||
var b strings.Builder
|
||||
b.Grow(len(sqlStmt) + 8)
|
||||
n := 0
|
||||
for _, c := range sqlStmt {
|
||||
if c == '?' {
|
||||
n++
|
||||
b.WriteByte('$')
|
||||
b.WriteString(itoa(n))
|
||||
} else {
|
||||
b.WriteRune(c)
|
||||
}
|
||||
}
|
||||
return b.String()
|
||||
}
|
||||
|
||||
func itoa(n int) string {
|
||||
// small positive ints only
|
||||
if n < 10 {
|
||||
return string(rune('0' + n))
|
||||
}
|
||||
var buf [12]byte
|
||||
i := len(buf)
|
||||
for n > 0 {
|
||||
i--
|
||||
buf[i] = byte('0' + n%10)
|
||||
n /= 10
|
||||
}
|
||||
return string(buf[i:])
|
||||
}
|
||||
|
||||
// rewritingDB rewrites `?` placeholders when talking to Postgres.
|
||||
type rewritingDB struct {
|
||||
db *sql.DB
|
||||
pg bool
|
||||
}
|
||||
|
||||
func (d *rewritingDB) Exec(query string, args ...any) (sql.Result, error) {
|
||||
if d.pg {
|
||||
query = RewritePlaceholdersPG(query)
|
||||
}
|
||||
return d.db.Exec(query, args...)
|
||||
}
|
||||
|
||||
func (d *rewritingDB) Query(query string, args ...any) (*sql.Rows, error) {
|
||||
if d.pg {
|
||||
query = RewritePlaceholdersPG(query)
|
||||
}
|
||||
return d.db.Query(query, args...)
|
||||
}
|
||||
|
||||
func (d *rewritingDB) QueryRow(query string, args ...any) *sql.Row {
|
||||
if d.pg {
|
||||
query = RewritePlaceholdersPG(query)
|
||||
}
|
||||
return d.db.QueryRow(query, args...)
|
||||
}
|
||||
|
||||
func (d *rewritingDB) Begin() (*sql.Tx, error) {
|
||||
return d.db.Begin()
|
||||
}
|
||||
|
||||
func (d *rewritingDB) Underlying() *sql.DB { return d.db }
|
||||
|
||||
type rewritingTx struct {
|
||||
tx *sql.Tx
|
||||
pg bool
|
||||
}
|
||||
|
||||
func (t *rewritingTx) Exec(query string, args ...any) (sql.Result, error) {
|
||||
if t.pg {
|
||||
query = RewritePlaceholdersPG(query)
|
||||
}
|
||||
return t.tx.Exec(query, args...)
|
||||
}
|
||||
|
||||
func (t *rewritingTx) Query(query string, args ...any) (*sql.Rows, error) {
|
||||
if t.pg {
|
||||
query = RewritePlaceholdersPG(query)
|
||||
}
|
||||
return t.tx.Query(query, args...)
|
||||
}
|
||||
|
||||
func (t *rewritingTx) QueryRow(query string, args ...any) *sql.Row {
|
||||
if t.pg {
|
||||
query = RewritePlaceholdersPG(query)
|
||||
}
|
||||
return t.tx.QueryRow(query, args...)
|
||||
}
|
||||
|
||||
func (t *rewritingTx) Commit() error { return t.tx.Commit() }
|
||||
func (t *rewritingTx) Rollback() error { return t.tx.Rollback() }
|
||||
|
||||
// SQLDB is *sql.DB with optional Postgres `?` rewrite (RBAC / admin).
|
||||
type SQLDB interface {
|
||||
Exec(query string, args ...any) (sql.Result, error)
|
||||
Query(query string, args ...any) (*sql.Rows, error)
|
||||
QueryRow(query string, args ...any) *sql.Row
|
||||
Begin() (SQLTx, error)
|
||||
}
|
||||
|
||||
// SQLTx is a transaction with optional placeholder rewrite.
|
||||
type SQLTx interface {
|
||||
Exec(query string, args ...any) (sql.Result, error)
|
||||
Query(query string, args ...any) (*sql.Rows, error)
|
||||
QueryRow(query string, args ...any) *sql.Row
|
||||
Commit() error
|
||||
Rollback() error
|
||||
}
|
||||
|
||||
type sqlDBHandle struct {
|
||||
*rewritingDB
|
||||
}
|
||||
|
||||
func (h *sqlDBHandle) Begin() (SQLTx, error) {
|
||||
tx, err := h.rewritingDB.Begin()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &rewritingTx{tx: tx, pg: h.pg}, nil
|
||||
}
|
||||
|
||||
// OpenSQLDB returns a pooled handle that rewrites `?` on Postgres.
|
||||
func OpenSQLDB(url string) (SQLDB, error) {
|
||||
raw, err := open(url)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &sqlDBHandle{rewritingDB: &rewritingDB{db: raw, pg: IsPostgres(url)}}, nil
|
||||
}
|
||||
@@ -23,14 +23,23 @@ type txnConn struct {
|
||||
}
|
||||
|
||||
func (t *txnConn) Exec(query string, args ...any) (sql.Result, error) {
|
||||
if IsPostgres(t.url) {
|
||||
query = RewritePlaceholdersPG(query)
|
||||
}
|
||||
return t.conn.ExecContext(context.Background(), query, args...)
|
||||
}
|
||||
|
||||
func (t *txnConn) Query(query string, args ...any) (*sql.Rows, error) {
|
||||
if IsPostgres(t.url) {
|
||||
query = RewritePlaceholdersPG(query)
|
||||
}
|
||||
return t.conn.QueryContext(context.Background(), query, args...)
|
||||
}
|
||||
|
||||
func (t *txnConn) QueryRow(query string, args ...any) *sql.Row {
|
||||
if IsPostgres(t.url) {
|
||||
query = RewritePlaceholdersPG(query)
|
||||
}
|
||||
return t.conn.QueryRowContext(context.Background(), query, args...)
|
||||
}
|
||||
|
||||
@@ -74,7 +83,11 @@ func connFor(url, txnID string) (dbConn, error) {
|
||||
}
|
||||
return t, nil
|
||||
}
|
||||
return open(url)
|
||||
raw, err := open(url)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &rewritingDB{db: raw, pg: IsPostgres(url)}, nil
|
||||
}
|
||||
|
||||
func takeTxn(txnID string) (*txnConn, error) {
|
||||
@@ -98,7 +111,7 @@ func resetTxns() {
|
||||
}
|
||||
}
|
||||
|
||||
// Begin starts a SQLite transaction (BEGIN IMMEDIATE).
|
||||
// Begin starts a transaction (BEGIN IMMEDIATE on SQLite, BEGIN on Postgres).
|
||||
// Returns {"_type":"txn","txn":id,"url":url,"事务":id,"地址":url}.
|
||||
func Begin(url string) (map[string]any, error) {
|
||||
db, err := open(url)
|
||||
@@ -109,7 +122,11 @@ func Begin(url string) (map[string]any, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if _, err := conn.ExecContext(context.Background(), "BEGIN IMMEDIATE"); err != nil {
|
||||
beginSQL := "BEGIN IMMEDIATE"
|
||||
if IsPostgres(url) {
|
||||
beginSQL = "BEGIN"
|
||||
}
|
||||
if _, err := conn.ExecContext(context.Background(), beginSQL); err != nil {
|
||||
_ = conn.Close()
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
package form
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
@@ -17,6 +18,7 @@ var (
|
||||
typeKeys = []string{"类型", "type"}
|
||||
reqKeys = []string{"必填", "required"}
|
||||
defKeys = []string{"默认", "default"}
|
||||
sourceKeys = []string{"来源", "source"}
|
||||
ruleFieldKeys = []string{"字段", "field", "name"}
|
||||
ruleKeys = []string{"规则", "rule"}
|
||||
msgKeys = []string{"消息", "message", "msg"}
|
||||
@@ -45,6 +47,8 @@ func normalizeAction(action string) string {
|
||||
switch action {
|
||||
case "update", "更新":
|
||||
return "update"
|
||||
case "delete", "删除":
|
||||
return "delete"
|
||||
case "":
|
||||
return "insert"
|
||||
default:
|
||||
@@ -66,6 +70,24 @@ func SetRules(formBag map[string]any, rules any) map[string]any {
|
||||
return out
|
||||
}
|
||||
|
||||
// SetLabels stamps localized submit / cancel button copy (and optional cancel href).
|
||||
// When cancelHref is set, also stamps redirect so successful POST lands on the list
|
||||
// (or other cancel target) instead of the composing page's _mq_return path.
|
||||
func SetLabels(formBag map[string]any, submit, cancel, cancelHref string) map[string]any {
|
||||
out := cloneMap(formBag)
|
||||
if s := strings.TrimSpace(submit); s != "" {
|
||||
out["submit"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(cancel); s != "" {
|
||||
out["cancel"] = s
|
||||
}
|
||||
if s := strings.TrimSpace(cancelHref); s != "" {
|
||||
out["cancel_href"] = s
|
||||
out["redirect"] = s
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func cloneMap(m map[string]any) map[string]any {
|
||||
out := map[string]any{}
|
||||
for k, v := range m {
|
||||
@@ -177,12 +199,19 @@ func asFormFields(fields any) []any {
|
||||
if v, ok := pick(m, defKeys); ok {
|
||||
def = cellStr(v)
|
||||
}
|
||||
source := "client"
|
||||
if v, ok := pick(m, sourceKeys); ok {
|
||||
if s := strings.TrimSpace(cellStr(v)); s != "" {
|
||||
source = s
|
||||
}
|
||||
}
|
||||
item := map[string]any{
|
||||
"name": name,
|
||||
"label": label,
|
||||
"type": ty,
|
||||
"required": required,
|
||||
"default": def,
|
||||
"source": normalizeSource(source),
|
||||
}
|
||||
if v, ok := m["pk"]; ok {
|
||||
item["pk"] = boolish(v)
|
||||
@@ -211,6 +240,10 @@ func asFormFields(fields any) []any {
|
||||
if v, ok := pick(t, defKeys); ok {
|
||||
defs = asStrList(v)
|
||||
}
|
||||
sources := []string{}
|
||||
if v, ok := pick(t, sourceKeys); ok {
|
||||
sources = asStrList(v)
|
||||
}
|
||||
var out []any
|
||||
for i, nameRaw := range names {
|
||||
name := table.NormalizeRef(nameRaw)
|
||||
@@ -233,12 +266,17 @@ func asFormFields(fields any) []any {
|
||||
if i < len(defs) {
|
||||
def = defs[i]
|
||||
}
|
||||
source := "client"
|
||||
if i < len(sources) && strings.TrimSpace(sources[i]) != "" {
|
||||
source = sources[i]
|
||||
}
|
||||
out = append(out, map[string]any{
|
||||
"name": name,
|
||||
"label": label,
|
||||
"type": ty,
|
||||
"required": required,
|
||||
"default": def,
|
||||
"source": normalizeSource(source),
|
||||
})
|
||||
}
|
||||
return out
|
||||
@@ -614,6 +652,11 @@ func strOf(m map[string]any, key, def string) string {
|
||||
|
||||
// RenderBody emits form markup only (no document shell).
|
||||
func RenderBody(formBag map[string]any, formID string, data, errors any, csrf string) string {
|
||||
return RenderBodyCtx(formBag, formID, data, errors, csrf, nil)
|
||||
}
|
||||
|
||||
// RenderBodyCtx is RenderBody plus request-context hidden fields for POST.
|
||||
func RenderBodyCtx(formBag map[string]any, formID string, data, errors any, csrf string, ctx *RequestContext) string {
|
||||
fields := fieldSlice(formBag)
|
||||
dataM := map[string]any{}
|
||||
if data != nil {
|
||||
@@ -646,6 +689,9 @@ func RenderBody(formBag map[string]any, formID string, data, errors any, csrf st
|
||||
if formBag != nil {
|
||||
rowID = cellStr(formBag["id"])
|
||||
}
|
||||
if rowID == "" {
|
||||
rowID = fieldText(dataM, "id")
|
||||
}
|
||||
showMeta := true
|
||||
if formBag != nil {
|
||||
if v, ok := formBag["show_meta"].(bool); ok {
|
||||
@@ -654,21 +700,28 @@ func RenderBody(formBag map[string]any, formID string, data, errors any, csrf st
|
||||
}
|
||||
|
||||
var body strings.Builder
|
||||
body.WriteString(`<div class="site-form">`)
|
||||
if showMeta {
|
||||
fmt.Fprintf(&body, `<p class="meta">table=<code>%s</code> · action=<code>%s</code> · id=<code>%s</code></p>`,
|
||||
esc(tableName), esc(action), esc(heading))
|
||||
}
|
||||
hasFile := false
|
||||
hasMarkdown := false
|
||||
for _, f := range fields {
|
||||
if fm, ok := f.(map[string]any); ok {
|
||||
ty, _ := fm["type"].(string)
|
||||
if strings.EqualFold(ty, "file") {
|
||||
hasFile = true
|
||||
break
|
||||
}
|
||||
if strings.EqualFold(ty, "markdown") {
|
||||
hasMarkdown = true
|
||||
}
|
||||
}
|
||||
}
|
||||
formClass := "site-form"
|
||||
if hasMarkdown {
|
||||
formClass += " editor-skin"
|
||||
}
|
||||
body.WriteString(`<div class="` + formClass + `">`)
|
||||
if showMeta {
|
||||
fmt.Fprintf(&body, `<p class="meta">table=<code>%s</code> · action=<code>%s</code> · id=<code>%s</code></p>`,
|
||||
esc(tableName), esc(action), esc(heading))
|
||||
}
|
||||
body.WriteString(`<form method="post" action="` + esc(postTo) + `"`)
|
||||
if hasFile {
|
||||
body.WriteString(` enctype="multipart/form-data"`)
|
||||
@@ -677,9 +730,32 @@ func RenderBody(formBag map[string]any, formID string, data, errors any, csrf st
|
||||
if csrf != "" {
|
||||
fmt.Fprintf(&body, `<input type="hidden" name="_csrf" value="%s"/>`, esc(csrf))
|
||||
}
|
||||
if action == "update" && rowID != "" {
|
||||
hasIDField := false
|
||||
for _, f := range fields {
|
||||
if fm, ok := f.(map[string]any); ok {
|
||||
if strOf(fm, "name", "") == "id" && IsClientSource(strOf(fm, "source", "client")) {
|
||||
hasIDField = true
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
if (action == "update" || action == "delete") && rowID != "" && !hasIDField {
|
||||
fmt.Fprintf(&body, `<input type="hidden" name="id" value="%s"/>`, esc(rowID))
|
||||
}
|
||||
if ctx != nil {
|
||||
if len(ctx.Params) > 0 {
|
||||
if b, err := json.Marshal(ctx.Params); err == nil {
|
||||
fmt.Fprintf(&body, `<input type="hidden" name="_mq_params" value="%s"/>`, esc(string(b)))
|
||||
}
|
||||
}
|
||||
ret := strings.TrimSpace(ctx.ReturnPath)
|
||||
if ret == "" {
|
||||
ret = strings.TrimSpace(ctx.Path)
|
||||
}
|
||||
if ret != "" && strings.HasPrefix(ret, "/") && !strings.HasPrefix(ret, "//") {
|
||||
fmt.Fprintf(&body, `<input type="hidden" name="_mq_return" value="%s"/>`, esc(ret))
|
||||
}
|
||||
}
|
||||
for _, f := range fields {
|
||||
fm, ok := f.(map[string]any)
|
||||
if !ok {
|
||||
@@ -689,6 +765,9 @@ func RenderBody(formBag map[string]any, formID string, data, errors any, csrf st
|
||||
if name == "" {
|
||||
continue
|
||||
}
|
||||
if !IsClientSource(strOf(fm, "source", "client")) {
|
||||
continue
|
||||
}
|
||||
label := strOf(fm, "label", name)
|
||||
ty := strOf(fm, "type", "text")
|
||||
required, _ := fm["required"].(bool)
|
||||
@@ -712,11 +791,26 @@ func RenderBody(formBag map[string]any, formID string, data, errors any, csrf st
|
||||
if required {
|
||||
reqAttr = " required"
|
||||
}
|
||||
if ty == "hidden" {
|
||||
fmt.Fprintf(&body, `<input type="hidden" name="%s" value="%s"/>`, esc(name), esc(value))
|
||||
continue
|
||||
}
|
||||
body.WriteString("<label>")
|
||||
body.WriteString(esc(label))
|
||||
if ty == "textarea" {
|
||||
fmt.Fprintf(&body, `<textarea name="%s" rows="5"%s>%s</textarea>`,
|
||||
esc(name), reqAttr, esc(value))
|
||||
if ty == "textarea" || ty == "markdown" {
|
||||
rows := "5"
|
||||
cls := ""
|
||||
if ty == "markdown" {
|
||||
rows = "18"
|
||||
cls = ` class="mq-markdown" data-mq-field="markdown"`
|
||||
body.WriteString(`<div class="md-field">`)
|
||||
fmt.Fprintf(&body, `<textarea name="%s" rows="%s"%s%s>%s</textarea>`,
|
||||
esc(name), rows, cls, reqAttr, esc(value))
|
||||
body.WriteString(`<div class="mq-md-preview md-pane-preview" aria-live="polite"></div></div>`)
|
||||
} else {
|
||||
fmt.Fprintf(&body, `<textarea name="%s" rows="%s"%s%s>%s</textarea>`,
|
||||
esc(name), rows, cls, reqAttr, esc(value))
|
||||
}
|
||||
} else {
|
||||
inputType := "text"
|
||||
switch ty {
|
||||
@@ -743,8 +837,28 @@ func RenderBody(formBag map[string]any, formID string, data, errors any, csrf st
|
||||
}
|
||||
body.WriteString("</label>")
|
||||
}
|
||||
fmt.Fprintf(&body, `<div class="actions"><button type="submit">Submit</button><a href="%s">cancel</a></div>`,
|
||||
esc(cancel))
|
||||
submitLabel := strOf(formBag, "submit", "")
|
||||
if submitLabel == "" {
|
||||
submitLabel = strOf(formBag, "提交", "")
|
||||
}
|
||||
if submitLabel == "" {
|
||||
submitLabel = "Submit"
|
||||
}
|
||||
cancelLabel := strOf(formBag, "cancel", "")
|
||||
if cancelLabel == "" {
|
||||
cancelLabel = strOf(formBag, "取消", "")
|
||||
}
|
||||
if cancelLabel == "" {
|
||||
cancelLabel = "cancel"
|
||||
}
|
||||
cancelHref := cancel
|
||||
if c := strOf(formBag, "cancel_href", ""); c != "" {
|
||||
cancelHref = c
|
||||
} else if c := strOf(formBag, "取消链接", ""); c != "" {
|
||||
cancelHref = c
|
||||
}
|
||||
fmt.Fprintf(&body, `<div class="actions"><button type="submit">%s</button><a href="%s">%s</a></div>`,
|
||||
esc(submitLabel), esc(cancelHref), esc(cancelLabel))
|
||||
body.WriteString(`</form></div>`)
|
||||
return body.String()
|
||||
}
|
||||
@@ -784,7 +898,7 @@ body{font-family:"IBM Plex Sans","Noto Sans SC",sans-serif;margin:1.5rem;backgro
|
||||
func Submit(formBag map[string]any, data any, dbURL string) (map[string]any, error) {
|
||||
action := strOf(formBag, "action", "insert")
|
||||
rowMap := dataMap(data)
|
||||
if action == "update" {
|
||||
if action == "update" || action == "delete" {
|
||||
if formBag != nil {
|
||||
if fid := cellStr(formBag["id"]); fid != "" {
|
||||
if _, ok := rowMap["id"]; !ok {
|
||||
@@ -793,14 +907,16 @@ func Submit(formBag map[string]any, data any, dbURL string) (map[string]any, err
|
||||
}
|
||||
}
|
||||
}
|
||||
v := Validate(formBag, nil, rowMap)
|
||||
ok, _ := v["ok"].(bool)
|
||||
if !ok {
|
||||
errs := v["errors"]
|
||||
if errs == nil {
|
||||
errs = []any{}
|
||||
if action != "delete" {
|
||||
v := Validate(formBag, nil, rowMap)
|
||||
ok, _ := v["ok"].(bool)
|
||||
if !ok {
|
||||
errs := v["errors"]
|
||||
if errs == nil {
|
||||
errs = []any{}
|
||||
}
|
||||
return map[string]any{"ok": false, "errors": errs}, nil
|
||||
}
|
||||
return map[string]any{"ok": false, "errors": errs}, nil
|
||||
}
|
||||
tableName := ""
|
||||
if formBag != nil {
|
||||
@@ -811,7 +927,20 @@ func Submit(formBag map[string]any, data any, dbURL string) (map[string]any, err
|
||||
}
|
||||
var result map[string]any
|
||||
var err error
|
||||
if action == "update" {
|
||||
switch action {
|
||||
case "delete":
|
||||
id := ""
|
||||
if formBag != nil {
|
||||
id = cellStr(formBag["id"])
|
||||
}
|
||||
if id == "" {
|
||||
id = cellStr(rowMap["id"])
|
||||
}
|
||||
if id == "" {
|
||||
return nil, fmt.Errorf("delete requires `id`")
|
||||
}
|
||||
result, err = db.Delete(dbURL, tableName, id)
|
||||
case "update":
|
||||
id := ""
|
||||
if formBag != nil {
|
||||
id = cellStr(formBag["id"])
|
||||
@@ -823,7 +952,7 @@ func Submit(formBag map[string]any, data any, dbURL string) (map[string]any, err
|
||||
return nil, fmt.Errorf("update requires `id`")
|
||||
}
|
||||
result, err = db.Update(dbURL, tableName, id, rowMap)
|
||||
} else {
|
||||
default:
|
||||
result, err = db.Insert(dbURL, tableName, []any{rowMap})
|
||||
}
|
||||
if err != nil {
|
||||
|
||||
@@ -68,3 +68,28 @@ func TestRenderContainsInputFields(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenderMarkdownAndLabels(t *testing.T) {
|
||||
f := form.New("posts", "insert", "")
|
||||
f = form.SetFields(f, []any{
|
||||
map[string]any{"字段": "content", "标签": "正文", "类型": "markdown", "必填": true},
|
||||
})
|
||||
f = form.SetLabels(f, "发布文章", "返回列表", "/desk/posts")
|
||||
if f["redirect"] != "/desk/posts" || f["cancel_href"] != "/desk/posts" {
|
||||
t.Fatalf("labels should stamp redirect/cancel_href, got %#v %#v", f["redirect"], f["cancel_href"])
|
||||
}
|
||||
html := form.Render(f, "post", nil, nil, "")
|
||||
for _, want := range []string{
|
||||
`data-mq-field="markdown"`,
|
||||
`class="mq-markdown"`,
|
||||
`class="md-field"`,
|
||||
`mq-md-preview`,
|
||||
">发布文章</button>",
|
||||
`href="/desk/posts"`,
|
||||
">返回列表</a>",
|
||||
} {
|
||||
if !strings.Contains(html, want) {
|
||||
t.Fatalf("missing %q in:\n%s", want, html)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
package form
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
func normalizeSource(raw string) string {
|
||||
s := strings.TrimSpace(raw)
|
||||
if s == "" {
|
||||
return "client"
|
||||
}
|
||||
switch strings.ToLower(s) {
|
||||
case "client", "用户", "input", "form":
|
||||
return "client"
|
||||
case "user", "username", "session.user", "session.username", "用户名":
|
||||
return "session.username"
|
||||
case "now", "utc.now", "server.now", "时间", "utc":
|
||||
return "now"
|
||||
case "now_if_empty", "空则现在", "now?":
|
||||
return "now_if_empty"
|
||||
default:
|
||||
return s
|
||||
}
|
||||
}
|
||||
|
||||
// IsClientSource reports whether the field is filled by the browser.
|
||||
func IsClientSource(source string) bool {
|
||||
src := normalizeSource(source)
|
||||
return src == "client" || src == "now_if_empty"
|
||||
}
|
||||
|
||||
// RequestContext carries session user and route params for form source stamping
|
||||
// (design: ext-web-request-context.md). Domain-agnostic — no table-name branches.
|
||||
type RequestContext struct {
|
||||
Username string
|
||||
Params map[string]any
|
||||
ReturnPath string
|
||||
Path string
|
||||
Method string
|
||||
}
|
||||
|
||||
// ApplySources strips client-supplied values for non-client fields, then stamps
|
||||
// from ctx. Always overwrites server-owned keys. `now_if_empty` keeps a non-empty
|
||||
// client value and only stamps UTC now when the field was left blank.
|
||||
func ApplySources(formBag map[string]any, data map[string]any, ctx *RequestContext) {
|
||||
if data == nil {
|
||||
return
|
||||
}
|
||||
if ctx == nil {
|
||||
ctx = &RequestContext{}
|
||||
}
|
||||
for _, f := range fieldSlice(formBag) {
|
||||
fm, ok := f.(map[string]any)
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
name, _ := fm["name"].(string)
|
||||
if name == "" {
|
||||
continue
|
||||
}
|
||||
src := normalizeSource(strOf(fm, "source", "client"))
|
||||
switch src {
|
||||
case "client":
|
||||
continue
|
||||
case "now_if_empty":
|
||||
if data[name] != nil && strings.TrimSpace(cellStr(data[name])) != "" {
|
||||
continue
|
||||
}
|
||||
if v, ok := resolveSource("now", ctx); ok {
|
||||
data[name] = v
|
||||
}
|
||||
default:
|
||||
delete(data, name)
|
||||
if v, ok := resolveSource(src, ctx); ok {
|
||||
data[name] = v
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func resolveSource(src string, ctx *RequestContext) (any, bool) {
|
||||
src = normalizeSource(src)
|
||||
switch src {
|
||||
case "client":
|
||||
return nil, false
|
||||
case "session.username":
|
||||
if ctx.Username == "" {
|
||||
return nil, false
|
||||
}
|
||||
return ctx.Username, true
|
||||
case "now":
|
||||
return time.Now().UTC().Format("2006-01-02 15:04:05"), true
|
||||
}
|
||||
lower := strings.ToLower(src)
|
||||
for _, prefix := range []string{"route.", "param.", "params."} {
|
||||
if strings.HasPrefix(lower, prefix) {
|
||||
key := src[len(prefix):]
|
||||
if key == "" || ctx.Params == nil {
|
||||
return nil, false
|
||||
}
|
||||
if v, ok := ctx.Params[key]; ok {
|
||||
return v, true
|
||||
}
|
||||
for k, v := range ctx.Params {
|
||||
if strings.EqualFold(k, key) {
|
||||
return v, true
|
||||
}
|
||||
}
|
||||
return nil, false
|
||||
}
|
||||
}
|
||||
return nil, false
|
||||
}
|
||||
|
||||
// ParseMQParams decodes the hidden `_mq_params` JSON posted with forms.
|
||||
func ParseMQParams(raw string) map[string]any {
|
||||
raw = strings.TrimSpace(raw)
|
||||
if raw == "" {
|
||||
return nil
|
||||
}
|
||||
var out map[string]any
|
||||
if err := json.Unmarshal([]byte(raw), &out); err != nil {
|
||||
return nil
|
||||
}
|
||||
return out
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
package form
|
||||
|
||||
import "testing"
|
||||
|
||||
func TestApplySourcesOverwritesClient(t *testing.T) {
|
||||
frm := SetFields(New("comments", "insert", "c"), []any{
|
||||
map[string]any{"字段": "body", "标签": "body", "类型": "textarea", "必填": true, "来源": "client"},
|
||||
map[string]any{"字段": "author", "标签": "a", "类型": "text", "必填": true, "来源": "session.username"},
|
||||
map[string]any{"字段": "post_slug", "标签": "s", "类型": "text", "必填": true, "来源": "route.slug"},
|
||||
map[string]any{"字段": "created_at", "标签": "t", "类型": "text", "来源": "now"},
|
||||
})
|
||||
data := map[string]any{
|
||||
"body": "hi",
|
||||
"author": "forged",
|
||||
"post_slug": "evil",
|
||||
}
|
||||
ApplySources(frm, data, &RequestContext{
|
||||
Username: "alice",
|
||||
Params: map[string]any{"slug": "hello"},
|
||||
})
|
||||
if data["author"] != "alice" {
|
||||
t.Fatalf("author=%v", data["author"])
|
||||
}
|
||||
if data["post_slug"] != "hello" {
|
||||
t.Fatalf("slug=%v", data["post_slug"])
|
||||
}
|
||||
if data["body"] != "hi" {
|
||||
t.Fatalf("body=%v", data["body"])
|
||||
}
|
||||
if data["created_at"] == nil || data["created_at"] == "" {
|
||||
t.Fatalf("created_at missing")
|
||||
}
|
||||
}
|
||||
|
||||
func TestApplySourcesNowIfEmpty(t *testing.T) {
|
||||
frm := SetFields(New("news", "insert", "n"), []any{
|
||||
map[string]any{"字段": "title", "标签": "t", "类型": "text", "必填": true},
|
||||
map[string]any{"字段": "published_at", "标签": "d", "类型": "text", "来源": "空则现在"},
|
||||
})
|
||||
empty := map[string]any{"title": "x", "published_at": ""}
|
||||
ApplySources(frm, empty, &RequestContext{})
|
||||
if empty["published_at"] == nil || empty["published_at"] == "" {
|
||||
t.Fatalf("expected stamp, got %#v", empty["published_at"])
|
||||
}
|
||||
kept := map[string]any{"title": "x", "published_at": "2020-01-02"}
|
||||
ApplySources(frm, kept, &RequestContext{})
|
||||
if kept["published_at"] != "2020-01-02" {
|
||||
t.Fatalf("should keep client date, got %#v", kept["published_at"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestRenderSkipsServerSources(t *testing.T) {
|
||||
frm := SetFields(New("comments", "insert", "c"), []any{
|
||||
map[string]any{"字段": "body", "标签": "Body", "类型": "textarea", "必填": true},
|
||||
map[string]any{"字段": "author", "标签": "Author", "类型": "text", "来源": "session.username"},
|
||||
})
|
||||
html := RenderBodyCtx(frm, "c", nil, nil, "", &RequestContext{
|
||||
Username: "alice",
|
||||
Params: map[string]any{"slug": "x"},
|
||||
ReturnPath: "/post/x",
|
||||
})
|
||||
if stringsContains(html, `name="author"`) {
|
||||
t.Fatalf("author field should not render: %s", html)
|
||||
}
|
||||
if !stringsContains(html, `name="body"`) {
|
||||
t.Fatalf("body missing")
|
||||
}
|
||||
if !stringsContains(html, `_mq_params`) || !stringsContains(html, `_mq_return`) {
|
||||
t.Fatalf("missing mq context fields: %s", html)
|
||||
}
|
||||
}
|
||||
|
||||
func stringsContains(s, sub string) bool {
|
||||
return len(s) >= len(sub) && (s == sub || len(sub) == 0 ||
|
||||
(func() bool {
|
||||
for i := 0; i+len(sub) <= len(s); i++ {
|
||||
if s[i:i+len(sub)] == sub {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
})())
|
||||
}
|
||||
@@ -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,29 @@ 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
|
||||
rbacDesk bool
|
||||
register bool
|
||||
registerPath string
|
||||
defaultRole string
|
||||
}
|
||||
|
||||
func authConfigOf(appBag map[string]any) authConfig {
|
||||
@@ -68,6 +78,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 +86,19 @@ 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.rbacDesk = boolish(authBag["rbac_desk"])
|
||||
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 +130,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 +164,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
|
||||
@@ -218,6 +247,13 @@ func pathExcluded(path string, exclude []string, loginPath string) bool {
|
||||
if path == loginPath || strings.HasPrefix(path, loginPath+"?") {
|
||||
return true
|
||||
}
|
||||
if strings.HasPrefix(path, "/oidc/") {
|
||||
return true
|
||||
}
|
||||
// Local logout must always run; never bounce visitors to login→IdP first.
|
||||
if path == "/logout" || strings.HasSuffix(path, "/logout") {
|
||||
return true
|
||||
}
|
||||
for _, ex := range exclude {
|
||||
ex = strings.TrimRight(strings.TrimSuffix(ex, "*"), "/")
|
||||
if ex == "" {
|
||||
@@ -245,7 +281,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 +314,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) {
|
||||
@@ -302,21 +364,54 @@ func withNavAuth(page map[string]any, cookieHeader string) {
|
||||
}
|
||||
}
|
||||
|
||||
func (st *state) hasPageRoute(path string) bool {
|
||||
if path == "" || st.routes == nil {
|
||||
return false
|
||||
}
|
||||
_, ok := st.routes[path]
|
||||
return ok
|
||||
}
|
||||
|
||||
func (st *state) mountAuthRoutes(mux *http.ServeMux) {
|
||||
if st.auth.users == nil {
|
||||
st.mountOIDCRoutes(mux)
|
||||
if st.auth.users == nil && !(st.auth.rbac && st.auth.register) && !st.oidcEnabled() {
|
||||
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.admin {
|
||||
if st.auth.users != nil || st.auth.rbac || st.oidcEnabled() {
|
||||
lp := st.auth.loginPath
|
||||
// Site pages may own GET /login (or /desk/login); always keep POST for auth.
|
||||
if !st.hasPageRoute(lp) {
|
||||
mux.HandleFunc("GET "+lp, st.handleLoginGet)
|
||||
}
|
||||
mux.HandleFunc("POST "+lp, st.handleLoginPost)
|
||||
altLogin := strings.TrimRight(st.auth.adminPrefix, "/") + "/login"
|
||||
if altLogin != lp {
|
||||
if !st.hasPageRoute(altLogin) {
|
||||
mux.HandleFunc("GET "+altLogin, st.handleLoginGet)
|
||||
}
|
||||
mux.HandleFunc("POST "+altLogin, st.handleLoginPost)
|
||||
}
|
||||
st.mountExtraLoginPosts(mux, map[string]bool{lp: true, altLogin: true})
|
||||
logoutPath := strings.TrimRight(st.auth.adminPrefix, "/") + "/logout"
|
||||
mux.HandleFunc("GET "+logoutPath, st.handleLogout)
|
||||
}
|
||||
if st.auth.register && st.auth.rbac && !st.oidcEnabled() {
|
||||
rp := st.auth.registerPath
|
||||
if !st.hasPageRoute(rp) {
|
||||
mux.HandleFunc("GET "+rp, st.handleRegisterGet)
|
||||
}
|
||||
mux.HandleFunc("POST "+rp, st.handleRegisterPost)
|
||||
}
|
||||
// Opt-in: enable_rbac alone wires gates/schema; /_rbac HTTP surface needs desk=true.
|
||||
if st.auth.rbac && st.auth.rbacDesk && 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)
|
||||
}
|
||||
if st.auth.admin {
|
||||
adminHome := strings.TrimRight(st.auth.adminPrefix, "/")
|
||||
if adminHome == "" {
|
||||
adminHome = "/admin"
|
||||
@@ -326,7 +421,11 @@ func (st *state) mountAuthRoutes(mux *http.ServeMux) {
|
||||
}
|
||||
|
||||
func (st *state) handleLoginGet(w http.ResponseWriter, r *http.Request) {
|
||||
if st.auth.users == nil {
|
||||
if st.oidcEnabled() {
|
||||
st.handleOIDCStart(w, r)
|
||||
return
|
||||
}
|
||||
if st.auth.users == nil && !st.auth.rbac {
|
||||
http.Redirect(w, r, st.auth.loginRedirect, http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
@@ -343,7 +442,11 @@ 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.oidcEnabled() {
|
||||
st.handleOIDCStart(w, r)
|
||||
return
|
||||
}
|
||||
if st.auth.users == nil && !st.auth.rbac {
|
||||
http.Redirect(w, r, st.auth.loginRedirect, http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
@@ -352,14 +455,12 @@ func (st *state) handleLoginPost(w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
cookieHdr := r.Header.Get("Cookie")
|
||||
sid, csrf, setCookie := resolveSession(r)
|
||||
sid, _, _ := resolveSession(r)
|
||||
_, hadCookie := session.IDFromCookie(cookieHdr)
|
||||
csrfToken := r.FormValue("_csrf")
|
||||
if csrfToken != "" || hadCookie {
|
||||
if !session.ValidateCSRF(sid, csrfToken) {
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
appendSetCookie(w, setCookie)
|
||||
_, _ = io.WriteString(w, "<p class=\"flash err\">Invalid or missing CSRF token. Refresh and try again.</p>")
|
||||
st.writeAuthFailure(w, r, "Invalid or missing CSRF token. Refresh and try again.")
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -367,34 +468,93 @@ func (st *state) handleLoginPost(w http.ResponseWriter, r *http.Request) {
|
||||
password := r.FormValue("password")
|
||||
ip := clientIP(r)
|
||||
if err := ratelimit.Check(ip, username); err != nil {
|
||||
msg := err.Error()
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
appendSetCookie(w, setCookie)
|
||||
_, _ = io.WriteString(w, loginPageHTML(st.auth.loginPath, &msg, csrf, r.FormValue("next")))
|
||||
st.writeAuthFailure(w, r, err.Error())
|
||||
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."
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
appendSetCookie(w, setCookie)
|
||||
_, _ = io.WriteString(w, loginPageHTML(st.auth.loginPath, &errMsg, csrf, r.FormValue("next")))
|
||||
st.writeAuthFailure(w, r, "Invalid username or password.")
|
||||
return
|
||||
}
|
||||
ratelimit.ClearSuccess(ip, username)
|
||||
sessID, _ := res["session_id"].(string)
|
||||
dest := loginDest(r, st.auth.loginRedirect)
|
||||
role, _ := res["role"].(string)
|
||||
st.attachLoginPermissions(sessID, username, role)
|
||||
fallback := st.auth.loginRedirect
|
||||
if page := st.pageForAuthPath(r.URL.Path); page != nil {
|
||||
if af, ok := page["auth_form"].(map[string]any); ok {
|
||||
if n, ok := af["next"].(string); ok {
|
||||
if n = strings.TrimSpace(n); n != "" {
|
||||
fallback = n
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
dest := loginDest(r, fallback)
|
||||
held := session.PermissionsFromSession(sessID)
|
||||
if (strings.HasPrefix(dest, "/desk") || strings.HasPrefix(dest, "/admin")) &&
|
||||
!session.PermissionAllowed(held, []string{"desk:access"}) {
|
||||
dest = "/"
|
||||
}
|
||||
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)
|
||||
}
|
||||
w.Header().Add("Set-Cookie", session.ClearCookie())
|
||||
http.Redirect(w, r, st.auth.logoutRedirect, http.StatusSeeOther)
|
||||
dest := strings.TrimSpace(st.auth.logoutRedirect)
|
||||
// With OIDC, /login (and siblings) immediately bounce to the IdP — that is
|
||||
// re-auth, not logout. Land on a public page instead.
|
||||
if dest == "" || (st.oidcEnabled() && st.isOIDCEntryPath(dest)) {
|
||||
dest = "/"
|
||||
}
|
||||
http.Redirect(w, r, dest, http.StatusSeeOther)
|
||||
}
|
||||
|
||||
func (st *state) handleAdminHome(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -427,29 +587,34 @@ func loginPageHTML(loginAction string, errMsg *string, csrf string, next string)
|
||||
nextField = fmt.Sprintf("<input type=\"hidden\" name=\"next\" value=\"%s\"/>", esc(next))
|
||||
}
|
||||
return fmt.Sprintf(`<!DOCTYPE html>
|
||||
<html lang="zh-CN"><head>
|
||||
<html lang="en"><head>
|
||||
<meta charset="utf-8"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||
<title>Admin Login</title>
|
||||
<style>
|
||||
:root { --ink:#1c1917; --muted:#78716c; --paper:#fafaf9; --line:#e7e5e4; --accent:#0f766e; --err:#b91c1c; }
|
||||
:root { --ink:#0a0809; --paper:#f5e6c8; --gold:#d4af37; --wine:#6b1e3a; --err:#b91c1c; }
|
||||
* { box-sizing:border-box; }
|
||||
body { margin:0; min-height:100vh; display:grid; place-items:center; background:var(--paper); color:var(--ink); font-family:"IBM Plex Sans","Noto Sans SC",sans-serif; }
|
||||
.login { background:rgba(255,255,255,.45); border:1px solid rgba(255,255,255,.5); border-radius:14px; padding:2rem 2.25rem; width:min(92vw,22rem); box-shadow:0 8px 24px rgba(253,189,219,.18); backdrop-filter:blur(14px); }
|
||||
.login h1 { margin:0 0 .25rem; font-size:1.4rem; color:#a85878; }
|
||||
.login .sub { color:#666; margin:0 0 1.25rem; font-size:.9rem; }
|
||||
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); box-shadow:0 24px 80px rgba(0,0,0,.55); backdrop-filter:blur(14px); }
|
||||
.login h1 { margin:0 0 .25rem; font-size:1.55rem; color:var(--gold); letter-spacing:.04em; }
|
||||
.login .sub { color:rgba(245,230,200,.72); margin:0 0 1.25rem; font-size:.9rem; line-height:1.55; }
|
||||
.login .hint { color:rgba(245,230,200,.5); margin:1rem 0 0; font-size:.78rem; letter-spacing:.04em; }
|
||||
.login form { display:grid; gap:.9rem; }
|
||||
.login label { display:grid; gap:.25rem; font-size:.9rem; }
|
||||
.login input { padding:.55rem .65rem; border:1px solid rgba(253,189,219,.55); border-radius:999px; font:inherit; background:rgba(255,255,255,.7); }
|
||||
.login button { background:linear-gradient(120deg,#f0a8c4,#fdbbdb); color:#a85878; border:0; padding:.6rem 1rem; border-radius:999px; cursor:pointer; font:inherit; font-weight:600; }
|
||||
.login button:hover { filter:brightness(1.05); }
|
||||
.flash.err { background:#fef2f2; color:#b91c1c; border:1px solid #fecaca; padding:.6rem .8rem; border-radius:6px; margin:0 0 .9rem; font-size:.9rem; }
|
||||
.login label { display:grid; gap:.25rem; font-size:.85rem; letter-spacing:.08em; }
|
||||
.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 input:focus { outline:none; border-color:var(--gold); box-shadow:0 0 0 2px rgba(212,175,55,.25); }
|
||||
.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; letter-spacing:.1em; }
|
||||
.login button:hover { filter:brightness(1.06); }
|
||||
.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; }
|
||||
a.back:hover { color:#f5e6c8; }
|
||||
</style>
|
||||
</head>
|
||||
<body style="background:#f8f9fa url('/static/img/bg-body-960.webp') center/cover fixed;">
|
||||
<body>
|
||||
<div class="login">
|
||||
<h1>暗恋见君</h1>
|
||||
<p class="sub">登录后发帖与管理。</p>
|
||||
<h1>Marqdo Admin</h1>
|
||||
<p class="sub">Sign in to open the table-declared desk.</p>
|
||||
%s
|
||||
<form method="post" action="%s">
|
||||
%s%s
|
||||
@@ -457,10 +622,305 @@ body { margin:0; min-height:100vh; display:grid; place-items:center; background:
|
||||
<label>Password<input name="password" type="password" autocomplete="current-password" required/></label>
|
||||
<button type="submit">Sign in</button>
|
||||
</form>
|
||||
<p class="hint">Demo · admin / demo</p>
|
||||
<p style="margin:1.1rem 0 0"><a class="back" href="/">← Site</a></p>
|
||||
</div>
|
||||
</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, _, _ := resolveSession(r)
|
||||
_, hadCookie := session.IDFromCookie(r.Header.Get("Cookie"))
|
||||
csrfToken := r.FormValue("_csrf")
|
||||
if csrfToken != "" || hadCookie {
|
||||
if !session.ValidateCSRF(sid, csrfToken) {
|
||||
st.writeRegisterFailure(w, r, "Invalid CSRF token.")
|
||||
return
|
||||
}
|
||||
}
|
||||
username := strings.TrimSpace(r.FormValue("username"))
|
||||
pass := r.FormValue("password")
|
||||
if len(username) < 2 || len(pass) < 4 {
|
||||
st.writeRegisterFailure(w, r, "Username (≥2) and password (≥4) required.")
|
||||
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 {
|
||||
st.writeRegisterFailure(w, r, err.Error())
|
||||
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 {
|
||||
|
||||
@@ -0,0 +1,164 @@
|
||||
package httpx
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/session"
|
||||
)
|
||||
|
||||
func isLoginAuthPage(page any) bool {
|
||||
m, ok := page.(map[string]any)
|
||||
if !ok || m == nil {
|
||||
return false
|
||||
}
|
||||
af, ok := m["auth_form"].(map[string]any)
|
||||
if !ok || af == nil {
|
||||
return false
|
||||
}
|
||||
kind := strings.ToLower(strings.TrimSpace(fmt.Sprint(af["kind"])))
|
||||
action := strings.ToLower(strings.TrimSpace(fmt.Sprint(af["action"])))
|
||||
if kind == "register" || strings.Contains(action, "register") {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func (st *state) pageForAuthPath(path string) map[string]any {
|
||||
if path == "" || st.routes == nil {
|
||||
return nil
|
||||
}
|
||||
if p, ok := st.routes[path].(map[string]any); ok && p != nil {
|
||||
return p
|
||||
}
|
||||
alt := strings.TrimRight(st.auth.adminPrefix, "/") + "/login"
|
||||
if path == alt {
|
||||
if p, ok := st.routes["/desk/login"].(map[string]any); ok {
|
||||
return p
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func localizeAuthErr(msg string) string {
|
||||
s := strings.TrimSpace(msg)
|
||||
lower := strings.ToLower(s)
|
||||
switch {
|
||||
case s == "":
|
||||
return "操作失败,请重试。"
|
||||
case strings.Contains(s, "Too many failed"):
|
||||
return "尝试次数过多,请约 15 分钟后再试。"
|
||||
case strings.Contains(s, "Invalid username or password"):
|
||||
return "用户名或密码错误。"
|
||||
case strings.Contains(s, "Invalid or missing CSRF"), strings.Contains(s, "Invalid CSRF"):
|
||||
return "登录令牌失效,请刷新页面后重试。"
|
||||
case strings.Contains(s, "Username") && strings.Contains(lower, "password"):
|
||||
return "请填写有效的用户名(≥2)与密码(≥4)。"
|
||||
case strings.Contains(lower, "already"), strings.Contains(lower, "exists"), strings.Contains(s, "存在"):
|
||||
return "该用户名已被注册,请换一个。"
|
||||
default:
|
||||
return s
|
||||
}
|
||||
}
|
||||
|
||||
func safeAuthNext(raw string) string {
|
||||
next := strings.TrimSpace(raw)
|
||||
if next != "" && strings.HasPrefix(next, "/") && !strings.HasPrefix(next, "//") {
|
||||
return next
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (st *state) writeAuthFailure(w http.ResponseWriter, r *http.Request, msg string) {
|
||||
path := r.URL.Path
|
||||
page := st.pageForAuthPath(path)
|
||||
if page == nil && path == strings.TrimRight(st.auth.adminPrefix, "/")+"/login" {
|
||||
page = st.pageForAuthPath("/desk/login")
|
||||
}
|
||||
if page != nil {
|
||||
p := cloneMap(page)
|
||||
p["_flash_err"] = localizeAuthErr(msg)
|
||||
if next := safeAuthNext(r.FormValue("next")); next != "" {
|
||||
p["_auth_next"] = next
|
||||
} else if next := safeAuthNext(r.URL.Query().Get("next")); next != "" {
|
||||
p["_auth_next"] = next
|
||||
}
|
||||
st.writePage(w, r, p)
|
||||
return
|
||||
}
|
||||
_, csrf, setCookie := resolveSession(r)
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
appendSetCookie(w, setCookie)
|
||||
loc := localizeAuthErr(msg)
|
||||
_, _ = io.WriteString(w, loginPageHTML(st.auth.loginPath, &loc, csrf, r.FormValue("next")))
|
||||
}
|
||||
|
||||
func (st *state) writeRegisterFailure(w http.ResponseWriter, r *http.Request, msg string) {
|
||||
path := r.URL.Path
|
||||
page := st.pageForAuthPath(path)
|
||||
if page == nil {
|
||||
page = st.pageForAuthPath(st.auth.registerPath)
|
||||
}
|
||||
if page != nil {
|
||||
p := cloneMap(page)
|
||||
p["_flash_err"] = localizeAuthErr(msg)
|
||||
st.writePage(w, r, p)
|
||||
return
|
||||
}
|
||||
_, csrf, setCookie := resolveSession(r)
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
appendSetCookie(w, setCookie)
|
||||
loc := localizeAuthErr(msg)
|
||||
_, _ = io.WriteString(w, registerPageHTML(st.auth.registerPath, &loc, csrf))
|
||||
}
|
||||
|
||||
func (st *state) mountExtraLoginPosts(mux *http.ServeMux, already map[string]bool) {
|
||||
for path, pageV := range st.routes {
|
||||
if already[path] {
|
||||
continue
|
||||
}
|
||||
if isLoginAuthPage(pageV) {
|
||||
mux.HandleFunc("POST "+path, st.handleLoginPost)
|
||||
already[path] = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (st *state) authEntryRedirect(w http.ResponseWriter, r *http.Request, page map[string]any) bool {
|
||||
if page == nil || r == nil {
|
||||
return false
|
||||
}
|
||||
path := r.URL.Path
|
||||
isEntry := false
|
||||
if path == st.auth.loginPath || path == st.auth.registerPath {
|
||||
isEntry = true
|
||||
}
|
||||
alt := strings.TrimRight(st.auth.adminPrefix, "/") + "/login"
|
||||
if path == alt {
|
||||
isEntry = true
|
||||
}
|
||||
if _, ok := page["auth_form"]; ok {
|
||||
isEntry = true
|
||||
}
|
||||
if !isEntry {
|
||||
return false
|
||||
}
|
||||
if session.RoleFromCookie(r.Header.Get("Cookie")) == "visitor" {
|
||||
return false
|
||||
}
|
||||
fallback := st.auth.loginRedirect
|
||||
if af, ok := page["auth_form"].(map[string]any); ok {
|
||||
if n, ok := af["next"].(string); ok {
|
||||
if n = strings.TrimSpace(n); n != "" {
|
||||
fallback = n
|
||||
}
|
||||
}
|
||||
}
|
||||
if path == st.auth.registerPath {
|
||||
fallback = st.auth.loginRedirect
|
||||
}
|
||||
http.Redirect(w, r, loginDest(r, fallback), http.StatusSeeOther)
|
||||
return true
|
||||
}
|
||||
@@ -0,0 +1,245 @@
|
||||
package httpx
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/auth"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/oidc"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/rbac"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/session"
|
||||
)
|
||||
|
||||
const oidcPasswordSentinel = "!oidc!"
|
||||
|
||||
var (
|
||||
oidcHTTPOnce sync.Once
|
||||
oidcHTTP *http.Client
|
||||
)
|
||||
|
||||
func oidcClient() *http.Client {
|
||||
oidcHTTPOnce.Do(func() {
|
||||
oidcHTTP = &http.Client{Timeout: 20 * time.Second}
|
||||
})
|
||||
return oidcHTTP
|
||||
}
|
||||
|
||||
func (st *state) oidcEnabled() bool {
|
||||
return st.oidc.Enabled()
|
||||
}
|
||||
|
||||
func (st *state) ensureOIDCEndpoints() error {
|
||||
if !st.oidc.Enabled() {
|
||||
return fmt.Errorf("oidc not configured")
|
||||
}
|
||||
return st.oidc.ResolveEndpoints(oidcClient())
|
||||
}
|
||||
|
||||
func (st *state) isOIDCEntryPath(path string) bool {
|
||||
if !st.oidcEnabled() || path == "" {
|
||||
return false
|
||||
}
|
||||
if path == st.auth.loginPath || path == st.auth.registerPath {
|
||||
return true
|
||||
}
|
||||
alt := strings.TrimRight(st.auth.adminPrefix, "/") + "/login"
|
||||
if path == alt || path == "/desk/login" || path == "/admin/login" {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// oidcFallbackNext picks where to land after IdP login when ?next= is absent.
|
||||
// Admin entry pages must not fall back to the public homepage.
|
||||
func (st *state) oidcFallbackNext(r *http.Request) string {
|
||||
path := ""
|
||||
if r != nil {
|
||||
path = r.URL.Path
|
||||
}
|
||||
switch path {
|
||||
case "/desk/login", "/admin/login", "/oidc/login":
|
||||
return "/admin"
|
||||
case "/desk", "/admin":
|
||||
return "/admin"
|
||||
}
|
||||
if strings.HasPrefix(path, "/desk/") || strings.HasPrefix(path, "/admin/") {
|
||||
return "/admin"
|
||||
}
|
||||
if st.auth.loginRedirect != "" {
|
||||
return st.auth.loginRedirect
|
||||
}
|
||||
return "/"
|
||||
}
|
||||
|
||||
func (st *state) mountOIDCRoutes(mux *http.ServeMux) {
|
||||
if !st.oidcEnabled() {
|
||||
return
|
||||
}
|
||||
cb := st.oidc.Callback()
|
||||
mux.HandleFunc("GET "+cb, st.handleOIDCCallback)
|
||||
mux.HandleFunc("GET /oidc/login", st.handleOIDCStart)
|
||||
mux.HandleFunc("GET /oidc/register", st.handleOIDCStart)
|
||||
}
|
||||
|
||||
func (st *state) handleOIDCStart(w http.ResponseWriter, r *http.Request) {
|
||||
if !st.oidcEnabled() {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
// Already signed in → skip IdP round-trip when destination is allowed.
|
||||
cookie := r.Header.Get("Cookie")
|
||||
if session.RoleFromCookie(cookie) != "visitor" {
|
||||
next := loginDest(r, st.oidcFallbackNext(r))
|
||||
needsDesk := strings.HasPrefix(next, "/admin") || strings.HasPrefix(next, "/desk")
|
||||
held := session.PermissionsFromCookie(cookie)
|
||||
if needsDesk && !session.PermissionAllowed(held, []string{"desk:access"}) {
|
||||
http.Redirect(w, r, "/", http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
http.Redirect(w, r, next, http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
if err := st.ensureOIDCEndpoints(); err != nil {
|
||||
http.Error(w, "oidc discovery failed: "+err.Error(), http.StatusBadGateway)
|
||||
return
|
||||
}
|
||||
sid, _, setCookie := resolveSession(r)
|
||||
state, err := oidc.RandomURLString(24)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
verifier, err := oidc.RandomURLString(32)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
session.SetValue(sid, "oidc_state", state)
|
||||
session.SetValue(sid, "oidc_verifier", verifier)
|
||||
next := loginDest(r, st.oidcFallbackNext(r))
|
||||
session.SetValue(sid, "oidc_next", next)
|
||||
loc, err := st.oidc.AuthorizeRedirect(state, oidc.PKCEChallengeS256(verifier))
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
appendSetCookie(w, setCookie)
|
||||
w.Header().Add("Set-Cookie", session.IssueCookie(sid))
|
||||
http.Redirect(w, r, loc, http.StatusFound)
|
||||
}
|
||||
|
||||
func (st *state) handleOIDCCallback(w http.ResponseWriter, r *http.Request) {
|
||||
if !st.oidcEnabled() {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
if err := st.ensureOIDCEndpoints(); err != nil {
|
||||
http.Error(w, "oidc discovery failed: "+err.Error(), http.StatusBadGateway)
|
||||
return
|
||||
}
|
||||
q := r.URL.Query()
|
||||
if errCode := q.Get("error"); errCode != "" {
|
||||
msg := errCode
|
||||
if d := q.Get("error_description"); d != "" {
|
||||
msg = errCode + ": " + d
|
||||
}
|
||||
http.Error(w, "oidc: "+msg, http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
code := q.Get("code")
|
||||
state := q.Get("state")
|
||||
if code == "" || state == "" {
|
||||
http.Error(w, "oidc: missing code or state", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
sid, _, setCookie := resolveSession(r)
|
||||
want, _ := session.GetValue(sid, "oidc_state")
|
||||
wantS, _ := want.(string)
|
||||
if wantS == "" || wantS != state {
|
||||
http.Error(w, "oidc: state mismatch", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
verifier, _ := session.GetValue(sid, "oidc_verifier")
|
||||
verifierS, _ := verifier.(string)
|
||||
nextVal, _ := session.GetValue(sid, "oidc_next")
|
||||
next, _ := nextVal.(string)
|
||||
if next == "" {
|
||||
next = st.auth.loginRedirect
|
||||
}
|
||||
session.DelKey(sid, "oidc_state")
|
||||
session.DelKey(sid, "oidc_verifier")
|
||||
session.DelKey(sid, "oidc_next")
|
||||
|
||||
tok, err := st.oidc.ExchangeCode(oidcClient(), code, verifierS)
|
||||
if err != nil {
|
||||
http.Error(w, "oidc token exchange: "+err.Error(), http.StatusBadGateway)
|
||||
return
|
||||
}
|
||||
info, err := st.oidc.FetchUserInfo(oidcClient(), tok.AccessToken)
|
||||
if err != nil {
|
||||
http.Error(w, "oidc userinfo: "+err.Error(), http.StatusBadGateway)
|
||||
return
|
||||
}
|
||||
username := info.LocalUsername()
|
||||
if username == "" {
|
||||
http.Error(w, "oidc: empty username", http.StatusBadGateway)
|
||||
return
|
||||
}
|
||||
role := info.LocalRole(st.auth.defaultRole)
|
||||
if role == "admin" {
|
||||
// System RBAC seed uses superadmin; keep session role "admin" for ExpandRole.
|
||||
if st.dbURL != "" && st.auth.rbac {
|
||||
_ = rbac.EnsureUserWithRole(st.dbURL, username, oidcPasswordSentinel, "superadmin")
|
||||
}
|
||||
} else if st.dbURL != "" && st.auth.rbac {
|
||||
_ = rbac.EnsureUserWithRole(st.dbURL, username, oidcPasswordSentinel, role)
|
||||
}
|
||||
newID := session.NewID(st.auth.sessionTTL)
|
||||
session.SetValue(newID, "username", username)
|
||||
session.SetValue(newID, "role", role)
|
||||
session.SetValue(newID, "oidc_sub", info.Sub)
|
||||
if info.Email != "" {
|
||||
session.SetValue(newID, "email", info.Email)
|
||||
}
|
||||
if info.AdminRole != "" {
|
||||
session.SetValue(newID, "admin_role", info.AdminRole)
|
||||
}
|
||||
st.attachOIDCPermissions(newID, username, role)
|
||||
|
||||
held := session.PermissionsFromSession(newID)
|
||||
if (strings.HasPrefix(next, "/desk") || strings.HasPrefix(next, "/admin")) &&
|
||||
!session.PermissionAllowed(held, []string{"desk:access"}) {
|
||||
next = "/"
|
||||
}
|
||||
appendSetCookie(w, setCookie)
|
||||
w.Header().Add("Set-Cookie", session.IssueCookie(newID))
|
||||
http.Redirect(w, r, next, http.StatusSeeOther)
|
||||
}
|
||||
|
||||
func (st *state) attachOIDCPermissions(sessID, username, role string) {
|
||||
// Prefer IdP-derived role expansion so platform admins always get desk access
|
||||
// even before local RBAC rows catch up.
|
||||
perms := rbac.ExpandRole(role)
|
||||
if len(perms) == 0 {
|
||||
perms = expandLegacyRole(role)
|
||||
}
|
||||
if st.dbURL != "" && st.auth.rbac {
|
||||
if dbPerms, err := rbac.PermissionsForUser(st.dbURL, username); err == nil && len(dbPerms) > 0 {
|
||||
// Union IdP role perms with any local grants.
|
||||
seen := map[string]bool{}
|
||||
var out []string
|
||||
for _, p := range append(perms, dbPerms...) {
|
||||
if p == "" || seen[p] {
|
||||
continue
|
||||
}
|
||||
seen[p] = true
|
||||
out = append(out, p)
|
||||
}
|
||||
perms = out
|
||||
}
|
||||
}
|
||||
auth.AttachPermissions(sessID, perms)
|
||||
}
|
||||
@@ -70,3 +70,25 @@ func TestWithNavAuth(t *testing.T) {
|
||||
t.Fatalf("nav user=%v", page["_nav_user"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestLogoutPathExcludedFromGate(t *testing.T) {
|
||||
gates := []gate{{
|
||||
path: "/admin",
|
||||
permissions: []string{"desk:access"},
|
||||
matchMode: gateMatchPrefix,
|
||||
onDeny: onDenyRedirect,
|
||||
exclude: []string{"/admin/login"},
|
||||
}}
|
||||
mux := http.NewServeMux()
|
||||
mux.HandleFunc("GET /admin/logout", func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(http.StatusNoContent)
|
||||
})
|
||||
handler := withRBAC(mux, gates, "/login")
|
||||
|
||||
req := httptest.NewRequest(http.MethodGet, "/admin/logout", nil)
|
||||
rec := httptest.NewRecorder()
|
||||
handler.ServeHTTP(rec, req)
|
||||
if rec.Code != http.StatusNoContent {
|
||||
t.Fatalf("visitor /admin/logout should reach handler, got %d loc=%s", rec.Code, rec.Header().Get("Location"))
|
||||
}
|
||||
}
|
||||
@@ -67,15 +67,13 @@ func goMuxPattern(path string) string {
|
||||
func resolveSession(r *http.Request) (sid, csrf string, setCookie *string) {
|
||||
cookieHdr := r.Header.Get("Cookie")
|
||||
id, hadCookie := session.IDFromCookie(cookieHdr)
|
||||
if hadCookie {
|
||||
ok := true
|
||||
if ok && id != "" {
|
||||
sid = id
|
||||
if tok, ok := session.CSRFFor(sid); ok {
|
||||
csrf = tok
|
||||
}
|
||||
return sid, csrf, nil
|
||||
if hadCookie && id != "" {
|
||||
if tok, ok := session.CSRFFor(id); ok && tok != "" {
|
||||
return id, tok, nil
|
||||
}
|
||||
// Stale/expired/missing session: mint a fresh session and replace the cookie.
|
||||
// Previously we returned the dead sid with empty CSRF, so login forms had no
|
||||
// _csrf while POST still saw hadCookie=true → "登录令牌失效".
|
||||
}
|
||||
sid = session.NewID(0)
|
||||
tok, _ := session.CSRFFor(sid)
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
package httpx
|
||||
|
||||
import "testing"
|
||||
import (
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/session"
|
||||
)
|
||||
|
||||
func TestGoMuxPattern(t *testing.T) {
|
||||
if got := goMuxPattern("/_media/{*key}"); got != "/_media/{key...}" {
|
||||
@@ -10,3 +16,44 @@ func TestGoMuxPattern(t *testing.T) {
|
||||
t.Fatalf("got %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPathParamNamesIncludesID(t *testing.T) {
|
||||
got := pathParamNames("/desk/posts/{id}")
|
||||
if len(got) != 1 || got[0] != "id" {
|
||||
t.Fatalf("got %#v", got)
|
||||
}
|
||||
got = pathParamNames("/post/{slug}")
|
||||
if len(got) != 1 || got[0] != "slug" {
|
||||
t.Fatalf("got %#v", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestResolveSessionReplacesStaleCookie(t *testing.T) {
|
||||
session.Configure(session.Config{TTLSec: 3600})
|
||||
session.Reset(3600)
|
||||
|
||||
req := httptest.NewRequest("GET", "/login", nil)
|
||||
req.Header.Set("Cookie", "marqdo_sid="+strings.Repeat("ab", 32))
|
||||
sid, csrf, setCookie := resolveSession(req)
|
||||
if sid == "" || csrf == "" {
|
||||
t.Fatalf("expected fresh sid+csrf, got sid=%q csrf=%q", sid, csrf)
|
||||
}
|
||||
if setCookie == nil || !strings.Contains(*setCookie, "marqdo_sid=") {
|
||||
t.Fatalf("expected Set-Cookie for replacement session, got %#v", setCookie)
|
||||
}
|
||||
if !session.ValidateCSRF(sid, csrf) {
|
||||
t.Fatal("csrf should validate for new session")
|
||||
}
|
||||
|
||||
// Live session should keep the same id without re-issuing cookie.
|
||||
req2 := httptest.NewRequest("GET", "/login", nil)
|
||||
req2.Header.Set("Cookie", "marqdo_sid="+sid)
|
||||
sid2, csrf2, setCookie2 := resolveSession(req2)
|
||||
if sid2 != sid || csrf2 != csrf {
|
||||
t.Fatalf("live session should be stable: %q/%q vs %q/%q", sid, csrf, sid2, csrf2)
|
||||
}
|
||||
if setCookie2 != nil {
|
||||
t.Fatalf("live session should not Set-Cookie again")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
"io"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
@@ -21,10 +22,13 @@ import (
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/db"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/form"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/middleware"
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/oidc"
|
||||
"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,8 +39,14 @@ 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,
|
||||
RedisURL: sessionURLOf(appBag),
|
||||
TTLSec: authCfg.sessionTTL,
|
||||
CookieSecure: authCfg.cookieSecure,
|
||||
})
|
||||
@@ -47,10 +57,24 @@ func NewHandler(appBag map[string]any, entryDir string) (http.Handler, error) {
|
||||
if page == nil {
|
||||
page = map[string]any{}
|
||||
}
|
||||
if _, ok := page["asset_version"]; !ok {
|
||||
if v := strOpt(appBag, "asset_version", ""); v != "" {
|
||||
page["asset_version"] = v
|
||||
}
|
||||
}
|
||||
routes := map[string]any{}
|
||||
if r, ok := appBag["routes"].(map[string]any); ok {
|
||||
routes = r
|
||||
}
|
||||
if av, ok := page["asset_version"]; ok {
|
||||
for _, p := range routes {
|
||||
if pm, ok := p.(map[string]any); ok {
|
||||
if _, has := pm["asset_version"]; !has {
|
||||
pm["asset_version"] = av
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
forms := map[string]any{}
|
||||
if f, ok := appBag["forms"].(map[string]any); ok {
|
||||
forms = cloneMap(f)
|
||||
@@ -99,13 +123,18 @@ func NewHandler(appBag map[string]any, entryDir string) (http.Handler, error) {
|
||||
proxyRoutes: routeMapOf(appBag, "proxy_routes"),
|
||||
invokeRoutes: routeMapOf(appBag, "invoke_routes"),
|
||||
auth: authCfg,
|
||||
oidc: oidc.ParseConfig(appBag),
|
||||
tenant: tenant.FromBag(appBag),
|
||||
}
|
||||
|
||||
mux := http.NewServeMux()
|
||||
mux.HandleFunc("GET /{$}", st.handleHome)
|
||||
mux.HandleFunc("GET /_part/{id}", st.handleHomePart)
|
||||
// Part slot uses {part} (not {id}) so dynamic routes like /desk/posts/{id}
|
||||
// do not collide with Go ServeMux duplicate wildcard names.
|
||||
mux.HandleFunc("GET /_part/{part}", st.handleHomePart)
|
||||
mux.HandleFunc("GET /_form/{id}", st.handleFormGet)
|
||||
mux.HandleFunc("POST /_form/{id}", st.handleFormPost)
|
||||
mux.HandleFunc("POST /_md", st.handleMarkdownPreview)
|
||||
|
||||
paths := sortedKeys(routes)
|
||||
for _, p := range paths {
|
||||
@@ -116,14 +145,14 @@ func NewHandler(appBag map[string]any, entryDir string) (http.Handler, error) {
|
||||
}
|
||||
if strings.Contains(routePath, "{") {
|
||||
mux.HandleFunc("GET "+goMuxPattern(routePath), st.makeDynamicPage(pageV, routePath))
|
||||
mux.HandleFunc("GET "+goMuxPattern(routePath)+"/_part/{id}", st.makeDynamicPart(pageV, routePath))
|
||||
mux.HandleFunc("GET "+goMuxPattern(routePath)+"/_part/{part}", st.makeDynamicPart(pageV, routePath))
|
||||
} else {
|
||||
pv := pageV
|
||||
mux.HandleFunc("GET "+routePath, func(w http.ResponseWriter, r *http.Request) {
|
||||
st.writePage(w, r, pv)
|
||||
})
|
||||
mux.HandleFunc("GET "+routePath+"/_part/{id}", func(w http.ResponseWriter, r *http.Request) {
|
||||
st.writePart(w, r, pv, r.PathValue("id"))
|
||||
mux.HandleFunc("GET "+routePath+"/_part/{part}", func(w http.ResponseWriter, r *http.Request) {
|
||||
st.writePart(w, r, pv, r.PathValue("part"))
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -132,7 +161,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)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -161,20 +190,18 @@ func NewHandler(appBag map[string]any, entryDir string) (http.Handler, error) {
|
||||
fs := http.StripPrefix(staticMount, http.FileServer(http.Dir(staticDir)))
|
||||
// Register without method so GET+HEAD share one pattern (avoids conflicts
|
||||
// with more-specific GET/HEAD icon paths under the same prefix).
|
||||
mux.Handle(staticMount+"/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
serveStatic := func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodGet && r.Method != http.MethodHead {
|
||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
// Long browser cache; FileServer still honors Last-Modified / 304.
|
||||
// Prefer ?v= / asset_version on HTML refs when assets change.
|
||||
w.Header().Set("Cache-Control", "public, max-age=604800")
|
||||
fs.ServeHTTP(w, r)
|
||||
}))
|
||||
mux.Handle(staticMount, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodGet && r.Method != http.MethodHead {
|
||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
fs.ServeHTTP(w, r)
|
||||
}))
|
||||
}
|
||||
mux.Handle(staticMount+"/", http.HandlerFunc(serveStatic))
|
||||
mux.Handle(staticMount, http.HandlerFunc(serveStatic))
|
||||
}
|
||||
|
||||
for _, from := range sortedKeys(st.redirects) {
|
||||
@@ -217,6 +244,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 +308,8 @@ type state struct {
|
||||
proxyRoutes map[string]any
|
||||
invokeRoutes map[string]any
|
||||
auth authConfig
|
||||
oidc oidc.Config
|
||||
tenant tenant.Config
|
||||
}
|
||||
|
||||
func (st *state) handleHome(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -287,7 +317,21 @@ func (st *state) handleHome(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
func (st *state) handleHomePart(w http.ResponseWriter, r *http.Request) {
|
||||
st.writePart(w, r, st.page, r.PathValue("id"))
|
||||
st.writePart(w, r, st.page, r.PathValue("part"))
|
||||
}
|
||||
|
||||
func (st *state) handleMarkdownPreview(w http.ResponseWriter, r *http.Request) {
|
||||
body, err := io.ReadAll(io.LimitReader(r.Body, 1<<20))
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
html := render.MarkdownToHTML(string(body))
|
||||
if html == "" {
|
||||
html = `<p class="lede mq-md-empty">预览</p>`
|
||||
}
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
_, _ = io.WriteString(w, html)
|
||||
}
|
||||
|
||||
func (st *state) preparePage(page map[string]any, r *http.Request) map[string]any {
|
||||
@@ -295,19 +339,66 @@ func (st *state) preparePage(page map[string]any, r *http.Request) map[string]an
|
||||
assets.MergeSiteHead(p, st.siteHead)
|
||||
if r != nil {
|
||||
withNavAuth(p, r.Header.Get("Cookie"))
|
||||
params, _ := p["params"].(map[string]any)
|
||||
if params == nil {
|
||||
params = map[string]any{}
|
||||
} else {
|
||||
params = cloneMap(params)
|
||||
}
|
||||
for k, vs := range r.URL.Query() {
|
||||
if len(vs) == 0 {
|
||||
continue
|
||||
}
|
||||
if _, exists := params[k]; !exists {
|
||||
params[k] = vs[0]
|
||||
}
|
||||
}
|
||||
p["params"] = params
|
||||
}
|
||||
return p
|
||||
}
|
||||
|
||||
// attachCSRF stamps page._csrf so custom login/register pages expose a token
|
||||
// in meta and (via InjectAuthFields) in POST forms — progressive enhancement, no author JS.
|
||||
func (st *state) attachCSRF(page map[string]any, r *http.Request) *string {
|
||||
if page == nil || r == nil {
|
||||
return nil
|
||||
}
|
||||
if st.auth.users == nil && !st.auth.rbac && !st.oidcEnabled() {
|
||||
return nil
|
||||
}
|
||||
_, csrf, setCookie := resolveSession(r)
|
||||
if csrf != "" {
|
||||
page["_csrf"] = csrf
|
||||
}
|
||||
return setCookie
|
||||
}
|
||||
|
||||
func (st *state) writePage(w http.ResponseWriter, r *http.Request, page map[string]any) {
|
||||
html := render.RenderPage(st.preparePage(page, r), st.dbURL, "")
|
||||
if st.oidcEnabled() && st.isOIDCEntryPath(r.URL.Path) {
|
||||
st.handleOIDCStart(w, r)
|
||||
return
|
||||
}
|
||||
p := st.preparePage(page, r)
|
||||
if st.authEntryRedirect(w, r, p) {
|
||||
return
|
||||
}
|
||||
if next := safeAuthNext(r.URL.Query().Get("next")); next != "" {
|
||||
p["_auth_next"] = next
|
||||
}
|
||||
setCookie := st.attachCSRF(p, r)
|
||||
html := render.RenderPage(p, st.dbURL, "")
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
appendSetCookie(w, setCookie)
|
||||
_, _ = io.WriteString(w, html)
|
||||
}
|
||||
|
||||
func (st *state) writePart(w http.ResponseWriter, r *http.Request, page map[string]any, id string) {
|
||||
html := render.RenderPage(st.preparePage(page, r), st.dbURL, id)
|
||||
p := st.preparePage(page, r)
|
||||
setCookie := st.attachCSRF(p, r)
|
||||
html := render.RenderPage(p, st.dbURL, id)
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
appendSetCookie(w, setCookie)
|
||||
_, _ = io.WriteString(w, html)
|
||||
}
|
||||
|
||||
@@ -392,7 +483,7 @@ func (st *state) makeDynamicPart(page map[string]any, pattern string) http.Handl
|
||||
params[name] = r.PathValue(name)
|
||||
}
|
||||
injectParams(p, params)
|
||||
st.writePart(w, r, p, r.PathValue("id"))
|
||||
st.writePart(w, r, p, r.PathValue("part"))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -432,27 +523,102 @@ 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)
|
||||
}
|
||||
}
|
||||
ctx := st.requestContext(r, data)
|
||||
delete(data, "_mq_params")
|
||||
delete(data, "_mq_return")
|
||||
delete(data, "_csrf")
|
||||
form.ApplySources(frm, data, ctx)
|
||||
res, err := form.Submit(frm, data, st.dbURL)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
if ok, _ := res["ok"].(bool); ok {
|
||||
// Prefer an explicit form redirect (e.g. cancel_href list URL) over the
|
||||
// composing page path stamped as _mq_return.
|
||||
redir := strOpt(res, "redirect", "/")
|
||||
if (redir == "" || redir == "/") && ctx.ReturnPath != "" {
|
||||
redir = ctx.ReturnPath
|
||||
}
|
||||
http.Redirect(w, r, redir, http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
html := form.Render(frm, id, data, res["errors"], "")
|
||||
html := form.RenderBodyCtx(frm, id, data, res["errors"], "", ctx)
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
_, _ = io.WriteString(w, html)
|
||||
}
|
||||
|
||||
func (st *state) handleJSON(w http.ResponseWriter, route middleware.JSONRouteMount) {
|
||||
func (st *state) requestContext(r *http.Request, data map[string]any) *form.RequestContext {
|
||||
ctx := &form.RequestContext{
|
||||
Username: session.UsernameFromCookie(r.Header.Get("Cookie")),
|
||||
Path: r.URL.Path,
|
||||
Method: r.Method,
|
||||
}
|
||||
if data != nil {
|
||||
if p := form.ParseMQParams(fmt.Sprint(data["_mq_params"])); len(p) > 0 {
|
||||
ctx.Params = p
|
||||
}
|
||||
if ret, ok := data["_mq_return"].(string); ok {
|
||||
if back := sameHostPath(ret, r.Host); back != "" {
|
||||
ctx.ReturnPath = back
|
||||
} else if strings.HasPrefix(ret, "/") && !strings.HasPrefix(ret, "//") {
|
||||
ctx.ReturnPath = ret
|
||||
}
|
||||
}
|
||||
}
|
||||
if ctx.ReturnPath == "" {
|
||||
if back := sameHostPath(r.Referer(), r.Host); back != "" {
|
||||
ctx.ReturnPath = back
|
||||
}
|
||||
}
|
||||
return ctx
|
||||
}
|
||||
|
||||
func sameHostPath(raw, host string) string {
|
||||
raw = strings.TrimSpace(raw)
|
||||
if raw == "" {
|
||||
return ""
|
||||
}
|
||||
u, err := url.Parse(raw)
|
||||
if err != nil || u == nil {
|
||||
return ""
|
||||
}
|
||||
if u.Host != "" && host != "" && !strings.EqualFold(u.Host, host) {
|
||||
return ""
|
||||
}
|
||||
path := u.Path
|
||||
if path == "" {
|
||||
path = "/"
|
||||
}
|
||||
if u.RawQuery != "" {
|
||||
path += "?" + u.RawQuery
|
||||
}
|
||||
if !strings.HasPrefix(path, "/") || strings.HasPrefix(path, "//") {
|
||||
return ""
|
||||
}
|
||||
return path
|
||||
}
|
||||
|
||||
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 +627,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 {
|
||||
@@ -668,7 +845,8 @@ func pathParamNames(pattern string) []string {
|
||||
if strings.HasPrefix(seg, "{") && strings.HasSuffix(seg, "}") {
|
||||
name := strings.TrimSuffix(strings.TrimPrefix(seg, "{"), "}")
|
||||
name = strings.TrimPrefix(name, "*")
|
||||
if name != "" && name != "id" {
|
||||
// Include "id" — part slots use {part}, so route {id} is safe for PathValue.
|
||||
if name != "" {
|
||||
names = append(names, name)
|
||||
}
|
||||
}
|
||||
@@ -688,6 +866,18 @@ func dbURLOf(appBag map[string]any) string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func sessionURLOf(appBag map[string]any) string {
|
||||
if s, ok := appBag["session_url"].(string); ok && s != "" {
|
||||
return s
|
||||
}
|
||||
if auth, ok := appBag["auth"].(map[string]any); ok {
|
||||
if s, ok := auth["session_url"].(string); ok && s != "" {
|
||||
return s
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func resolvePath(p, entryDir string) string {
|
||||
if filepath.IsAbs(p) {
|
||||
return p
|
||||
|
||||
@@ -58,6 +58,9 @@ func TestNewHandlerHomeRoutesStatic(t *testing.T) {
|
||||
if rec.Code != 200 {
|
||||
t.Fatalf("static code=%d", rec.Code)
|
||||
}
|
||||
if cc := rec.Header().Get("Cache-Control"); !strings.Contains(cc, "max-age=") {
|
||||
t.Fatalf("static cache-control=%q", cc)
|
||||
}
|
||||
b, _ := io.ReadAll(rec.Result().Body)
|
||||
if string(b) != "hello-static" {
|
||||
// httptest body is already in rec.Body
|
||||
|
||||
@@ -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,341 @@
|
||||
// Package oidc implements OAuth 2.0 authorization-code + OIDC userinfo for ext/web.
|
||||
package oidc
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"crypto/sha256"
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// Config is the relying-party settings (CFLMY IdP or any OIDC provider).
|
||||
type Config struct {
|
||||
Issuer string
|
||||
ClientID string
|
||||
ClientSecret string
|
||||
RedirectURI string
|
||||
Scopes string
|
||||
CallbackPath string
|
||||
// AuthorizeURL / TokenURL / UserInfoURL override discovery when set.
|
||||
AuthorizeURL string
|
||||
TokenURL string
|
||||
UserInfoURL string
|
||||
}
|
||||
|
||||
// Enabled reports whether the minimum OIDC fields are present.
|
||||
func (c Config) Enabled() bool {
|
||||
return strings.TrimSpace(c.ClientID) != "" &&
|
||||
strings.TrimSpace(c.ClientSecret) != "" &&
|
||||
strings.TrimSpace(c.RedirectURI) != "" &&
|
||||
(strings.TrimSpace(c.Issuer) != "" || strings.TrimSpace(c.AuthorizeURL) != "")
|
||||
}
|
||||
|
||||
// Callback reports the local path (default /oidc/callback).
|
||||
func (c Config) Callback() string {
|
||||
p := strings.TrimSpace(c.CallbackPath)
|
||||
if p == "" {
|
||||
if u, err := url.Parse(c.RedirectURI); err == nil && u.Path != "" {
|
||||
return u.Path
|
||||
}
|
||||
return "/oidc/callback"
|
||||
}
|
||||
if !strings.HasPrefix(p, "/") {
|
||||
p = "/" + p
|
||||
}
|
||||
return p
|
||||
}
|
||||
|
||||
type discoveryDoc struct {
|
||||
AuthorizationEndpoint string `json:"authorization_endpoint"`
|
||||
TokenEndpoint string `json:"token_endpoint"`
|
||||
UserinfoEndpoint string `json:"userinfo_endpoint"`
|
||||
}
|
||||
|
||||
// ResolveEndpoints fills Authorize/Token/UserInfo from discovery when missing.
|
||||
func (c *Config) ResolveEndpoints(client *http.Client) error {
|
||||
if c.AuthorizeURL != "" && c.TokenURL != "" && c.UserInfoURL != "" {
|
||||
return nil
|
||||
}
|
||||
issuer := strings.TrimRight(strings.TrimSpace(c.Issuer), "/")
|
||||
if issuer == "" {
|
||||
return fmt.Errorf("oidc: issuer or explicit endpoints required")
|
||||
}
|
||||
if client == nil {
|
||||
client = &http.Client{Timeout: 15 * time.Second}
|
||||
}
|
||||
discURL := issuer + "/.well-known/openid-configuration"
|
||||
res, err := client.Get(discURL)
|
||||
if err != nil {
|
||||
return fmt.Errorf("oidc discovery: %w", err)
|
||||
}
|
||||
defer res.Body.Close()
|
||||
body, err := io.ReadAll(io.LimitReader(res.Body, 1<<20))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if res.StatusCode >= 300 {
|
||||
return fmt.Errorf("oidc discovery HTTP %d: %s", res.StatusCode, truncate(string(body), 200))
|
||||
}
|
||||
var doc discoveryDoc
|
||||
if err := json.Unmarshal(body, &doc); err != nil {
|
||||
return fmt.Errorf("oidc discovery json: %w", err)
|
||||
}
|
||||
if c.AuthorizeURL == "" {
|
||||
c.AuthorizeURL = doc.AuthorizationEndpoint
|
||||
}
|
||||
if c.TokenURL == "" {
|
||||
c.TokenURL = doc.TokenEndpoint
|
||||
}
|
||||
if c.UserInfoURL == "" {
|
||||
c.UserInfoURL = doc.UserinfoEndpoint
|
||||
}
|
||||
if c.AuthorizeURL == "" || c.TokenURL == "" || c.UserInfoURL == "" {
|
||||
return fmt.Errorf("oidc: incomplete discovery endpoints")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ScopesCSV returns space-separated scopes (default openid profile email).
|
||||
func (c Config) ScopesCSV() string {
|
||||
s := strings.TrimSpace(c.Scopes)
|
||||
if s == "" {
|
||||
return "openid profile email"
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
// RandomURLString returns a URL-safe random string of n bytes (base64url, no pad).
|
||||
func RandomURLString(n int) (string, error) {
|
||||
b := make([]byte, n)
|
||||
if _, err := rand.Read(b); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return base64.RawURLEncoding.EncodeToString(b), nil
|
||||
}
|
||||
|
||||
// PKCEChallengeS256 returns code_challenge for a verifier.
|
||||
func PKCEChallengeS256(verifier string) string {
|
||||
sum := sha256.Sum256([]byte(verifier))
|
||||
return base64.RawURLEncoding.EncodeToString(sum[:])
|
||||
}
|
||||
|
||||
// AuthorizeRedirect builds the browser redirect to the IdP authorize endpoint.
|
||||
func (c Config) AuthorizeRedirect(state, codeChallenge string) (string, error) {
|
||||
if c.AuthorizeURL == "" {
|
||||
return "", fmt.Errorf("oidc: authorize URL not resolved")
|
||||
}
|
||||
q := url.Values{}
|
||||
q.Set("response_type", "code")
|
||||
q.Set("client_id", c.ClientID)
|
||||
q.Set("redirect_uri", c.RedirectURI)
|
||||
q.Set("scope", c.ScopesCSV())
|
||||
q.Set("state", state)
|
||||
if codeChallenge != "" {
|
||||
q.Set("code_challenge", codeChallenge)
|
||||
q.Set("code_challenge_method", "S256")
|
||||
}
|
||||
sep := "?"
|
||||
if strings.Contains(c.AuthorizeURL, "?") {
|
||||
sep = "&"
|
||||
}
|
||||
return c.AuthorizeURL + sep + q.Encode(), nil
|
||||
}
|
||||
|
||||
// TokenResponse is the OAuth token endpoint JSON.
|
||||
type TokenResponse struct {
|
||||
AccessToken string `json:"access_token"`
|
||||
TokenType string `json:"token_type"`
|
||||
ExpiresIn int `json:"expires_in"`
|
||||
RefreshToken string `json:"refresh_token"`
|
||||
IDToken string `json:"id_token"`
|
||||
Scope string `json:"scope"`
|
||||
Error string `json:"error"`
|
||||
ErrorDesc string `json:"error_description"`
|
||||
}
|
||||
|
||||
// ExchangeCode swaps authorization code for tokens (client_secret_post).
|
||||
func (c Config) ExchangeCode(client *http.Client, code, codeVerifier string) (*TokenResponse, error) {
|
||||
if c.TokenURL == "" {
|
||||
return nil, fmt.Errorf("oidc: token URL not resolved")
|
||||
}
|
||||
if client == nil {
|
||||
client = &http.Client{Timeout: 15 * time.Second}
|
||||
}
|
||||
form := url.Values{}
|
||||
form.Set("grant_type", "authorization_code")
|
||||
form.Set("code", code)
|
||||
form.Set("redirect_uri", c.RedirectURI)
|
||||
form.Set("client_id", c.ClientID)
|
||||
form.Set("client_secret", c.ClientSecret)
|
||||
if codeVerifier != "" {
|
||||
form.Set("code_verifier", codeVerifier)
|
||||
}
|
||||
req, err := http.NewRequest(http.MethodPost, c.TokenURL, strings.NewReader(form.Encode()))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
req.Header.Set("Accept", "application/json")
|
||||
res, err := client.Do(req)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("oidc token: %w", err)
|
||||
}
|
||||
defer res.Body.Close()
|
||||
body, err := io.ReadAll(io.LimitReader(res.Body, 1<<20))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var tok TokenResponse
|
||||
if err := json.Unmarshal(body, &tok); err != nil {
|
||||
return nil, fmt.Errorf("oidc token json: %w (%s)", err, truncate(string(body), 200))
|
||||
}
|
||||
if tok.Error != "" {
|
||||
return nil, fmt.Errorf("oidc token: %s (%s)", tok.Error, tok.ErrorDesc)
|
||||
}
|
||||
if tok.AccessToken == "" {
|
||||
return nil, fmt.Errorf("oidc token: empty access_token (HTTP %d)", res.StatusCode)
|
||||
}
|
||||
return &tok, nil
|
||||
}
|
||||
|
||||
// UserInfo is the subset we need from /oauth2/userinfo (CFLMY + standard OIDC).
|
||||
type UserInfo struct {
|
||||
Sub string `json:"sub"`
|
||||
Email string `json:"email"`
|
||||
PreferredUsername string `json:"preferred_username"`
|
||||
Name string `json:"name"`
|
||||
Picture string `json:"picture"`
|
||||
IsAdmin bool `json:"is_admin"`
|
||||
AdminRole string `json:"admin_role"`
|
||||
}
|
||||
|
||||
// FetchUserInfo calls the userinfo endpoint with a bearer access token.
|
||||
func (c Config) FetchUserInfo(client *http.Client, accessToken string) (*UserInfo, error) {
|
||||
if c.UserInfoURL == "" {
|
||||
return nil, fmt.Errorf("oidc: userinfo URL not resolved")
|
||||
}
|
||||
if client == nil {
|
||||
client = &http.Client{Timeout: 15 * time.Second}
|
||||
}
|
||||
req, err := http.NewRequest(http.MethodGet, c.UserInfoURL, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req.Header.Set("Authorization", "Bearer "+accessToken)
|
||||
req.Header.Set("Accept", "application/json")
|
||||
res, err := client.Do(req)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("oidc userinfo: %w", err)
|
||||
}
|
||||
defer res.Body.Close()
|
||||
body, err := io.ReadAll(io.LimitReader(res.Body, 1<<20))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if res.StatusCode >= 300 {
|
||||
return nil, fmt.Errorf("oidc userinfo HTTP %d: %s", res.StatusCode, truncate(string(body), 200))
|
||||
}
|
||||
var info UserInfo
|
||||
if err := json.Unmarshal(body, &info); err != nil {
|
||||
return nil, fmt.Errorf("oidc userinfo json: %w", err)
|
||||
}
|
||||
if info.Sub == "" {
|
||||
return nil, fmt.Errorf("oidc userinfo: missing sub")
|
||||
}
|
||||
return &info, nil
|
||||
}
|
||||
|
||||
// LocalUsername picks a stable display username for sessions / RBAC.
|
||||
func (u *UserInfo) LocalUsername() string {
|
||||
if u == nil {
|
||||
return ""
|
||||
}
|
||||
if s := strings.TrimSpace(u.PreferredUsername); s != "" {
|
||||
return s
|
||||
}
|
||||
if s := strings.TrimSpace(u.Email); s != "" {
|
||||
if i := strings.IndexByte(s, '@'); i > 0 {
|
||||
return s[:i]
|
||||
}
|
||||
return s
|
||||
}
|
||||
if s := strings.TrimSpace(u.Name); s != "" {
|
||||
return s
|
||||
}
|
||||
sub := strings.TrimSpace(u.Sub)
|
||||
if len(sub) > 32 {
|
||||
return sub[:32]
|
||||
}
|
||||
return sub
|
||||
}
|
||||
|
||||
// IsIdPAdmin reports whether CFLMY IdP marks this user as an administrator.
|
||||
func (u *UserInfo) IsIdPAdmin() bool {
|
||||
if u == nil {
|
||||
return false
|
||||
}
|
||||
if u.IsAdmin {
|
||||
return true
|
||||
}
|
||||
return strings.TrimSpace(u.AdminRole) != ""
|
||||
}
|
||||
|
||||
// LocalRole maps IdP admin → site admin; otherwise defaultRole (member).
|
||||
func (u *UserInfo) LocalRole(defaultRole string) string {
|
||||
if defaultRole == "" {
|
||||
defaultRole = "member"
|
||||
}
|
||||
if u.IsIdPAdmin() {
|
||||
return "admin"
|
||||
}
|
||||
return defaultRole
|
||||
}
|
||||
|
||||
func truncate(s string, n int) string {
|
||||
if len(s) <= n {
|
||||
return s
|
||||
}
|
||||
return s[:n] + "…"
|
||||
}
|
||||
|
||||
// ParseConfig reads oidc bag from app / auth options (EN + ZH keys).
|
||||
func ParseConfig(m map[string]any) Config {
|
||||
if m == nil {
|
||||
return Config{}
|
||||
}
|
||||
if nested, ok := m["oidc"].(map[string]any); ok {
|
||||
m = nested
|
||||
}
|
||||
c := Config{
|
||||
Issuer: firstStr(m, "issuer", "发行方", "issuer_url"),
|
||||
ClientID: firstStr(m, "client_id", "客户端编号", "客户端id", "clientId"),
|
||||
ClientSecret: firstStr(m, "client_secret", "客户端密钥", "clientSecret"),
|
||||
RedirectURI: firstStr(m, "redirect_uri", "回调", "回调地址", "redirect"),
|
||||
Scopes: firstStr(m, "scopes", "范围", "scope"),
|
||||
CallbackPath: firstStr(m, "callback_path", "回调路径"),
|
||||
AuthorizeURL: firstStr(m, "authorize_url", "授权地址"),
|
||||
TokenURL: firstStr(m, "token_url", "令牌地址"),
|
||||
UserInfoURL: firstStr(m, "userinfo_url", "用户信息地址"),
|
||||
}
|
||||
return c
|
||||
}
|
||||
|
||||
func firstStr(m map[string]any, keys ...string) string {
|
||||
for _, k := range keys {
|
||||
if v, ok := m[k]; ok {
|
||||
switch t := v.(type) {
|
||||
case string:
|
||||
if s := strings.TrimSpace(t); s != "" && !strings.EqualFold(s, "none") {
|
||||
return s
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package oidc_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/marqdo/marqdo/plugins/web/internal/oidc"
|
||||
)
|
||||
|
||||
func TestUserInfoLocalRole(t *testing.T) {
|
||||
u := &oidc.UserInfo{PreferredUsername: "alice", IsAdmin: false}
|
||||
if u.LocalRole("member") != "member" {
|
||||
t.Fatal("expected member")
|
||||
}
|
||||
u.IsAdmin = true
|
||||
if u.LocalRole("member") != "admin" {
|
||||
t.Fatal("expected admin from is_admin")
|
||||
}
|
||||
u.IsAdmin = false
|
||||
u.AdminRole = "super_admin"
|
||||
if u.LocalRole("member") != "admin" {
|
||||
t.Fatal("expected admin from admin_role")
|
||||
}
|
||||
if u.LocalUsername() != "alice" {
|
||||
t.Fatalf("username=%s", u.LocalUsername())
|
||||
}
|
||||
}
|
||||
|
||||
func TestPKCEAndParse(t *testing.T) {
|
||||
v, err := oidc.RandomURLString(32)
|
||||
if err != nil || v == "" {
|
||||
t.Fatal(err)
|
||||
}
|
||||
ch := oidc.PKCEChallengeS256(v)
|
||||
if len(ch) < 20 {
|
||||
t.Fatalf("challenge=%q", ch)
|
||||
}
|
||||
c := oidc.ParseConfig(map[string]any{
|
||||
"发行方": "https://id.example.com",
|
||||
"客户端编号": "app_x",
|
||||
"客户端密钥": "secret",
|
||||
"回调": "http://localhost:18085/oidc/callback",
|
||||
})
|
||||
if !c.Enabled() {
|
||||
t.Fatal("expected enabled")
|
||||
}
|
||||
if c.Callback() != "/oidc/callback" {
|
||||
t.Fatalf("callback=%s", c.Callback())
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,575 @@
|
||||
// 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 schemaSQLSqlite = `
|
||||
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
|
||||
);
|
||||
`
|
||||
|
||||
var schemaSQLPostgres = []string{
|
||||
`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 GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||
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 GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||||
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
|
||||
)`,
|
||||
}
|
||||
|
||||
func insertIgnoreSQL(dbURL, table, cols, placeholders, conflict string) string {
|
||||
if db.IsPostgres(dbURL) {
|
||||
return fmt.Sprintf(`INSERT INTO %s(%s) VALUES(%s) ON CONFLICT %s DO NOTHING`, table, cols, placeholders, conflict)
|
||||
}
|
||||
return fmt.Sprintf(`INSERT OR IGNORE INTO %s(%s) VALUES(%s)`, table, cols, placeholders)
|
||||
}
|
||||
|
||||
// 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 db.IsPostgres(dbURL) {
|
||||
for _, stmt := range schemaSQLPostgres {
|
||||
if _, err := sqlDB.Exec(stmt); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
} else if _, err := sqlDB.Exec(schemaSQLSqlite); err != nil {
|
||||
return err
|
||||
}
|
||||
permSQL := insertIgnoreSQL(dbURL, "web_permissions", "code, resource, action, description", "?,?,?,?", "(code)")
|
||||
for _, p := range DefaultCatalog() {
|
||||
_, _ = sqlDB.Exec(permSQL, p.Code, p.Resource, p.Action, p.Description)
|
||||
}
|
||||
if err := ensureSystemRole(sqlDB, dbURL, "superadmin", true, AllCodes()); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := ensureSystemRole(sqlDB, dbURL, "member", true, []string{"comments:create", "comments:delete_own"}); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func ensureSystemRole(sqlDB db.SQLDB, dbURL, 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
|
||||
}
|
||||
if db.IsPostgres(dbURL) {
|
||||
err = sqlDB.QueryRow(`INSERT INTO web_roles(name, is_system) VALUES(?,?) RETURNING id`, name, sys).Scan(&id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
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
|
||||
}
|
||||
rpSQL := insertIgnoreSQL(dbURL, "web_role_permissions", "role_id, permission_code", "?,?", "(role_id, permission_code)")
|
||||
for _, code := range perms {
|
||||
_, _ = sqlDB.Exec(rpSQL, 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(
|
||||
insertIgnoreSQL(dbURL, "web_user_roles", "user_id, role_id, tenant_id", "?,?,?", "(user_id, role_id, tenant_id)"),
|
||||
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
|
||||
}
|
||||
if db.IsPostgres(dbURL) {
|
||||
var id int64
|
||||
err = sqlDB.QueryRow(`INSERT INTO web_roles(name, is_system) VALUES(?,0) RETURNING id`, name).Scan(&id)
|
||||
return id, 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
|
||||
}
|
||||
now := "datetime('now')"
|
||||
if db.IsPostgres(dbURL) {
|
||||
var id int64
|
||||
err = sqlDB.QueryRow(
|
||||
`INSERT INTO web_users(username, password_hash, created_at) VALUES(?,?,to_char(now() AT TIME ZONE 'UTC','YYYY-MM-DD HH24:MI:SS')) RETURNING id`,
|
||||
username, passwordHash,
|
||||
).Scan(&id)
|
||||
return id, err
|
||||
}
|
||||
res, err := sqlDB.Exec(
|
||||
`INSERT INTO web_users(username, password_hash, created_at) VALUES(?,?,`+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) (db.SQLDB, error) {
|
||||
return db.OpenSQLDB(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")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,225 @@
|
||||
package render
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var (
|
||||
rePostForm = regexp.MustCompile(`(?is)<form\b([^>]*\bmethod\s*=\s*["']post["'][^>]*)>([\s\S]*?)</form>`)
|
||||
reAction = regexp.MustCompile(`(?i)\baction\s*=\s*["']([^"']*)["']`)
|
||||
reCSRFIn = regexp.MustCompile(`(?i)\bname\s*=\s*["']_csrf["']`)
|
||||
reNextIn = regexp.MustCompile(`(?i)\bname\s*=\s*["']next["']`)
|
||||
)
|
||||
|
||||
// AuthFormSpec describes a progressive-enhancement login/register form.
|
||||
type AuthFormSpec struct {
|
||||
Action string
|
||||
Submit string
|
||||
FormID string
|
||||
ErrID string
|
||||
Target string
|
||||
NextDefault string
|
||||
Kind string // login | register
|
||||
}
|
||||
|
||||
// AuthFormFromPage reads page["auth_form"].
|
||||
func AuthFormFromPage(page map[string]any) *AuthFormSpec {
|
||||
if page == nil {
|
||||
return nil
|
||||
}
|
||||
raw, ok := page["auth_form"].(map[string]any)
|
||||
if !ok || raw == nil {
|
||||
return nil
|
||||
}
|
||||
spec := &AuthFormSpec{
|
||||
Action: strings.TrimSpace(text(raw["action"])),
|
||||
Submit: strings.TrimSpace(text(raw["submit"])),
|
||||
FormID: strings.TrimSpace(text(raw["form_id"])),
|
||||
ErrID: strings.TrimSpace(text(raw["err_id"])),
|
||||
Target: strings.TrimSpace(text(raw["target"])),
|
||||
NextDefault: strings.TrimSpace(text(raw["next"])),
|
||||
Kind: strings.TrimSpace(strings.ToLower(text(raw["kind"]))),
|
||||
}
|
||||
if spec.Action == "" {
|
||||
return nil
|
||||
}
|
||||
if spec.Submit == "" {
|
||||
if spec.Kind == "register" {
|
||||
spec.Submit = "注册"
|
||||
} else {
|
||||
spec.Submit = "登录"
|
||||
}
|
||||
}
|
||||
if spec.FormID == "" {
|
||||
if spec.Kind == "register" {
|
||||
spec.FormID = "site-register-form"
|
||||
} else {
|
||||
spec.FormID = "site-login-form"
|
||||
}
|
||||
}
|
||||
if spec.ErrID == "" {
|
||||
spec.ErrID = "site-auth-err"
|
||||
}
|
||||
if spec.Kind == "" {
|
||||
if strings.Contains(spec.Action, "register") {
|
||||
spec.Kind = "register"
|
||||
} else {
|
||||
spec.Kind = "login"
|
||||
}
|
||||
}
|
||||
return spec
|
||||
}
|
||||
|
||||
// RenderAuthFormHTML builds a complete auth form (CSRF/next filled at inject time too).
|
||||
func RenderAuthFormHTML(spec *AuthFormSpec, csrf, next, flash string) string {
|
||||
if spec == nil {
|
||||
return ""
|
||||
}
|
||||
next = strings.TrimSpace(next)
|
||||
if next == "" {
|
||||
next = strings.TrimSpace(spec.NextDefault)
|
||||
}
|
||||
var b strings.Builder
|
||||
fmt.Fprintf(&b, `<form id="%s" class="auth-form mq-auth-form" method="post" action="%s">`, esc(spec.FormID), esc(spec.Action))
|
||||
if csrf != "" {
|
||||
fmt.Fprintf(&b, `<input type="hidden" name="_csrf" value="%s"/>`, esc(csrf))
|
||||
}
|
||||
if next != "" && spec.Kind != "register" {
|
||||
fmt.Fprintf(&b, `<input type="hidden" name="next" value="%s"/>`, esc(next))
|
||||
}
|
||||
b.WriteString(`<label>用户名<input name="username" autocomplete="username" required autofocus/></label>`)
|
||||
b.WriteString(`<label>密码<input name="password" type="password" autocomplete="`)
|
||||
if spec.Kind == "register" {
|
||||
b.WriteString(`new-password`)
|
||||
} else {
|
||||
b.WriteString(`current-password`)
|
||||
}
|
||||
b.WriteString(`" required`)
|
||||
if spec.Kind == "register" {
|
||||
b.WriteString(` minlength="4"`)
|
||||
}
|
||||
b.WriteString(`/></label>`)
|
||||
fmt.Fprintf(&b, `<button type="submit">%s</button>`, esc(spec.Submit))
|
||||
b.WriteString(`</form>`)
|
||||
flashAttr := ` hidden`
|
||||
flashText := ""
|
||||
if strings.TrimSpace(flash) != "" {
|
||||
flashAttr = ""
|
||||
flashText = strings.TrimSpace(flash)
|
||||
}
|
||||
fmt.Fprintf(&b, `<p id="%s" class="auth-err"%s>%s</p>`, esc(spec.ErrID), flashAttr, esc(flashText))
|
||||
return b.String()
|
||||
}
|
||||
|
||||
// ApplyAuthFormIntoIntro injects generated form into intro HTML target, or appends it.
|
||||
func ApplyAuthFormIntoIntro(intro string, spec *AuthFormSpec, csrf, next, flash string) string {
|
||||
if spec == nil {
|
||||
return intro
|
||||
}
|
||||
formHTML := RenderAuthFormHTML(spec, csrf, next, flash)
|
||||
target := strings.TrimSpace(spec.Target)
|
||||
if target != "" {
|
||||
if injected, ok := injectHTMLIntoID(intro, target, formHTML); ok {
|
||||
return injected
|
||||
}
|
||||
}
|
||||
if intro == "" {
|
||||
return formHTML
|
||||
}
|
||||
return intro + formHTML
|
||||
}
|
||||
|
||||
// IsAuthAction reports whether a form action path is a login/register endpoint.
|
||||
func IsAuthAction(action string) bool {
|
||||
a := strings.TrimSpace(action)
|
||||
if a == "" {
|
||||
return false
|
||||
}
|
||||
// Absolute same-origin paths only.
|
||||
if strings.HasPrefix(a, "http://") || strings.HasPrefix(a, "https://") || strings.HasPrefix(a, "//") {
|
||||
return false
|
||||
}
|
||||
path := a
|
||||
if i := strings.IndexByte(path, '?'); i >= 0 {
|
||||
path = path[:i]
|
||||
}
|
||||
path = strings.TrimRight(path, "/")
|
||||
if path == "" {
|
||||
path = "/"
|
||||
}
|
||||
base := path
|
||||
if i := strings.LastIndexByte(path, '/'); i >= 0 {
|
||||
base = path[i+1:]
|
||||
}
|
||||
return base == "login" || base == "register" ||
|
||||
strings.HasSuffix(path, "/login") || strings.HasSuffix(path, "/register")
|
||||
}
|
||||
|
||||
// InjectAuthFields ensures POST auth forms carry _csrf / next, and surfaces flash errors.
|
||||
func InjectAuthFields(html, csrf, next, flash string) string {
|
||||
csrf = strings.TrimSpace(csrf)
|
||||
next = strings.TrimSpace(next)
|
||||
flash = strings.TrimSpace(flash)
|
||||
if csrf == "" && next == "" && flash == "" {
|
||||
return html
|
||||
}
|
||||
out := rePostForm.ReplaceAllStringFunc(html, func(full string) string {
|
||||
m := rePostForm.FindStringSubmatch(full)
|
||||
if len(m) < 3 {
|
||||
return full
|
||||
}
|
||||
attrs, body := m[1], m[2]
|
||||
am := reAction.FindStringSubmatch(attrs)
|
||||
action := ""
|
||||
if len(am) > 1 {
|
||||
action = am[1]
|
||||
}
|
||||
if !IsAuthAction(action) {
|
||||
return full
|
||||
}
|
||||
var inject strings.Builder
|
||||
if csrf != "" && !reCSRFIn.MatchString(body) {
|
||||
fmt.Fprintf(&inject, `<input type="hidden" name="_csrf" value="%s"/>`, esc(csrf))
|
||||
}
|
||||
if next != "" && !reNextIn.MatchString(body) && !strings.Contains(strings.ToLower(action), "register") {
|
||||
fmt.Fprintf(&inject, `<input type="hidden" name="next" value="%s"/>`, esc(next))
|
||||
}
|
||||
if inject.Len() == 0 {
|
||||
return full
|
||||
}
|
||||
return `<form` + attrs + `>` + inject.String() + body + `</form>`
|
||||
})
|
||||
if flash != "" {
|
||||
out = surfaceAuthFlash(out, flash)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
var reErrSlot = regexp.MustCompile(`(?is)(<(?:p|div)\b[^>]*\bid\s*=\s*["'](?:site-auth-err|desk-login-err|auth-err)["'][^>]*)(>)([^<]*)(</(?:p|div)>)`)
|
||||
|
||||
func surfaceAuthFlash(html, flash string) string {
|
||||
replaced := false
|
||||
out := reErrSlot.ReplaceAllStringFunc(html, func(full string) string {
|
||||
m := reErrSlot.FindStringSubmatch(full)
|
||||
if len(m) < 5 {
|
||||
return full
|
||||
}
|
||||
replaced = true
|
||||
open := m[1]
|
||||
open = regexp.MustCompile(`(?i)\s*\bhidden\b`).ReplaceAllString(open, "")
|
||||
return open + m[2] + esc(flash) + m[4]
|
||||
})
|
||||
if replaced {
|
||||
return out
|
||||
}
|
||||
flashHTML := `<p class="flash err auth-err">` + esc(flash) + `</p>`
|
||||
if i := strings.Index(out, `<main`); i >= 0 {
|
||||
if j := strings.Index(out[i:], `>`); j >= 0 {
|
||||
at := i + j + 1
|
||||
return out[:at] + flashHTML + out[at:]
|
||||
}
|
||||
}
|
||||
return flashHTML + out
|
||||
}
|
||||
Loaded 100 of 135 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user