From e90ade2ba02bccc5845935faba9dd471c054527b Mon Sep 17 00:00:00 2001 From: root Date: Sun, 11 Oct 2026 15:09:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=9C=9F24=E5=B0=8F=E6=97=B6=20+=20Cloudflare=20Turnstile=20?= =?UTF-8?q?=E4=BA=BA=E6=9C=BA=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - jwt_ttl 7200 → 86400 (24h) - 管理登录/代理登录/代理注册 接入 Turnstile - 前端 TurnstileWidget 组件, 未完成验证不可提交 - 密钥通过 env TURNSTILE_SITE_KEY/SECRET_KEY 配置 --- README.md | 2 +- backend/app/Controllers/AuthController.php | 25 +++++- backend/app/Services/TurnstileService.php | 48 ++++++++++++ backend/config/app.php | 6 +- frontend/src/components/TurnstileWidget.vue | 85 +++++++++++++++++++++ frontend/src/config/turnstile.js | 5 ++ frontend/src/stores/user.js | 7 +- frontend/src/views/Login.vue | 21 ++++- frontend/src/views/agent/AgentLogin.vue | 22 +++++- frontend/src/views/agent/AgentRegister.vue | 21 ++++- 10 files changed, 230 insertions(+), 12 deletions(-) create mode 100644 backend/app/Services/TurnstileService.php create mode 100644 frontend/src/components/TurnstileWidget.vue create mode 100644 frontend/src/config/turnstile.js diff --git a/README.md b/README.md index b76a047..d0ff6d2 100644 --- a/README.md +++ b/README.md @@ -236,7 +236,7 @@ curl -s http://your-domain/api/cron/notify-expiring | 类型 | 说明 | |------|------| -| **JWT Token** | 登录后获取,请求头 `Authorization: Bearer `,有效期 24 小时 | +| **JWT Token** | 登录后获取,请求头 `Authorization: Bearer `,有效期 **24 小时** | | **API Key** | 项目密钥,仅用于授权验证接口,请求头 `X-Api-Key: ` | | **公开接口** | 无需认证,有频率限制(60秒内 30 次) | diff --git a/backend/app/Controllers/AuthController.php b/backend/app/Controllers/AuthController.php index 04dc8b7..4d5b380 100644 --- a/backend/app/Controllers/AuthController.php +++ b/backend/app/Controllers/AuthController.php @@ -6,6 +6,7 @@ use App\Core\Application; use App\Core\Database; use App\Core\Validator; use App\Services\JwtService; +use App\Services\TurnstileService; /** * 认证控制器 @@ -52,6 +53,12 @@ class AuthController extends Controller $this->error('请输入用户名或邮箱'); } + // Cloudflare Turnstile 人机验证 + $turnstileToken = trim((string) ($input['turnstile_token'] ?? '')); + if (!TurnstileService::verify($turnstileToken !== '' ? $turnstileToken : null, clientIp())) { + $this->error('人机验证失败,请完成验证后重试'); + } + $db = Database::getInstance(); // 根据是否包含@选择查询方式 @@ -125,6 +132,12 @@ class AuthController extends Controller $this->error('两次输入的密码不一致'); } + // Cloudflare Turnstile 人机验证 + $turnstileToken = trim((string) ($input['turnstile_token'] ?? '')); + if (!TurnstileService::verify($turnstileToken !== '' ? $turnstileToken : null, clientIp())) { + $this->error('人机验证失败,请完成验证后重试'); + } + // 手机号格式验证 if (!preg_match('/^1[3-9]\d{9}$/', $input['phone'])) { $this->error('手机号格式不正确'); @@ -255,12 +268,18 @@ class AuthController extends Controller $this->error($validator->getFirstError()); } - $user = $this->getCurrentUser(); - if (!passwordVerify($input['old_password'], $user['password'])) { + $db = Database::getInstance(); + $user = $db->fetch( + "SELECT * FROM {$db->table('users')} WHERE id = ? AND deleted_at IS NULL", + [$this->getUserId()] + ); + if (!$user) { + $this->error('用户不存在'); + } + if (empty($user['password']) || !passwordVerify($input['old_password'], $user['password'])) { $this->error('原密码错误'); } - $db = Database::getInstance(); $db->execute( "UPDATE {$db->table('users')} SET password = ? WHERE id = ?", [passwordHash($input['new_password']), $user['id']] diff --git a/backend/app/Services/TurnstileService.php b/backend/app/Services/TurnstileService.php new file mode 100644 index 0000000..cd8a634 --- /dev/null +++ b/backend/app/Services/TurnstileService.php @@ -0,0 +1,48 @@ + $secret, + 'response' => $token, + ]; + if ($remoteIp) { + $payload['remoteip'] = $remoteIp; + } + + $ch = curl_init('https://challenges.cloudflare.com/turnstile/v0/siteverify'); + curl_setopt_array($ch, [ + CURLOPT_POST => true, + CURLOPT_POSTFIELDS => http_build_query($payload), + CURLOPT_RETURNTRANSFER => true, + CURLOPT_TIMEOUT => 10, + CURLOPT_HTTPHEADER => ['Content-Type: application/x-www-form-urlencoded'], + ]); + $body = curl_exec($ch); + curl_close($ch); + + if ($body === false) { + return false; + } + $json = json_decode($body, true); + return !empty($json['success']); + } +} diff --git a/backend/config/app.php b/backend/config/app.php index f5cbc85..a725978 100644 --- a/backend/config/app.php +++ b/backend/config/app.php @@ -8,7 +8,7 @@ return [ 'debug' => env('APP_DEBUG', false), 'timezone' => 'Asia/Shanghai', 'jwt_secret' => env('JWT_SECRET', ''), - 'jwt_ttl' => 7200, // Token有效期(秒) + 'jwt_ttl' => 86400, // Token有效期(秒)= 24小时 'jwt_refresh_ttl' => 1209600, // 刷新Token有效期(秒) 'rate_limit' => [ 'api' => 60, // 普通API每分钟请求数 @@ -28,4 +28,8 @@ return [ 'return_url' => env('APP_URL', '') . '/#/result', ], 'allowed_origins' => ['*'], + 'turnstile' => [ + 'site_key' => env('TURNSTILE_SITE_KEY', ''), + 'secret_key' => env('TURNSTILE_SECRET_KEY', ''), + ], ]; \ No newline at end of file diff --git a/frontend/src/components/TurnstileWidget.vue b/frontend/src/components/TurnstileWidget.vue new file mode 100644 index 0000000..154d51e --- /dev/null +++ b/frontend/src/components/TurnstileWidget.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/frontend/src/config/turnstile.js b/frontend/src/config/turnstile.js new file mode 100644 index 0000000..28982de --- /dev/null +++ b/frontend/src/config/turnstile.js @@ -0,0 +1,5 @@ +/** + * Cloudflare Turnstile 站点密钥(公开,前端使用) + * 服务端密钥在 backend/.env TURNSTILE_SECRET_KEY + */ +export const TURNSTILE_SITE_KEY = '0x4AAAAAAFTnj3DlAd5JS-An' diff --git a/frontend/src/stores/user.js b/frontend/src/stores/user.js index c8a6d44..fd89126 100644 --- a/frontend/src/stores/user.js +++ b/frontend/src/stores/user.js @@ -11,10 +11,13 @@ export const useUserStore = defineStore('user', () => { * @param {string} account 用户名或邮箱 * @param {string} password 密码 * @param {'admin'|'agent'} portal 登录入口 + * @param {string} turnstileToken Turnstile 人机验证 token */ - async function login(account, password, portal = 'admin') { + async function login(account, password, portal = 'admin', turnstileToken = '') { const endpoint = portal === 'agent' ? '/auth/agent-login' : '/auth/admin-login' - const res = await request.post(endpoint, { username: account, password }) + const body = { username: account, password } + if (turnstileToken) body.turnstile_token = turnstileToken + const res = await request.post(endpoint, body) user.value = res.data.user token.value = res.data.token.access_token localStorage.setItem('access_token', res.data.token.access_token) diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue index 799c2fe..500880a 100644 --- a/frontend/src/views/Login.vue +++ b/frontend/src/views/Login.vue @@ -30,6 +30,9 @@ @keyup.enter="handleLogin" /> + + + 登 录 @@ -45,28 +48,42 @@ import { ref, reactive } from 'vue' import { useRouter } from 'vue-router' import { useUserStore } from '@/stores/user' import { ElMessage } from 'element-plus' +import TurnstileWidget from '@/components/TurnstileWidget.vue' +import { TURNSTILE_SITE_KEY } from '@/config/turnstile' const router = useRouter() const userStore = useUserStore() const loading = ref(false) const formRef = ref(null) +const turnstileRef = ref(null) +const turnstileToken = ref('') const form = reactive({ username: '', password: '' }) const rules = { username: [{ required: true, message: '请输入用户名', trigger: 'blur' }], password: [{ required: true, message: '请输入密码', trigger: 'blur' }] } +function onToken(t) { + turnstileToken.value = t || '' +} + async function handleLogin() { if (!formRef.value) return await formRef.value.validate(async (valid) => { if (!valid) return + if (TURNSTILE_SITE_KEY && !turnstileToken.value) { + ElMessage.warning('请先完成人机验证') + turnstileRef.value?.reset?.() + return + } loading.value = true try { - await userStore.login(form.username, form.password, 'admin') + await userStore.login(form.username, form.password, 'admin', turnstileToken.value) ElMessage.success('登录成功') router.push('/dashboard') } catch (e) { - // error handled by interceptor + turnstileRef.value?.reset?.() + turnstileToken.value = '' } finally { loading.value = false } diff --git a/frontend/src/views/agent/AgentLogin.vue b/frontend/src/views/agent/AgentLogin.vue index 3462c56..cc0462a 100644 --- a/frontend/src/views/agent/AgentLogin.vue +++ b/frontend/src/views/agent/AgentLogin.vue @@ -43,6 +43,10 @@ 忘记密码? + + + + 登 录 @@ -64,11 +68,19 @@ import { useRouter } from 'vue-router' import { ElMessage } from 'element-plus' import { User, Lock, Avatar } from '@element-plus/icons-vue' import { useUserStore } from '@/stores/user' +import TurnstileWidget from '@/components/TurnstileWidget.vue' +import { TURNSTILE_SITE_KEY } from '@/config/turnstile' const router = useRouter() const userStore = useUserStore() const loading = ref(false) const formRef = ref(null) +const turnstileRef = ref(null) +const turnstileToken = ref('') + +function onToken(t) { + turnstileToken.value = t || '' +} const form = reactive({ account: '', @@ -93,9 +105,14 @@ async function handleLogin() { if (!formRef.value) return await formRef.value.validate(async (valid) => { if (!valid) return + if (TURNSTILE_SITE_KEY && !turnstileToken.value) { + ElMessage.warning('请先完成人机验证') + turnstileRef.value?.reset?.() + return + } loading.value = true try { - await userStore.login(form.account, form.password, 'agent') + await userStore.login(form.account, form.password, 'agent', turnstileToken.value) if (form.remember) { localStorage.setItem('agent_remember_account', form.account) } else { @@ -104,7 +121,8 @@ async function handleLogin() { ElMessage.success('登录成功') router.push('/dashboard') } catch (e) { - // error handled by interceptor + turnstileRef.value?.reset?.() + turnstileToken.value = '' } finally { loading.value = false } diff --git a/frontend/src/views/agent/AgentRegister.vue b/frontend/src/views/agent/AgentRegister.vue index 7381206..177b9e3 100644 --- a/frontend/src/views/agent/AgentRegister.vue +++ b/frontend/src/views/agent/AgentRegister.vue @@ -73,6 +73,10 @@ + + + + 注 册 @@ -94,10 +98,18 @@ import { useRouter } from 'vue-router' import { ElMessage } from 'element-plus' import { User, Lock, Message, Phone, Ticket } from '@element-plus/icons-vue' import request from '@/api' +import TurnstileWidget from '@/components/TurnstileWidget.vue' +import { TURNSTILE_SITE_KEY } from '@/config/turnstile' const router = useRouter() const loading = ref(false) const formRef = ref(null) +const turnstileRef = ref(null) +const turnstileToken = ref('') + +function onToken(t) { + turnstileToken.value = t || '' +} const form = reactive({ username: '', @@ -185,6 +197,11 @@ async function handleRegister() { if (!formRef.value) return await formRef.value.validate(async (valid) => { if (!valid) return + if (TURNSTILE_SITE_KEY && !turnstileToken.value) { + ElMessage.warning('请先完成人机验证') + turnstileRef.value?.reset?.() + return + } loading.value = true try { await request.post('/auth/agent-register', { @@ -194,11 +211,13 @@ async function handleRegister() { email: form.email, phone: form.phone, invite_code: form.inviteCode, + turnstile_token: turnstileToken.value, }) ElMessage.success('注册成功,请登录') router.push('/agent/login') } catch (e) { - // error handled by interceptor + turnstileRef.value?.reset?.() + turnstileToken.value = '' } finally { loading.value = false }