Skip to content

GitLab

T
tangled
Commit d32b542e authored by Karan Bhatia's avatar Karan Bhatia Committed by Commit Bot
Browse files
Options

DNR: Add support for allowAllRequests rules to filter list converter. 

$document exception rules can be implemented using allowAllRequests action type.

BUG=1038831

Change-Id: Iab90eff5923ad76b3091f54479c1cafe33e92a1e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2005113
Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: default avatarDevlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735127}
parent 7da8b2fd
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 37 deletions
extensions/browser/api/declarative_net_request/filter_list_converter/converter.cc
View file @ d32b542e
......@@ -5,6 +5,7 @@
#include "extensions/browser/api/declarative_net_request/filter_list_converter/converter.h"
#include <fstream>
#include <sstream>
#include <string>
#include <utility>
......@@ -116,6 +117,11 @@ class ProtoToJSONRuleConverter {
if (input_rule_.activation_types() == proto::ACTIVATION_TYPE_UNSPECIFIED)
return true;
if (input_rule_.activation_types() == proto::ACTIVATION_TYPE_DOCUMENT) {
is_allow_all_requests_rule_ = true;
return true;
}
std::vector<std::string> activation_types;
for (int activation_type = 1; activation_type <= proto::ACTIVATION_TYPE_MAX;
activation_type <<= 1) {
......@@ -253,40 +259,8 @@ class ProtoToJSONRuleConverter {
return true;
}
bool PopulateResourceTypes() {
// Ensure that |element_types()| is a subset of proto::ElementType_ALL.
CHECK_EQ(proto::ELEMENT_TYPE_ALL,
proto::ELEMENT_TYPE_ALL | input_rule_.element_types());
base::Value GetResourceTypeList(int element_mask) {
base::Value resource_types(base::Value::Type::LIST);
int kMaskUnsupported =
proto::ELEMENT_TYPE_POPUP | proto::ELEMENT_TYPE_OBJECT_SUBREQUEST;
int element_mask = input_rule_.element_types() & (~kMaskUnsupported);
// We don't support object-subrequest. Instead let these be treated as rules
// matching object requests.
if (input_rule_.element_types() & proto::ELEMENT_TYPE_OBJECT_SUBREQUEST)
element_mask |= proto::ELEMENT_TYPE_OBJECT;
// No supported element types.
if (!element_mask) {
std::vector<std::string> element_types_removed;
if (input_rule_.element_types() & proto::ELEMENT_TYPE_POPUP)
element_types_removed.emplace_back("popup");
error_ = base::StringPrintf(
"Rule with filter %s and resource types [%s] ignored, no applicable "
"resource types",
input_rule_.url_pattern().c_str(),
base::JoinString(element_types_removed, "," /*separator*/).c_str());
return false;
}
// Omit resource types to block all subresources by default.
if (element_mask == (proto::ELEMENT_TYPE_ALL & ~kMaskUnsupported))
return true;
for (int element_type = 1; element_type <= proto::ElementType_MAX;
element_type <<= 1) {
CHECK(proto::ElementType_IsValid(element_type));
......@@ -318,7 +292,6 @@ class ProtoToJSONRuleConverter {
resource_type = dnr_api::RESOURCE_TYPE_XMLHTTPREQUEST;
break;
case proto::ELEMENT_TYPE_OBJECT_SUBREQUEST:
// This was removed above.
CHECK(false);
break;
case proto::ELEMENT_TYPE_SUBDOCUMENT:
......@@ -347,6 +320,58 @@ class ProtoToJSONRuleConverter {
resource_types.Append(dnr_api::ToString(resource_type));
}
return resource_types;
}
bool PopulateResourceTypes() {
// Ensure that |element_types()| is a subset of proto::ElementType_ALL.
CHECK_EQ(proto::ELEMENT_TYPE_ALL,
proto::ELEMENT_TYPE_ALL | input_rule_.element_types());
int kMaskUnsupported =
proto::ELEMENT_TYPE_POPUP | proto::ELEMENT_TYPE_OBJECT_SUBREQUEST;
int element_mask = input_rule_.element_types() & (~kMaskUnsupported);
// We don't support object-subrequest. Instead let these be treated as rules
// matching object requests.
if (input_rule_.element_types() & proto::ELEMENT_TYPE_OBJECT_SUBREQUEST)
element_mask |= proto::ELEMENT_TYPE_OBJECT;
if (is_allow_all_requests_rule_) {
// Any subresource types specified with ACTIVATION_TYPE_DOCUMENT are
// invalid.
if (element_mask && element_mask != proto::ELEMENT_TYPE_SUBDOCUMENT) {
std::stringstream error_stream;
error_stream << "$document rule with filter "
<< input_rule_.url_pattern()
<< " ignored. Invalid resource types: "
<< GetResourceTypeList(element_mask);
error_ = error_stream.str();
return false;
}
} else if (!element_mask) { // No supported element types.
const char* ignored_types =
input_rule_.element_types() & proto::ELEMENT_TYPE_POPUP ? "popup"
: "";
error_ = base::StringPrintf(
"Rule with filter %s and resource types [%s] ignored: No applicable "
"resource types",
input_rule_.url_pattern().c_str(), ignored_types);
return false;
}
// Omit resource types to block all subresources by default.
if (element_mask == (proto::ELEMENT_TYPE_ALL & ~kMaskUnsupported))
return true;
base::Value resource_types = GetResourceTypeList(element_mask);
if (is_allow_all_requests_rule_) {
resource_types.Append(
dnr_api::ToString(dnr_api::RESOURCE_TYPE_MAIN_FRAME));
}
CHECK(json_rule_.SetPath({kRuleConditionKey, kResourceTypesKey},
std::move(resource_types)));
return true;
......@@ -385,12 +410,18 @@ class ProtoToJSONRuleConverter {
bool PopulateRuleActionType() {
dnr_api::RuleActionType action_type = dnr_api::RULE_ACTION_TYPE_NONE;
CHECK(!is_allow_all_requests_rule_ ||
input_rule_.semantics() == proto::RULE_SEMANTICS_WHITELIST);
switch (input_rule_.semantics()) {
case proto::RULE_SEMANTICS_BLACKLIST:
action_type = dnr_api::RULE_ACTION_TYPE_BLOCK;
break;
case proto::RULE_SEMANTICS_WHITELIST:
action_type = dnr_api::RULE_ACTION_TYPE_ALLOW;
if (is_allow_all_requests_rule_)
action_type = dnr_api::RULE_ACTION_TYPE_ALLOWALLREQUESTS;
else
action_type = dnr_api::RULE_ACTION_TYPE_ALLOW;
break;
case proto::RULE_SEMANTICS_UNSPECIFIED:
CHECK(false);
......@@ -413,6 +444,7 @@ class ProtoToJSONRuleConverter {
return true;
}
bool is_allow_all_requests_rule_ = false;
proto::UrlRule input_rule_;
int rule_id_;
std::string error_;
......
extensions/browser/api/declarative_net_request/filter_list_converter/converter_unittest.cc
View file @ d32b542e
......@@ -39,7 +39,7 @@ void TestConversion(std::vector<std::string> filter_list_rules,
if (write_type == WriteType::kJSONRuleset)
output_path = output_path.AppendASCII("rules.json");
ConvertRuleset({input_path}, output_path, write_type, false /* noisy */);
ConvertRuleset({input_path}, output_path, write_type, true /* noisy */);
base::FilePath output_json_path =
temp_dir.GetPath().AppendASCII("rules.json");
......@@ -63,7 +63,15 @@ TEST_P(FilterListConverterTest, Convert) {
"||example.com^|$script,image,font",
"@@allowed.com$domain=example.com|~sub.example.com",
"|https://*.abc.com|$match-case,~image,third-party",
"abc.com$~third-party"};
"abc.com$~third-party",
"@@||yahoo.com^$document,subdocument",
"@@||yahoo.com^$document",
// This rule is invalid and should be ignored.
"@@||yahoo.com^$document,script",
"@@||yahoo.com^$subdocument",
};
std::string expected_result = R"(
[ {
......@@ -113,6 +121,39 @@ TEST_P(FilterListConverterTest, Convert) {
},
"id": 4,
"priority": 1
}, {
"action": {
"type": "allowAllRequests"
},
"condition": {
"isUrlFilterCaseSensitive": false,
"resourceTypes": [ "sub_frame", "main_frame" ],
"urlFilter": "||yahoo.com^"
},
"id": 5,
"priority": 1
}, {
"action": {
"type": "allowAllRequests"
},
"condition": {
"isUrlFilterCaseSensitive": false,
"resourceTypes": [ "main_frame" ],
"urlFilter": "||yahoo.com^"
},
"id": 6,
"priority": 1
}, {
"action": {
"type": "allow"
},
"condition": {
"isUrlFilterCaseSensitive": false,
"resourceTypes": [ "sub_frame" ],
"urlFilter": "||yahoo.com^"
},
"id": 7,
"priority": 1
} ]
)";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment