watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-05 13:17:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'dev' into jajaja

Browse source 
# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
Mike Cao 2025-03-31 23:31:09 -05:00
commit c71e9b5707
11 changed files with 126 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/api/auth/verify/route.ts
View file

@ -1,7 +1,7 @@
import { parseRequest } from '@/lib/request';
import { json } from '@/lib/response';
export async function GET(request: Request) {
export async function POST(request: Request) {
const { auth, error } = await parseRequest(request);
if (error) {

10
src/app/api/send/route.ts
View file

@ -34,11 +34,6 @@ const schema = z.object({
export async function POST(request: Request) {
try {
// Bot check
if (!process.env.DISABLE_BOT_CHECK && isbot(request.headers.get('user-agent'))) {
return json({ beep: 'boop' });
}
const { body, error } = await parseRequest(request, schema, { skipAuth: true });
if (error) {
@ -86,6 +81,11 @@ export async function POST(request: Request) {
const { ip, userAgent, device, browser, os, country, subdivision1, subdivision2, city } =
await getClientInfo(request, payload);
// Bot check
if (!process.env.DISABLE_BOT_CHECK && isbot(userAgent)) {
return json({ beep: 'boop' });
}
// IP block
if (hasBlockedIp(ip)) {
return forbidden();