hermes/meshtastic-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change chatId validation schema (#731)

Browse Source 
Fixes #715

Co-authored-by: philon- <philon-@users.noreply.github.com>
This commit is contained in:
Jeremy Gallant
2025-07-22 10:01:31 -04:00
committed by GitHub
co-authored by philon-
parent 67db8b5be8
commit afb7f4bd2e
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/web/src/routes.tsx
+2 -19
View File
@@ -14,7 +14,7 @@ import {
redirect, redirect,
} from "@tanstack/react-router"; } from "@tanstack/react-router";
import type { useTranslation } from "react-i18next"; import type { useTranslation } from "react-i18next";
import { z } from "zod"; import { z } from "zod/v4";
import { App } from "./App.tsx"; import { App } from "./App.tsx";
interface AppContext { interface AppContext {
@@ -55,23 +55,6 @@ const messagesRoute = createRoute({
}, },
}); });
const chatIdSchema = z.string().refine(
(val) => {
const num = Number(val);
if (Number.isNaN(num) || !Number.isInteger(num)) {
return false;
}
const isChannelId = num >= 0 && num <= 10;
const isNodeId = num >= 1000000000 && num <= 9999999999;
return isChannelId || isNodeId;
},
{
message: "Chat ID must be a channel (0-10) or a valid node ID.",
},
);
export const messagesWithParamsRoute = createRoute({ export const messagesWithParamsRoute = createRoute({
getParentRoute: () => rootRoute, getParentRoute: () => rootRoute,
path: "/messages/$type/$chatId", path: "/messages/$type/$chatId",
@@ -83,7 +66,7 @@ export const messagesWithParamsRoute = createRoute({
message: 'Type must be "direct" or "broadcast".', message: 'Type must be "direct" or "broadcast".',
}) })
.parse(params.type), .parse(params.type),
chatId: chatIdSchema.parse(params.chatId), chatId: z.coerce.number().int().min(0).max(4294967294).parse(params.chatId), // max is 0xffffffff - 1
}), }),
}); });