lib/requestBlocker.js - Issue 29828591: Issue 6787 - Apply rewrite filter even if the rewrite URL is blank

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/requestBlocker.js

Issue 29828591: Issue 6787 - Apply rewrite filter even if the rewrite URL is blank (Closed) Base URL: https://hg.adblockplus.org/adblockpluschrome/

Patch Set: Created July 12, 2018, 11:39 a.m.

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: lib/requestBlocker.js

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

--- a/lib/requestBlocker.js

+++ b/lib/requestBlocker.js

@@ -189,17 +189,17 @@

let [filter, thirdParty] = matchRequest(url, type, docDomain,

sitekey, specificOnly);

let result;

let rewrittenUrl;

if (filter instanceof BlockingFilter)

{

- if (filter.rewrite)

+ if (filter.rewrite != null)

kzar 2018/07/12 12:02:13 Nit: I think I'd prefer `if (typeof filter.rewrite

Manish Jethani 2018/07/12 12:06:28 Yeah I kinda prefer that as well. Done.

{

rewrittenUrl = filter.rewriteUrl(details.url);

// If no rewrite happened (error, different origin), we'll

// return undefined in order to avoid an "infinite" loop.

if (rewrittenUrl != details.url)

result = {redirectUrl: rewrittenUrl};

}

else

« no previous file with comments | « no previous file | no next file » | no next file with comments »