New issue
Advanced search Search tips

Issue 833419 link

Starred by 1 user

Issue metadata

Status: Fixed
Owner: ----
Closed: May 2018
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 3
Type: Bug



Sign in to add a comment

Add FilterList <-> Unindexed ruleset converter

Project Member Reported by csharrison@chromium.org, Apr 16 2018

Issue description

This will be used for generating UnindexedRulesets.
 
Summary: Add FilterList <-> Unindexed ruleset converter (was: Add EasyList <-> Unindexed ruleset converter)
Project Member

Comment 2 by bugdroid1@chromium.org, Apr 16 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b6712a6ef834e3493ef53aed1f06587e74475c11

commit b6712a6ef834e3493ef53aed1f06587e74475c11
Author: Charlie Harrison <csharrison@chromium.org>
Date: Mon Apr 16 16:19:02 2018

[subresource_filter] Introduce the rule_parser

Bug:  833419 
Change-Id: I9b1d6f3b7b5c9229443b71f41d422d78be40ba8d
Reviewed-on: https://chromium-review.googlesource.com/1014026
Reviewed-by: Josh Karlin <jkarlin@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550990}
[modify] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/BUILD.gn
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/BUILD.gn
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule.cc
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule.h
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule_options.h
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule_parser.cc
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule_parser.h
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule_parser_unittest.cc
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule_unittest.cc

Project Member

Comment 3 by bugdroid1@chromium.org, Apr 17 2018

Labels: merge-merged-testbranch
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b6712a6ef834e3493ef53aed1f06587e74475c11

commit b6712a6ef834e3493ef53aed1f06587e74475c11
Author: Charlie Harrison <csharrison@chromium.org>
Date: Mon Apr 16 16:19:02 2018

[subresource_filter] Introduce the rule_parser

Bug:  833419 
Change-Id: I9b1d6f3b7b5c9229443b71f41d422d78be40ba8d
Reviewed-on: https://chromium-review.googlesource.com/1014026
Reviewed-by: Josh Karlin <jkarlin@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550990}
[modify] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/BUILD.gn
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/BUILD.gn
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule.cc
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule.h
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule_options.h
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule_parser.cc
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule_parser.h
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule_parser_unittest.cc
[add] https://crrev.com/b6712a6ef834e3493ef53aed1f06587e74475c11/components/subresource_filter/tools/rule_parser/rule_unittest.cc

Project Member

Comment 4 by bugdroid1@chromium.org, Apr 26 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3f144ac572f1c84940a102ac4d5afc93ef7b7d74

commit 3f144ac572f1c84940a102ac4d5afc93ef7b7d74
Author: Charlie Harrison <csharrison@chromium.org>
Date: Thu Apr 26 16:38:53 2018

Introduce the ruleset_converter

This provides the basis of converting between rulesets in different
formats.

Bug:  833419 
Change-Id: I89f59042a19e5126624dbbac5e8cb447a47697af
Reviewed-on: https://chromium-review.googlesource.com/1028172
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Josh Karlin <jkarlin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554050}
[modify] https://crrev.com/3f144ac572f1c84940a102ac4d5afc93ef7b7d74/components/subresource_filter/tools/BUILD.gn
[add] https://crrev.com/3f144ac572f1c84940a102ac4d5afc93ef7b7d74/components/subresource_filter/tools/ruleset_converter/BUILD.gn
[add] https://crrev.com/3f144ac572f1c84940a102ac4d5afc93ef7b7d74/components/subresource_filter/tools/ruleset_converter/rule_stream.cc
[add] https://crrev.com/3f144ac572f1c84940a102ac4d5afc93ef7b7d74/components/subresource_filter/tools/ruleset_converter/rule_stream.h
[add] https://crrev.com/3f144ac572f1c84940a102ac4d5afc93ef7b7d74/components/subresource_filter/tools/ruleset_converter/rule_stream_test.cc
[add] https://crrev.com/3f144ac572f1c84940a102ac4d5afc93ef7b7d74/components/subresource_filter/tools/ruleset_converter/ruleset_format.cc
[add] https://crrev.com/3f144ac572f1c84940a102ac4d5afc93ef7b7d74/components/subresource_filter/tools/ruleset_converter/ruleset_format.h

