diff options
Diffstat (limited to 'chromium/chrome/browser/resources/safety_tips')
3 files changed, 24 insertions, 14 deletions
diff --git a/chromium/chrome/browser/resources/safety_tips/PRESUBMIT.py b/chromium/chrome/browser/resources/safety_tips/PRESUBMIT.py index 012844a2057..e7eae89d2bf 100644 --- a/chromium/chrome/browser/resources/safety_tips/PRESUBMIT.py +++ b/chromium/chrome/browser/resources/safety_tips/PRESUBMIT.py @@ -24,18 +24,13 @@ def CheckVersionUpdatedInProto(input_api, output_api): return [] contents = safety_tips_proto[0].ChangedContents() - # Must not have any changes containing flagged_page: - if ContainsLine(contents, 'flagged_page:'): + # Must not have any changes containing flagged_page or allowed_pattern: + if (ContainsLine(contents, 'flagged_page:') or + ContainsLine(contents, 'allowed_pattern:')): return [output_api.PresubmitError( 'Do not check in the full safety_tips.asciipb proto. ' 'Only increment |version_id|.')] - # This proto should not contain any actually-flagged pages. ContainsLine - # checks if any line *starts with* the given string. - if ContainsLine(contents, 'flagged_page:'): - return [output_api.PresubmitError( - 'Remove entries from Chromium safety_tips.asciipb before submitting.')] - # It's enticing to do something fancy like checking whether the ID was in fact # incremented or whether this is a whitespace-only or comment-only change. # However, currently deleted lines don't show up in ChangedContents() and diff --git a/chromium/chrome/browser/resources/safety_tips/gen_safety_tips_proto.py b/chromium/chrome/browser/resources/safety_tips/gen_safety_tips_proto.py index e4ec99a4e3e..75f7e34655a 100755 --- a/chromium/chrome/browser/resources/safety_tips/gen_safety_tips_proto.py +++ b/chromium/chrome/browser/resources/safety_tips/gen_safety_tips_proto.py @@ -43,14 +43,22 @@ class SafetyTipsProtoGenerator(BinaryProtoGenerator): def ValidatePb(self, opts, pb): assert pb.version_id > 0 + for flagged_page in pb.flagged_page: assert flagged_page.pattern assert flagged_page.type != safety_tips_pb2.FlaggedPage.UNKNOWN - flagged_patterns = [page.pattern for page in pb.flagged_page] + for allowed_pattern in pb.allowed_pattern: + assert allowed_pattern.pattern + + flagged_patterns = [p.pattern for p in pb.flagged_page] assert sorted(flagged_patterns) == flagged_patterns, ( "Please sort flagged_page entries by pattern.") + allowed_patterns = [p.pattern for p in pb.allowed_pattern] + assert sorted(allowed_patterns) == allowed_patterns, ( + "Please sort allowed_pattern entries by pattern.") + def ProcessPb(self, opts, pb): binary_pb_str = pb.SerializeToString() outfile = os.path.join(opts.outdir, opts.outbasename) diff --git a/chromium/chrome/browser/resources/safety_tips/safety_tips.asciipb b/chromium/chrome/browser/resources/safety_tips/safety_tips.asciipb index 64b7f997870..a1536bd796d 100644 --- a/chromium/chrome/browser/resources/safety_tips/safety_tips.asciipb +++ b/chromium/chrome/browser/resources/safety_tips/safety_tips.asciipb @@ -8,13 +8,20 @@ # locally, generate and push the protobuffer to the storage bucket but do not # check in the changes. -version_id: 4 +version_id: 5 # See chrome/browser/lookalikes/safety_tips.proto for the full format. -# These entries must be sorted alphabetically by pattern. +# flagged_page entries must be sorted alphabetically by pattern. # Example entry: # flagged_page { -# pattern: "example.test/test-path-for-safety-tips/test.html" -# type: BAD_REP -#} +# pattern: "bad.test/test-path-for-safety-tips/test.html" +# type: BAD_REP +# } + +# A page that's marked to not show a UI for any heuristic (including lookalike +# or edit distance). +# allowed_pattern entries must be sorted alphabetically by pattern. +# allowed_pattern: { +# pattern: "good.test/some/path.html" +# } |