wanhose/cookie-dialog-monster
wanhose/cookie-dialog-monster
2
5
Fork 0
Code Issues 304 Pull Requests Releases 18 Wiki Activity

fix(browser-extension): regexp to match domains

Browse Source
This commit is contained in:
wanhose 2024-10-15 14:32:09 +02:00
parent 056cb8a7af
commit 93ed224620
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/browser-extension/src/scripts/options.js
View File

@ -8,9 +8,9 @@ if (typeof browser === 'undefined') {
const dispatch = browser.runtime.sendMessage; const dispatch = browser.runtime.sendMessage;
/** /**
* @description Domain RegExp * @description RegExp for matching domains
*/ */
const domainRx = /^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$/g; const domainRegExp = /^(?!-)[A-Za-z0-9]([A-Za-z0-9-]{0,61}[A-Za-z0-9])?(\.[A-Za-z]{2,})+$/;
/** /**
* @description Exclusion list, URLs where the user prefers to disable the extension * @description Exclusion list, URLs where the user prefers to disable the extension
@ -58,14 +58,15 @@ function createList() {
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async function handleAddClick() { async function handleAddClick() {
const exclusionValue = window.prompt(browser.i18n.getMessage('options_addPrompt')); const message = browser.i18n.getMessage('options_addPrompt');
const value = window.prompt(message)?.trim().replace('www.', '');
if (exclusionValue?.trim() && (domainRx.test(exclusionValue) || exclusionValue === 'localhost')) { if (value && (domainRegExp.test(value) || value === 'localhost')) {
const filterInputElement = document.getElementById('filter-input'); const filterInputElement = document.getElementById('filter-input');
const state = { on: false }; const state = { on: false };
await dispatch({ hostname: exclusionValue, state, type: 'UPDATE_STORE' }); await dispatch({ hostname: value, state, type: 'UPDATE_STORE' });
exclusionList = [...new Set([...exclusionList, exclusionValue])].sort(); exclusionList = [...new Set([...exclusionList, value])].sort();
createList(); createList();
updateList(filterInputElement.value.trim()); updateList(filterInputElement.value.trim());
} }
@ -169,18 +170,23 @@ function handleFileChange(event) {
const reader = new FileReader(); const reader = new FileReader();
reader.addEventListener('load', async (event) => { reader.addEventListener('load', async (event) => {
const newExclusionList = event.currentTarget.result.split('\n').filter((x) => x.trim()); const input = event.currentTarget.result.split('\n');
const exclusions = [];
for (const exclusionValue of newExclusionList) { for (let value of input) {
value = value.replace('www.', '');
if (value && (domainRegExp.test(value) || value === 'localhost')) {
const state = { on: false }; const state = { on: false };
await dispatch({ hostname: exclusionValue, state, type: 'UPDATE_STORE' });
await dispatch({ hostname: value, state, type: 'UPDATE_STORE' });
exclusions.push(value);
}
} }
if (newExclusionList.length) { exclusionList = [...new Set([...exclusionList, ...exclusions])].sort();
exclusionList = [...new Set([...exclusionList, ...newExclusionList])].sort();
createList(); createList();
updateList(filterInputElement.value.trim()); updateList(filterInputElement.value.trim());
}
}); });
event.currentTarget.value = ''; event.currentTarget.value = '';