lib/csp.js - Issue 29570614: Issue 5028 - Use browser namespace

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: lib/csp.js

Issue 29570614: Issue 5028 - Use browser namespace (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/

Patch Set: Rebase Created Oct. 13, 2017, 7:59 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: lib/csp.js

===================================================================

--- a/lib/csp.js

+++ b/lib/csp.js

@@ -16,25 +16,25 @@

"use strict";

// The webRequest API doesn't support WebSocket connection blocking in Microsoft

// Edge and versions of Chrome before 58. Therefore for those we inject CSP

// headers below as a workaround. See https://crbug.com/129353 and

// https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10297376/

-if (!chrome.webRequest.ResourceType ||

- !("WEBSOCKET" in chrome.webRequest.ResourceType))

+if (!browser.webRequest.ResourceType ||

+ !("WEBSOCKET" in browser.webRequest.ResourceType))

{

const {defaultMatcher} = require("matcher");

const {BlockingFilter, RegExpFilter} = require("filterClasses");

const {getDecodedHostname} = require("url");

const {checkWhitelisted} = require("whitelisting");

- chrome.webRequest.onHeadersReceived.addListener(details =>

+ browser.webRequest.onHeadersReceived.addListener(details =>

{

let hostname = getDecodedHostname(new URL(details.url));

let match = defaultMatcher.matchesAny("", RegExpFilter.typeMap.WEBSOCKET,

hostname, false, null, true);

if (match instanceof BlockingFilter &&

!checkWhitelisted(new ext.Page({id: details.tabId}),

ext.getFrame(details.tabId, details.frameId)))

{