Commit e60a1f02 authored by Dominique Fauteux-Chapleau's avatar Dominique Fauteux-Chapleau Committed by Commit Bot

Add ruleId field to SafeBrowsingPrivateEventRouter DLP events

This adds the ruleId field in triggered rules for DLP events, which
seems to have been omitted by mistake.

Change-Id: I468704163e49c1853ea4ba8b7f5432ddc53f933f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521244Reviewed-by: default avatarDaniel Rubery <drubery@chromium.org>
Commit-Queue: Dominique Fauteux-Chapleau <domfc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825335}
parent f1bc6b11
...@@ -80,6 +80,9 @@ void AddAnalysisConnectorVerdictToEvent( ...@@ -80,6 +80,9 @@ void AddAnalysisConnectorVerdictToEvent(
triggered_rule.SetStringKey( triggered_rule.SetStringKey(
extensions::SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleName, extensions::SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleName,
trigger.rule_name()); trigger.rule_name());
triggered_rule.SetStringKey(
extensions::SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleId,
trigger.rule_id());
triggered_rule_info.Append(std::move(triggered_rule)); triggered_rule_info.Append(std::move(triggered_rule));
} }
...@@ -121,6 +124,7 @@ const char SafeBrowsingPrivateEventRouter::kKeyNetErrorCode[] = "netErrorCode"; ...@@ -121,6 +124,7 @@ const char SafeBrowsingPrivateEventRouter::kKeyNetErrorCode[] = "netErrorCode";
const char SafeBrowsingPrivateEventRouter::kKeyClickedThrough[] = const char SafeBrowsingPrivateEventRouter::kKeyClickedThrough[] =
"clickedThrough"; "clickedThrough";
const char SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleName[] = "ruleName"; const char SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleName[] = "ruleName";
const char SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleId[] = "ruleId";
const char SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleInfo[] = const char SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleInfo[] =
"triggeredRuleInfo"; "triggeredRuleInfo";
const char SafeBrowsingPrivateEventRouter::kKeyThreatType[] = "threatType"; const char SafeBrowsingPrivateEventRouter::kKeyThreatType[] = "threatType";
......
...@@ -73,6 +73,7 @@ class SafeBrowsingPrivateEventRouter ...@@ -73,6 +73,7 @@ class SafeBrowsingPrivateEventRouter
static const char kKeyNetErrorCode[]; static const char kKeyNetErrorCode[];
static const char kKeyClickedThrough[]; static const char kKeyClickedThrough[];
static const char kKeyTriggeredRuleName[]; static const char kKeyTriggeredRuleName[];
static const char kKeyTriggeredRuleId[];
static const char kKeyTriggeredRuleInfo[]; static const char kKeyTriggeredRuleInfo[];
static const char kKeyThreatType[]; static const char kKeyThreatType[];
static const char kKeyContentType[]; static const char kKeyContentType[];
......
...@@ -402,6 +402,8 @@ void EventReportValidator::ValidateDlpRule( ...@@ -402,6 +402,8 @@ void EventReportValidator::ValidateDlpRule(
expected_rule) { expected_rule) {
ValidateField(value, SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleName, ValidateField(value, SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleName,
expected_rule.rule_name()); expected_rule.rule_name());
ValidateField(value, SafeBrowsingPrivateEventRouter::kKeyTriggeredRuleId,
expected_rule.rule_id());
} }
void EventReportValidator::ValidateField( void EventReportValidator::ValidateField(
......
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