Cloudflare Turnstile en login y registro (Next.js)
- lib/turnstile.ts: verifyTurnstile(token, ip) contra siteverify (fail-closed). - components/Turnstile.tsx: widget cliente (carga el script de Cloudflare, callback con el token). Site key por NEXT_PUBLIC_TURNSTILE_SITE_KEY; secreto server-only. - LoginForm/RegisterForm: widget + token en el POST; submit deshabilitado hasta resolver el captcha (si hay site key). - Routes login/register: verifican el token antes de continuar (error captchaFailed). - Catálogos: captchaFailed. Verificado: POST sin token -> captchaFailed en login y registro (enforcement server). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -3,8 +3,10 @@
|
||||
import { useState } from 'react'
|
||||
import { useTranslations } from 'next-intl'
|
||||
import { useRouter } from '@/i18n/navigation'
|
||||
import { Turnstile } from '@/components/Turnstile'
|
||||
|
||||
const ERROR_KEYS = ['invalidCredentials', 'missingFields', 'invalidRequest'] as const
|
||||
const ERROR_KEYS = ['invalidCredentials', 'missingFields', 'invalidRequest', 'captchaFailed'] as const
|
||||
const SITE_KEY = process.env.NEXT_PUBLIC_TURNSTILE_SITE_KEY
|
||||
|
||||
export function LoginForm() {
|
||||
const t = useTranslations('Login')
|
||||
@@ -13,6 +15,7 @@ export function LoginForm() {
|
||||
const [password, setPassword] = useState('')
|
||||
const [showPw, setShowPw] = useState(false)
|
||||
const [busy, setBusy] = useState(false)
|
||||
const [captcha, setCaptcha] = useState('')
|
||||
const [message, setMessage] = useState<{ ok: boolean; text: string } | null>(null)
|
||||
|
||||
async function handleSubmit(e: React.FormEvent) {
|
||||
@@ -29,7 +32,7 @@ export function LoginForm() {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
credentials: 'same-origin',
|
||||
body: JSON.stringify({ email: email.trim(), password }),
|
||||
body: JSON.stringify({ email: email.trim(), password, turnstileToken: captcha }),
|
||||
})
|
||||
const data: { success?: boolean; needsSelection?: boolean; error?: string } = await res.json()
|
||||
if (data.success) {
|
||||
@@ -77,9 +80,10 @@ export function LoginForm() {
|
||||
{showPw ? '🙈' : '👁'}
|
||||
</button>
|
||||
</div>
|
||||
<Turnstile onVerify={setCaptcha} />
|
||||
<button
|
||||
type="submit"
|
||||
disabled={busy}
|
||||
disabled={busy || (!!SITE_KEY && !captcha)}
|
||||
className="w-full rounded bg-amber-600 px-4 py-2 font-semibold text-[#1b120b] disabled:opacity-60"
|
||||
>
|
||||
{busy ? t('connecting') : t('submit')}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
import { useState } from 'react'
|
||||
import { useTranslations } from 'next-intl'
|
||||
import { Turnstile } from '@/components/Turnstile'
|
||||
|
||||
const ERROR_KEYS = [
|
||||
'missingFields',
|
||||
@@ -10,13 +11,16 @@ const ERROR_KEYS = [
|
||||
'invalidEmail',
|
||||
'emailExists',
|
||||
'recruiterNotFound',
|
||||
'captchaFailed',
|
||||
] as const
|
||||
const SITE_KEY = process.env.NEXT_PUBLIC_TURNSTILE_SITE_KEY
|
||||
|
||||
export function RegisterForm() {
|
||||
const t = useTranslations('Register')
|
||||
const [form, setForm] = useState({ password: '', confPassword: '', email: '', confEmail: '', recruiter: '' })
|
||||
const [accepted, setAccepted] = useState(false)
|
||||
const [busy, setBusy] = useState(false)
|
||||
const [captcha, setCaptcha] = useState('')
|
||||
const [message, setMessage] = useState<{ ok: boolean; text: string } | null>(null)
|
||||
|
||||
function upd(k: string, v: string) {
|
||||
@@ -33,7 +37,7 @@ export function RegisterForm() {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
credentials: 'same-origin',
|
||||
body: JSON.stringify(form),
|
||||
body: JSON.stringify({ ...form, turnstileToken: captcha }),
|
||||
})
|
||||
const data: { success?: boolean; error?: string } = await res.json()
|
||||
if (data.success) {
|
||||
@@ -64,7 +68,8 @@ export function RegisterForm() {
|
||||
<input type="checkbox" checked={accepted} onChange={(e) => setAccepted(e.target.checked)} className="mt-1" />
|
||||
<span>{t('terms')}</span>
|
||||
</label>
|
||||
<button type="submit" disabled={busy || !accepted} className="w-full rounded bg-amber-600 px-4 py-2 font-semibold text-[#1b120b] disabled:opacity-60">
|
||||
<Turnstile onVerify={setCaptcha} />
|
||||
<button type="submit" disabled={busy || !accepted || (!!SITE_KEY && !captcha)} className="w-full rounded bg-amber-600 px-4 py-2 font-semibold text-[#1b120b] disabled:opacity-60">
|
||||
{busy ? t('creating') : t('submit')}
|
||||
</button>
|
||||
</form>
|
||||
|
||||
@@ -1,18 +1,26 @@
|
||||
import { authenticate, getGameAccounts } from '@/lib/auth'
|
||||
import { getSession } from '@/lib/session'
|
||||
import { setGameAccountSession } from '@/lib/account-session'
|
||||
import { verifyTurnstile } from '@/lib/turnstile'
|
||||
|
||||
export async function POST(request: Request) {
|
||||
let email = ''
|
||||
let password = ''
|
||||
let turnstileToken = ''
|
||||
try {
|
||||
const body = await request.json()
|
||||
email = String(body.email ?? '').trim()
|
||||
password = String(body.password ?? '')
|
||||
turnstileToken = String(body.turnstileToken ?? '')
|
||||
} catch {
|
||||
return Response.json({ success: false, error: 'invalidRequest' }, { status: 400 })
|
||||
}
|
||||
|
||||
const ip = (request.headers.get('x-forwarded-for') || '').split(',')[0].trim()
|
||||
if (!(await verifyTurnstile(turnstileToken, ip))) {
|
||||
return Response.json({ success: false, error: 'captchaFailed' })
|
||||
}
|
||||
|
||||
if (!email || !password) {
|
||||
return Response.json({ success: false, error: 'missingFields' })
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { registerAccount } from '@/lib/register'
|
||||
import { verifyTurnstile } from '@/lib/turnstile'
|
||||
|
||||
export async function POST(request: Request) {
|
||||
let body: Record<string, string>
|
||||
@@ -7,6 +8,12 @@ export async function POST(request: Request) {
|
||||
} catch {
|
||||
return Response.json({ success: false, error: 'invalidRequest' }, { status: 400 })
|
||||
}
|
||||
|
||||
const ip = (request.headers.get('x-forwarded-for') || '').split(',')[0].trim()
|
||||
if (!(await verifyTurnstile(body.turnstileToken ?? '', ip))) {
|
||||
return Response.json({ success: false, error: 'captchaFailed' })
|
||||
}
|
||||
|
||||
const result = await registerAccount({
|
||||
password: body.password ?? '',
|
||||
confPassword: body.confPassword ?? '',
|
||||
|
||||
Reference in New Issue
Block a user