From 8e26a59cb85901e9428892d67f2dbc61a45775e6 Mon Sep 17 00:00:00 2001
From: nobody <info@localcdn.org>
Date: Thu, 28 Jul 2022 06:11:44 +0200
Subject: [PATCH] Improve regex validation import config

---
 core/storage-manager.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/storage-manager.js b/core/storage-manager.js
index 4453ec52..d88d62f4 100644
--- a/core/storage-manager.js
+++ b/core/storage-manager.js
@@ -212,7 +212,7 @@ storageManager._validateDomainsAndStatistics = function (type, obj) {
     if (type === 'allowedDomainsGoogleFonts' || type === 'domainsManipulateDOM' || type === 'allowlistedDomains') {
         for (const [key, value] of Object.entries(obj)) {
             // eslint-disable-next-line no-useless-escape
-            if ((/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}/.test(key) || key === '') && value === true) {
+            if (((/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,24}/).test(key) || key === '') && value === true) {
                 valid[key] = value;
             } else {
                 alert(`${chrome.i18n.getMessage('dialogImportFailed')}: ${key}`);
@@ -221,7 +221,7 @@ storageManager._validateDomainsAndStatistics = function (type, obj) {
         }
     } else if (type === 'internalStatisticsData') {
         for (const [date, values] of Object.entries(obj)) {
-            if (/((2[0-9])[0-9]{2})-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])/.test(date)) {
+            if ((/((2\d)\d{2})-(0[1-9]|1[012])-(0[1-9]|[12]\d|3[01])/).test(date)) {
                 for (const [types, category] of Object.entries(values)) {
                     if (types === 'frameworks') {
                         for (const [name, counter] of Object.entries(category)) {
@@ -258,9 +258,9 @@ storageManager._validateDomainsAndStatistics = function (type, obj) {
 };
 
 storageManager._validateStrings = function (value) {
-    if (/((2[0-9])[0-9]{2})-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])/.test(value)) {
+    if ((/((2\d)\d{2})-(0[1-9]|1[012])-(0[1-9]|[12]\d|3[01])/).test(value)) {
         return value;
-    } else if (/#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/.test(value)) {
+    } else if ((/#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/).test(value)) {
         return value;
     } else if (value === 'Default' || value === 'Light' || value === 'Grey') {
         return value;