Commit 9ea4170b authored by Dominique Fauteux-Chapleau's avatar Dominique Fauteux-Chapleau Committed by Chromium LUCI CQ

Add custom message proto field in connectors.proto

This is done now to keep messages in sync in both code repos
See cl/345275972

Bug: 1147036
Change-Id: Id779bdcebb68498daabb541d570f0d66c40b84a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2570746Reviewed-by: default avataranthonyvd <anthonyvd@chromium.org>
Commit-Queue: Dominique Fauteux-Chapleau <domfc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834326}
parent 2a60833b
...@@ -88,6 +88,16 @@ message ContentAnalysisResponse { ...@@ -88,6 +88,16 @@ message ContentAnalysisResponse {
} }
optional Status status = 2; optional Status status = 2;
message CustomMessage {
// An admin-provided url that should lead to a page where the user can
// learn more about the restrictions in place in their organization.
optional string learn_more_url = 1;
// An admin-provided message that will be shown to the user when a scan
// results is not clean. This message should not be more than 200
// characters long.
optional string message = 2;
}
// Identifies the detection rules that were triggered by the analysis. // Identifies the detection rules that were triggered by the analysis.
// Only relevant when status is SUCCESS. // Only relevant when status is SUCCESS.
message TriggeredRule { message TriggeredRule {
...@@ -100,9 +110,20 @@ message ContentAnalysisResponse { ...@@ -100,9 +110,20 @@ message ContentAnalysisResponse {
optional Action action = 1; optional Action action = 1;
optional string rule_name = 2; optional string rule_name = 2;
optional string rule_id = 3; optional string rule_id = 3;
// This field contains a custom message that is specific to the rules
// triggered by this scan, if any. This messages can be shown in addition
// to the OU-based message found in the client-side policy or at the
// top-level of the Result message.
optional CustomMessage custom_message = 4;
} }
repeated TriggeredRule triggered_rules = 3; repeated TriggeredRule triggered_rules = 3;
// This field is meant to override the OU-based custom messages set in the
// client-side policies. When the result requires a
// warning, if this field has a value it's the one that will be displayed to
// the user, otherwise the client-side policy's custom message will be used.
optional CustomMessage custom_message = 7;
// TODO(crbug.com/1147036): Remove fields 4-6 once a definitive approach is // TODO(crbug.com/1147036): Remove fields 4-6 once a definitive approach is
// agreed upon. // agreed upon.
optional string malware_family = 4; optional string malware_family = 4;
......
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