Commit 3f22a86
feat(captcha): switchable multi-provider set + GeeTest v4 + Cap (#30)
* feat: allow skipping 2FA on GPG-verified login
* feat(captcha): switchable multi-provider set + GeeTest v4 + Cap
Replace the single site-wide captcha provider with an ordered, switchable set:
- captcha_providers[] — element 0 is the default, the rest are alternates a
visitor can switch to (manually, on failure, or after a configurable timeout).
The chosen provider is remembered in localStorage.
- Each provider carries its own credentials; submissions name their provider and
the server verifies against it, rejecting providers outside the enabled set.
- Read-time migration seeds captcha_providers + per-provider keys from the legacy
captcha_provider / shared key pair, so existing deployments keep working.
New providers:
- GeeTest v4 (SenseBot) — lib/geetest.ts, HMAC-signed server validation with a
configurable fail-open/closed posture on GeeTest outage.
- Cap (trycap.dev) — lib/cap.ts, embedded via capjs-core (KV-backed replay guard
+ redeem tokens, secret derived from the JWT secret) or external Cap Standalone.
Aliases esbuild/javascript-obfuscator to a stub since capjs-core lazily imports
them for instrumentation levels the embedded path never uses.
Also: AdminSettings provider-set editor (default + alternates with reordering +
per-provider panels), new config keys wired through allowlist/redaction/secret
encryption/log redaction, EN+zh docs, CONTEXT.md glossary and ADR 0001.
* fix(captcha): address Sourcery review
- geetest: reject missing/malformed output unconditionally; only apply
fail-open to a confirmed GeeTest transport/service outage, closing a bypass
where an empty geetest object passed when fail-open was enabled (security).
- cap: make the embedded single-use checks atomic via the D1 replay-claim table
(claimReplayValue) instead of racy KV get-then-put — the challenge nonce and
the redeem token are now consumed exactly once under concurrency. KV still
proves token authenticity/expiry; the atomic claim is the single-use gate.
- geetest widget: mount with product "popup" + appendTo(container) so the
widget actually renders and onReady fires; removed the disconnected manual
verify button.
* Delete docs/adr/0001-switchable-captcha-set.md
i dont want adr for now
* docs: complete CONTEXT.md project glossary; point AGENTS.md to it
Expand CONTEXT.md from the captcha-only glossary into the full project
vocabulary — identity (user, team-as-user, restricted account), team structure
(sub-team vs member group, effective role, site floor), apps & providers (OAuth
app vs source, first-party/official/verified/trusted, public client),
step-up/sudo, scopes & tokens, invitations, domains, captcha, and governance
(audit log, notice, notification ruleset). Add an AGENTS.md 'Domain model'
section directing agents to read and keep CONTEXT.md current.
---------
Co-authored-by: wyf9 <wyf9@siiway.org>1 parent 9758405 commit 3f22a86
44 files changed
Lines changed: 2417 additions & 459 deletions
File tree
- docs
- zh
- src
- components
- i18n
- lib
- pages
- admin
- oauth
- worker
- db/migrations
- lib
- stubs
- middleware
- routes
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
15 | 25 | | |
16 | 26 | | |
17 | 27 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
0 commit comments