From 3b9f51666b0e85f227b670eb4bfdcbfa549bc2fa Mon Sep 17 00:00:00 2001
From: David Byers <david.byers@liu.se>
Date: Wed, 31 Mar 2021 11:59:07 +0200
Subject: [PATCH] Moved patterns to patterns.js. Compute regexp and target
patterns from common source.
---
firefox/manifest.merge.json | 2 ++
shared/links.js | 19 ------------
shared/menu.js | 2 +-
shared/patterns.js | 54 +++++++++++++++++++++++++++++++++
thunderbird/background.js | 2 ++
thunderbird/manifest.merge.json | 1 +
6 files changed, 60 insertions(+), 20 deletions(-)
create mode 100644 shared/patterns.js
diff --git a/firefox/manifest.merge.json b/firefox/manifest.merge.json
index 2500958..14fcf67 100644
--- a/firefox/manifest.merge.json
+++ b/firefox/manifest.merge.json
@@ -1,6 +1,7 @@
{
"background": {
"scripts": [
+ "patterns.js",
"links.js",
"menu.js"
]
@@ -16,6 +17,7 @@
],
"js": [
"mutation.js",
+ "patterns.js",
"links.js",
"popup.js",
"content.js"
diff --git a/shared/links.js b/shared/links.js
index 3c817b1..9d9624a 100644
--- a/shared/links.js
+++ b/shared/links.js
@@ -22,25 +22,6 @@
// Shared code
-/**
- * List of regexps that match safe links. The original URL must be
- * collected in match group 1.
- */
-const regexpList = [
- 'https?://[^.]+[.]safelinks[.]protection[.]outlook[.]com/[?]url=([^&]+)&.*',
- 'https?://linkprotect[.]cudasvc[.]com/url[?]a=([^&]+)&.*'
-];
-
-
-/**
- * Concatenated regexp for all safe links types.
- */
-const safelinksRegexp = new RegExp(
- '(?:' + regexpList.map((string) => '(?:' + string + ')').join('|') + ')',
- 'gi'
-);
-
-
/**
* The ID for the popup element that is added to the HTML document.
*/
diff --git a/shared/menu.js b/shared/menu.js
index 22d58cd..8099e43 100644
--- a/shared/menu.js
+++ b/shared/menu.js
@@ -54,7 +54,7 @@ browser.menus.create({
title: browser.i18n.getMessage("copyLinkMenuTitle"),
contexts: ["link"],
visible: true,
- targetUrlPatterns: ["*://*.safelinks.protection.outlook.com/*"],
+ targetUrlPatterns: computeSafelinksMatchPatterns()
});
browser.menus.onClicked.addListener((info, tab) => {
diff --git a/shared/patterns.js b/shared/patterns.js
new file mode 100644
index 0000000..a52e3c5
--- /dev/null
+++ b/shared/patterns.js
@@ -0,0 +1,54 @@
+// Safe Links Cleaner
+// Copyright 2021 David Byers <david.byers@liu.se>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+// Shared code
+
+
+
+const safelinksPatterns = [
+ {
+ host: '*.safelinks.protection.outlook.com',
+ path: '[?]url=([^&]+).*'
+ },
+ {
+ host: 'linkprotect.cudasvc.com',
+ path: 'url[?]a=([^&]+).*'
+ }
+];
+
+function computeSafelinksMatchPatterns() {
+ return safelinksPatterns.map(({host, path}) => '*://' + host + '/*');
+}
+
+function escapeHostname(host) {
+ return host.replace('.', '[.]').replace('*', '[^/]*')
+}
+
+function computeSafelinksRegexp() {
+ return new RegExp('(?:' +
+ safelinksPatterns.map(
+ ({host, path}) =>
+ `(?:https?://${escapeHostname(host)}/${path})`).join('|') +
+ ')',
+ 'gi');
+}
+
+const safelinksRegexp = computeSafelinksRegexp()
diff --git a/thunderbird/background.js b/thunderbird/background.js
index 28df119..31830d6 100644
--- a/thunderbird/background.js
+++ b/thunderbird/background.js
@@ -28,6 +28,7 @@ browser.composeScripts.register({
],
js: [
{file: "mutation.js"},
+ {file: "patterns.js"},
{file: "links.js"},
{file: "popup.js"},
{file: "compose.js"}
@@ -40,6 +41,7 @@ browser.messageDisplayScripts.register({
],
js: [
{file: "mutation.js"},
+ {file: "patterns.js"},
{file: "links.js"},
{file: "popup.js"},
{file: "display.js"},
diff --git a/thunderbird/manifest.merge.json b/thunderbird/manifest.merge.json
index 2b4937a..343d2c2 100644
--- a/thunderbird/manifest.merge.json
+++ b/thunderbird/manifest.merge.json
@@ -7,6 +7,7 @@
},
"background": {
"scripts": [
+ "patterns.js",
"links.js",
"menu.js",
"background.js"
--
GitLab