Project Member

Comment 5 by bugdroid1@chromium.org, Apr 27 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ce1305123e10f97adb155c8930684b57ab28d4ad

commit ce1305123e10f97adb155c8930684b57ab28d4ad
Author: Charlie Harrison <csharrison@chromium.org>
Date: Fri Apr 27 19:33:17 2018

Add ruleset_converter tool to subresource_filter

This CL also
- Aggregates all subresource_filter tools into a single target
- changes subresource_filter tools to use the same (but equiv)
  condition as some other tools
- Adds that target to "all"

Bug:  833419 
Change-Id: I732ac0860f90e036281bdf899f8b5e6e92f3f3e5
Reviewed-on: https://chromium-review.googlesource.com/1031211
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Josh Karlin <jkarlin@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554455}
[modify] https://crrev.com/ce1305123e10f97adb155c8930684b57ab28d4ad/BUILD.gn
[modify] https://crrev.com/ce1305123e10f97adb155c8930684b57ab28d4ad/components/subresource_filter/tools/BUILD.gn
[modify] https://crrev.com/ce1305123e10f97adb155c8930684b57ab28d4ad/components/subresource_filter/tools/ruleset_converter/BUILD.gn
[add] https://crrev.com/ce1305123e10f97adb155c8930684b57ab28d4ad/components/subresource_filter/tools/ruleset_converter/main.cc
[modify] https://crrev.com/ce1305123e10f97adb155c8930684b57ab28d4ad/components/subresource_filter/tools/ruleset_converter/rule_stream.cc
[modify] https://crrev.com/ce1305123e10f97adb155c8930684b57ab28d4ad/components/subresource_filter/tools/ruleset_converter/ruleset_format.cc
[modify] https://crrev.com/ce1305123e10f97adb155c8930684b57ab28d4ad/components/subresource_filter/tools/ruleset_converter/ruleset_format.h

Project Member

Comment 6 by bugdroid1@chromium.org, Apr 27 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/fc07a87c5c5081e79a1b52d0fd344d0284d18783

commit fc07a87c5c5081e79a1b52d0fd344d0284d18783
Author: John Budorick <jbudorick@chromium.org>
Date: Fri Apr 27 20:11:59 2018

Revert "Add ruleset_converter tool to subresource_filter"

This reverts commit ce1305123e10f97adb155c8930684b57ab28d4ad.

Reason for revert: broke compilation: https://ci.chromium.org/buildbot/chromium/Win/66613

Original change's description:
> Add ruleset_converter tool to subresource_filter
> 
> This CL also
> - Aggregates all subresource_filter tools into a single target
> - changes subresource_filter tools to use the same (but equiv)
>   condition as some other tools
> - Adds that target to "all"
> 
> Bug:  833419 
> Change-Id: I732ac0860f90e036281bdf899f8b5e6e92f3f3e5
> Reviewed-on: https://chromium-review.googlesource.com/1031211
> Reviewed-by: Scott Violet <sky@chromium.org>
> Reviewed-by: Josh Karlin <jkarlin@chromium.org>
> Commit-Queue: Charlie Harrison <csharrison@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#554455}

TBR=sky@chromium.org,jkarlin@chromium.org,csharrison@chromium.org

Change-Id: I03e004c156e40d695c866ba07a00c480eedcd225
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  833419 
Reviewed-on: https://chromium-review.googlesource.com/1033399
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554471}
[modify] https://crrev.com/fc07a87c5c5081e79a1b52d0fd344d0284d18783/BUILD.gn
[modify] https://crrev.com/fc07a87c5c5081e79a1b52d0fd344d0284d18783/components/subresource_filter/tools/BUILD.gn
[modify] https://crrev.com/fc07a87c5c5081e79a1b52d0fd344d0284d18783/components/subresource_filter/tools/ruleset_converter/BUILD.gn
[delete] https://crrev.com/a79a2ad2ff5b5f9c7bbcc8403cd702f0a1e3b04a/components/subresource_filter/tools/ruleset_converter/main.cc
[modify] https://crrev.com/fc07a87c5c5081e79a1b52d0fd344d0284d18783/components/subresource_filter/tools/ruleset_converter/rule_stream.cc
[modify] https://crrev.com/fc07a87c5c5081e79a1b52d0fd344d0284d18783/components/subresource_filter/tools/ruleset_converter/ruleset_format.cc
[modify] https://crrev.com/fc07a87c5c5081e79a1b52d0fd344d0284d18783/components/subresource_filter/tools/ruleset_converter/ruleset_format.h

