Skip to content

armgit / meet

Public Imported from GitHub
0

Open source video conferencing app powered by LiveKit. Built with Django and React.

🔒️(frontend) valide ':roomId' path using a regex

Emmanuel Pelletierf11bcea3a27e
diff --git a/src/frontend/src/App.tsx b/src/frontend/src/App.tsx
index f16e7f5d..128da3f5 100644
--- a/src/frontend/src/App.tsx
+++ b/src/frontend/src/App.tsx
@@ -7,7 +7,7 @@ import { useLang } from 'hoofd'
import { Route, Switch } from 'wouter'
import { HomeRoute } from '@/features/home'
import { NotFound } from './routes/NotFound'
-import { RoomRoute } from '@/features/rooms'
+import { RoomRoute, roomIdRegex } from '@/features/rooms'
import './i18n/init'
const queryClient = new QueryClient()
@@ -19,7 +19,7 @@ function App() {
<QueryClientProvider client={queryClient}>
<Switch>
<Route path="/" component={HomeRoute} />
- <Route path="/:roomId" component={RoomRoute} />
+ <Route path={roomIdRegex} component={RoomRoute} />
<Route component={NotFound} />
</Switch>
<ReactQueryDevtools initialIsOpen={false} />
diff --git a/src/frontend/src/features/rooms/index.ts b/src/frontend/src/features/rooms/index.ts
index dcfe38ef..2fa2d5bf 100644
--- a/src/frontend/src/features/rooms/index.ts
+++ b/src/frontend/src/features/rooms/index.ts
@@ -1,2 +1,3 @@
export { navigateToNewRoom } from './navigation/navigateToNewRoom'
export { Room as RoomRoute } from './routes/Room'
+export { roomIdRegex } from './utils/generateRoomId'
diff --git a/src/frontend/src/features/rooms/utils/generateRoomId.ts b/src/frontend/src/features/rooms/utils/generateRoomId.ts
index dc84dcf1..76bce446 100644
--- a/src/frontend/src/features/rooms/utils/generateRoomId.ts
+++ b/src/frontend/src/features/rooms/utils/generateRoomId.ts
@@ -25,3 +25,6 @@ export const generateRoomId = () => {
];
return parts.join('-');
}
+
+export const roomIdRegex = /^[/](?<roomId>[a-z]{3}-[a-z]{4}-[a-z]{3})$/;
+