Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Remove middle wildcard support in rules.js #17715

Merged
zoracon merged 7 commits into from
Apr 16, 2019
Merged

Remove middle wildcard support in rules.js #17715

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a910421
Remove middle wildcard support in rules.js
Apr 12, 2019
0184e8a
Fix regression caused by previous commit and update comments
Apr 12, 2019
a28b963
Update unit tests to please Travis
Apr 12, 2019
423fb56
Update rules.js
Apr 12, 2019
333f133
Add unit tests to assert we dropped middle wildcard support
Apr 13, 2019
cb8a90f
Update rules.js
Apr 15, 2019
ec5e441
Update rules_test.js
Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix regression caused by previous commit and update comments
  • Loading branch information
Chan Chak Shing committed Apr 12, 2019
commit 0184e8abd5fbd0d2e9d08ce13efc39b0194e4e12
6 changes: 3 additions & 3 deletions chromium/background-scripts/rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,10 +562,10 @@ RuleSets.prototype = {
return nullIterable;
}

// Replace www.example.com with *.example.com, however, this
// SHOULD NOT replace example.com with *.com
// Replace www.example.com with www.example.*
// eat away from the right for once and only once
let segmented = host.split(".");
if (segmented.length > 2) {
if (segmented.length > 1) {
let tmp = segmented[segmented.length - 1];

results = (this.targets.has(segmented.join(".")) ?
Expand Down