Project Member

Comment 7 by bugdroid1@chromium.org, Apr 30 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/65c798903dfa18134ad29575e8133ab6fbc9429b

commit 65c798903dfa18134ad29575e8133ab6fbc9429b
Author: Charlie Harrison <csharrison@chromium.org>
Date: Mon Apr 30 17:44:43 2018

Reland: Add ruleset_converter tool to subresource_filter

Originally landed https://chromium-review.googlesource.com/1031211

This CL makes types more explicit for literal -> stringpiece conversions.

TBR=sky@chromium.org

Bug:  833419 
Change-Id: I3c08259906076216da22623b54d18e269b075bd0
Reviewed-on: https://chromium-review.googlesource.com/1033448
Reviewed-by: Josh Karlin <jkarlin@chromium.org>
Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554811}
[modify] https://crrev.com/65c798903dfa18134ad29575e8133ab6fbc9429b/BUILD.gn
[modify] https://crrev.com/65c798903dfa18134ad29575e8133ab6fbc9429b/components/subresource_filter/tools/BUILD.gn
[modify] https://crrev.com/65c798903dfa18134ad29575e8133ab6fbc9429b/components/subresource_filter/tools/ruleset_converter/BUILD.gn
[add] https://crrev.com/65c798903dfa18134ad29575e8133ab6fbc9429b/components/subresource_filter/tools/ruleset_converter/main.cc
[modify] https://crrev.com/65c798903dfa18134ad29575e8133ab6fbc9429b/components/subresource_filter/tools/ruleset_converter/rule_stream.cc
[modify] https://crrev.com/65c798903dfa18134ad29575e8133ab6fbc9429b/components/subresource_filter/tools/ruleset_converter/ruleset_format.cc
[modify] https://crrev.com/65c798903dfa18134ad29575e8133ab6fbc9429b/components/subresource_filter/tools/ruleset_converter/ruleset_format.h

Project Member

Comment 8 by bugdroid1@chromium.org, May 2 2018

Project Member

Comment 9 by bugdroid1@chromium.org, May 3 2018

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a28dae957e02d5e761645bb8ccf4a644311e57ed

commit a28dae957e02d5e761645bb8ccf4a644311e57ed
Author: Charlie Harrison <csharrison@chromium.org>
Date: Thu May 03 13:55:11 2018

Refactor ruleset_converter and add more tests

This refactors main.cc into a class RulesetConverter to make things
a bit more testable.

This CL only contains one behavior change: instead of using a colon
separated list of directories as input, we instead use a comma separated
list. Paths in windows frequently have colons in them :)

Bug:  833419 
Change-Id: I51c3b9c2b8ac6ce93a193d07f8bafaff897f3fdf
Reviewed-on: https://chromium-review.googlesource.com/1036243
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Josh Karlin <jkarlin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555715}
[modify] https://crrev.com/a28dae957e02d5e761645bb8ccf4a644311e57ed/components/subresource_filter/tools/ruleset_converter/BUILD.gn
[modify] https://crrev.com/a28dae957e02d5e761645bb8ccf4a644311e57ed/components/subresource_filter/tools/ruleset_converter/main.cc
[add] https://crrev.com/a28dae957e02d5e761645bb8ccf4a644311e57ed/components/subresource_filter/tools/ruleset_converter/ruleset_converter.cc
[add] https://crrev.com/a28dae957e02d5e761645bb8ccf4a644311e57ed/components/subresource_filter/tools/ruleset_converter/ruleset_converter.h
[add] https://crrev.com/a28dae957e02d5e761645bb8ccf4a644311e57ed/components/subresource_filter/tools/ruleset_converter/ruleset_converter_unittest.cc

Status: Fixed (was: Available)

Sign in to add a comment