From d009e1903b9af45b7ac2afb3051dd0770438cf4f Mon Sep 17 00:00:00 2001
From: Anton Sarukhanov <code@ant.sr>
Date: Sun, 17 May 2020 15:34:03 -0400
Subject: [PATCH] Handle links with arbitrary path.
Previously we assumed that ATP-rewritten links would have the querystring immediately after the domain.
This commit updates the regex to match links even if they have a path component.
Fixes #4.
---
chrome/content/unsafelinks.js | 2 +-
manifest.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/content/unsafelinks.js b/chrome/content/unsafelinks.js
index 6ab8616..076d860 100644
--- a/chrome/content/unsafelinks.js
+++ b/chrome/content/unsafelinks.js
@@ -45,7 +45,7 @@ var unsafelinks = {
},
// Regular expression matching a safelinks-encoded URL.
- urlRegex: /https?:\/\/(?:.+?\.)?safelinks\.protection\.outlook\.com\/([A-Za-z0-9\-\._~:\/\?#\[\]@!$&'\(\)\*\+,;\=%]*)/gi,
+ urlRegex: /https?:\/\/(?:.+?\.)?safelinks\.protection\.outlook\.com\/(?:[^\?]+)?([A-Za-z0-9\-\._~:\/\?#\[\]@!$&'\(\)\*\+,;\=%]*)/gi,
replacer: function(url, queryString){
// Extract the "url" parameter from the URL, if it exists.
diff --git a/manifest.json b/manifest.json
index 1e2b72f..8167046 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "Un-Safelinks",
"description": "Replace URLs which have been rewritten by Office 365 Advanced Threat Protection with the original URL.",
- "version": "1.3.3",
+ "version": "1.4",
"author": "Anton Sarukhanov",
"homepage_url": "https://github.com/antsar/unsafelinks",
"applications": {
--
GitLab