summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
authorWojtek Kosior <koszko@koszko.org>2021-06-30 14:12:43 +0200
committerWojtek Kosior <koszko@koszko.org>2021-06-30 14:13:04 +0200
commitcd5272acb47a53ad71e5a6bcbcb4f712bdd285c5 (patch)
tree625f92362000c483719a8b1fb70c23979a8dba60 /content
parent261548ff184926567a623e90df7954aeef842d59 (diff)
downloadbrowser-extension-cd5272acb47a53ad71e5a6bcbcb4f712bdd285c5.tar.gz
browser-extension-cd5272acb47a53ad71e5a6bcbcb4f712bdd285c5.zip
refactor 3 miscellaneous fnctionalities to a their single own file
Diffstat (limited to 'content')
-rw-r--r--content/main.js15
1 files changed, 5 insertions, 10 deletions
diff --git a/content/main.js b/content/main.js
index d55ee2e..8525961 100644
--- a/content/main.js
+++ b/content/main.js
@@ -10,6 +10,7 @@
* IMPORT handle_page_actions
* IMPORT url_item
* IMPORT gen_unique
+ * IMPORT csp_rule
* IMPORT sanitize_attributes
* IMPORT script_suppressor
* IMPORT is_chrome
@@ -30,9 +31,8 @@
let url = url_item(document.URL);
let unique = gen_unique(url);
-let nonce = unique.substring(1);
-const suppressor = script_suppressor(nonce);
+const suppressor = script_suppressor(unique);
function needs_blocking()
{
@@ -46,7 +46,7 @@ function needs_blocking()
let second_target = match[4];
if (first_target !== undefined &&
- first_target === unique) {
+ first_target === '#' + unique) {
if (second_target !== undefined)
window.location.href = base_url + second_target;
else
@@ -115,12 +115,7 @@ function inject_csp(head)
let meta = document.createElement("meta");
meta.setAttribute("http-equiv", "Content-Security-Policy");
-
- let rule = `script-src 'nonce-${nonce}'; `;
- if (is_chrome)
- rule += `script-src-elem 'nonce-${nonce}';`;
-
- meta.setAttribute("content", rule);
+ meta.setAttribute("content", csp_rule(unique));
if (head.firstElementChild === null)
head.appendChild(meta);
@@ -144,4 +139,4 @@ if (needs_blocking()) {
addEventListener('beforescriptexecute', suppressor, true);
}
-handle_page_actions(nonce);
+handle_page_actions(unique);