Revision 8b823e1a
Added by jahoti about 2 years ago
| background/policy_injector.js | ||
|---|---|---|
| 12 | 12 |
* IMPORT get_storage |
| 13 | 13 |
* IMPORT browser |
| 14 | 14 |
* IMPORT is_chrome |
| 15 |
* IMPORT is_mozilla |
|
| 15 | 16 |
* IMPORT gen_unique |
| 16 | 17 |
* IMPORT gen_nonce |
| 17 | 18 |
* IMPORT url_item |
| ... | ... | |
| 45 | 46 |
function url_inject(details) |
| 46 | 47 |
{
|
| 47 | 48 |
const targets = url_extract_policy(details.url); |
| 48 |
if (targets.policy) {
|
|
| 49 |
if (targets.valid_sig) {
|
|
| 49 | 50 |
return; |
| 50 |
} else if (targets.signed) {
|
|
| 51 |
} else if (targets.policy) {
|
|
| 51 | 52 |
/* Redirect; update policy */ |
| 52 | 53 |
targets.target = targets.target2; |
| 53 | 54 |
delete targets.target2 |
| 54 | 55 |
} |
| 55 | 56 |
|
| 56 |
let redirect_url = targets.base_url + targets.sig; |
|
| 57 | 57 |
let [pattern, settings] = query_best(targets.base_url); |
| 58 | 58 |
if (!pattern) |
| 59 | 59 |
/* Defaults */ |
| 60 | 60 |
settings = {};
|
| 61 | 61 |
|
| 62 | 62 |
const policy = {allow: settings.allow, nonce: gen_nonce()};
|
| 63 |
const policy_string = encodeURIComponent(JSON.stringify(policy)); |
|
| 64 |
const sig = gen_unique(policy_string + targets.base_url); |
|
| 63 | 65 |
|
| 64 |
redirect_url += encodeURIComponent(JSON.stringify(policy));
|
|
| 66 |
let redirect_url = targets.base_url + '#' + sig + policy_string;
|
|
| 65 | 67 |
if (targets.target) |
| 66 | 68 |
redirect_url += targets.target; |
| 67 | 69 |
if (targets.target2) |
| ... | ... | |
| 73 | 75 |
function inject(details) |
| 74 | 76 |
{
|
| 75 | 77 |
const targets = url_extract_policy(details.url); |
| 76 |
if (!targets.policy)
|
|
| 78 |
if (!targets.valid_sig)
|
|
| 77 | 79 |
/* Block unsigned requests */ |
| 78 | 80 |
return {cancel: true};
|
| 79 | 81 |
|
| 80 | 82 |
const rule = csp_rule(targets.policy.nonce); |
| 81 | 83 |
|
| 82 |
var headers; |
|
| 84 |
var headers = details.responseHeaders;
|
|
| 83 | 85 |
|
| 84 |
if (targets.policy.allow) {
|
|
| 86 |
if (!targets.policy.allow || is_mozilla)
|
|
| 85 | 87 |
/* |
| 86 |
* Chrome doesn't have the buggy behavior of repeatedly injecting a
|
|
| 87 |
* header we injected once. Firefox does and we have to remove it there.
|
|
| 88 |
* Chrome doesn't have the buggy behavior of caching headers
|
|
| 89 |
* we injected. Firefox does and we have to remove it there.
|
|
| 88 | 90 |
*/ |
| 89 |
if (is_chrome) |
|
| 90 |
return {cancel: false};
|
|
| 91 |
|
|
| 92 |
headers = details.responseHeaders.filter(h => !is_our_header(h, rule)); |
|
| 93 |
} else {
|
|
| 94 |
headers = details.responseHeaders.filter(h => !is_csp_header(h)); |
|
| 91 |
headers = headers.filter(h => !is_csp_header(h)); |
|
| 95 | 92 |
|
| 93 |
if (!targets.policy.allow) |
|
| 96 | 94 |
headers.push({
|
| 97 | 95 |
name : header_name, |
| 98 | 96 |
value : rule |
| 99 | 97 |
}); |
| 100 |
} |
|
| 101 | 98 |
|
| 102 | 99 |
return {responseHeaders: headers};
|
| 103 | 100 |
} |
Also available in: Unified diff
Revamp signatures and break header caching on FF
Signatures, instead of consisting of the secure salt followed by the unique
value generated from the URL, are now the unique value generated from the
policy value (which will follow them) succeeded by the URL.
CSP headers are now always cleared on FF, regardless of whether the page
is whitelisted or not. This means whitelisting takes effect on page reload,
rather than only when caching occurs. However, it obviously presents security
issues; refinment will occur in a future commit.