From 9302a237c584442f28cd6faea31a0774fa979058 Mon Sep 17 00:00:00 2001
From: tsm-odoo <tsm@odoo.com>
Date: Tue, 23 May 2023 11:04:11 +0000
Subject: [PATCH] [FIX] mail: incomplete url regex
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The discuss app uses an url regex in order to find links and
transform them to html before posting a message.
Before this commit, some unsafe url characters were missing
from this regex, resulting in incorrectly parsed url.
This commit adds missing characters in order to match RFC1738
[1].
[1]: https://www.ietf.org/rfc/rfc1738.txt
closes odoo/odoo#122093
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
addons/mail/static/src/js/utils.js | 2 +-
.../qunit_suite_tests/utils/mail_utils_tests.js | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/addons/mail/static/src/js/utils.js b/addons/mail/static/src/js/utils.js
index c51e20e7826a..ee588948b14a 100644
--- a/addons/mail/static/src/js/utils.js
+++ b/addons/mail/static/src/js/utils.js
@@ -65,7 +65,7 @@ var _escapeEntities = (function () {
// Suggested URL Javascript regex of http://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url
// Adapted to make http(s):// not required if (and only if) www. is given. So `should.notmatch` does not match.
// And further extended to include Latin-1 Supplement, Latin Extended-A, Latin Extended-B and Latin Extended Additional.
-var urlRegexp = /\b(?:https?:\/\/\d{1,3}(?:\.\d{1,3}){3}|(?:https?:\/\/|(?:www\.))[-a-z0-9@:%._+~#=\u00C0-\u024F\u1E00-\u1EFF]{2,256}\.[a-z]{2,13})\b(?:[-a-z0-9@:%_+.~#?&'$//=;\u00C0-\u024F\u1E00-\u1EFF]*)/gi;
+var urlRegexp = /\b(?:https?:\/\/\d{1,3}(?:\.\d{1,3}){3}|(?:https?:\/\/|(?:www\.))[-a-z0-9@:%._+~#=\u00C0-\u024F\u1E00-\u1EFF]{2,256}\.[a-z]{2,13})\b(?:[-a-z0-9@:%_+.~#?&[\]^|{}`\\,'$//=;\u00C0-\u024F\u1E00-\u1EFF]*)/gi;
/**
* @param {string} text
* @param {Object} [attrs={}]
diff --git a/addons/mail/static/tests/qunit_suite_tests/utils/mail_utils_tests.js b/addons/mail/static/tests/qunit_suite_tests/utils/mail_utils_tests.js
index 9bfae575a41a..cd86f0c225e5 100644
--- a/addons/mail/static/tests/qunit_suite_tests/utils/mail_utils_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/utils/mail_utils_tests.js
@@ -1,6 +1,7 @@
/** @odoo-module **/
import * as utils from '@mail/js/utils';
+import { start, startServer } from "@mail/../tests/helpers/test_utils";
QUnit.module('mail', {}, function () {
@@ -137,4 +138,20 @@ QUnit.test('addLink: linkify inside text node (2 occurrences)', function (assert
);
});
+QUnit.test("url", async (assert) => {
+ const pyEnv = await startServer();
+ const channelId = pyEnv["mail.channel"].create({ name: "General" });
+ const { click, insertText, openDiscuss } = await start({
+ discuss: {
+ context: { active_id: channelId },
+ },
+ });
+ await openDiscuss();
+ // see: https://www.ietf.org/rfc/rfc1738.txt
+ const messageBody = "https://odoo.com?test=~^|`{}[]#";
+ await insertText(".o_ComposerTextInput_textarea", messageBody);
+ await click("button:contains(Send)");
+ assert.containsOnce($, `.o_Message a:contains(${messageBody})`);
+})
+
});
--
GitLab