Merge pull request #666 from aswin-s/fix/34324

fix: optimise url matching regex
Expensify · Mar 19, 2024 · aed3f80 · aed3f80
2 parents fe10326 + 4dc7510
commit aed3f80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/__tests__/URL-test.js b/__tests__/URL-test.js
@@ -25,6 +25,7 @@ describe('Strict URL validation', () => {
         it('correctly tests valid urls', () => {
             const regexToTest = new RegExp(`^${URL_REGEX}$`, 'i');
             expect(regexToTest.test('google.com/')).toBeTruthy();
+            expect(regexToTest.test('x.com')).toBeTruthy();
             expect(regexToTest.test('https://google.com/')).toBeTruthy();
             expect(regexToTest.test('ftp://google.com/')).toBeTruthy();
             expect(regexToTest.test('we.are.expensify.com/how-we-got-here')).toBeTruthy();

diff --git a/lib/Url.js b/lib/Url.js
@@ -2,7 +2,8 @@ import TLD_REGEX from './tlds';
 
 const ALLOWED_PORTS = '([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])';
 const URL_PROTOCOL_REGEX = '((ht|f)tps?:\\/\\/)';
-const URL_WEBSITE_REGEX = `${URL_PROTOCOL_REGEX}?((?:www\\.)?[a-z0-9](?:[-a-z0-9]*[a-z0-9])?\\.)+(?:${TLD_REGEX})(?:\\:${ALLOWED_PORTS}|\\b|(?=_))(?!@(?:[a-z\\d-]+\\.)+[a-z]{2,})`;
+const URL_WEBSITE_REGEX = `${URL_PROTOCOL_REGEX}?((?:www\\.)?[a-z0-9](?=(?<label>[-a-z0-9]*[a-z0-9])?)\\k<label>\\.)+(?:${TLD_REGEX})\
+(?:\\:${ALLOWED_PORTS}|\\b|(?=_))(?!@(?:[a-z\\d-]+\\.)+[a-z]{2,})`;
 const addEscapedChar = reg => `(?:${reg}|&(?:amp|#x27);)`;
 const URL_PATH_REGEX = `(?:${addEscapedChar('[.,=(+$!*]')}?\\/${addEscapedChar('[-\\w$@.+!*:(),=%~]')}*${addEscapedChar('[-\\w~@:%)]')}|\\/)*`;
 const URL_PARAM_REGEX = `(?:\\?${addEscapedChar('[-\\w$@.+!*()\\/,=%{}:;\\[\\]\\|_|~]')}*)?`;