Fix captcha route parsing

signalapp · Nov 10, 2023 · 31d680d · 31d680d
1 parent fea85d3
commit 31d680d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/ts/test-node/util/signalRoutes_test.ts b/ts/test-node/util/signalRoutes_test.ts
@@ -106,12 +106,14 @@ describe('signalRoutes', () => {
   });
 
   it('captcha', () => {
+    const captchaId =
+      'signal-hcaptcha.foo-bar_baz.challenge.foo-bar_baz.foo-bar_baz';
     const result: ParsedSignalRoute = {
       key: 'captcha',
-      args: { captchaId: 'foobar' },
+      args: { captchaId },
     };
     const check = createCheck({ hasWebUrl: false });
-    check('signalcaptcha://foobar', result);
+    check(`signalcaptcha://${captchaId}`, result);
   });
 
   it('linkCall', () => {

diff --git a/ts/util/signalRoutes.ts b/ts/util/signalRoutes.ts
@@ -48,7 +48,7 @@ type AllHostnamePatterns =
   | 'start-call-lobby'
   | 'show-window'
   | 'set-is-presenting'
-  | ':captchaId'
+  | ':captchaId(.+)'
   | '';
 
 /**
@@ -325,7 +325,8 @@ export const linkDeviceRoute = _route('linkDevice', {
  * ```
  */
 export const captchaRoute = _route('captcha', {
-  patterns: [_pattern('signalcaptcha:', ':captchaId', '', {})],
+  // needs `(.+)` to capture `.` in hostname
+  patterns: [_pattern('signalcaptcha:', ':captchaId(.+)', '', {})],
   schema: z.object({
     captchaId: paramSchema, // opaque
   }),