From 734f39005a7549bfd697c89a61aa4d0ed698ee82 Mon Sep 17 00:00:00 2001 From: sarahcaseybot Date: Mon, 14 Oct 2019 12:23:28 -0400 Subject: [PATCH] Update Spec11 email template (#308) * Changes to Spec11 notice email. * Fix lines that were too long --- .../reporting/spec11/soy/Spec11Email.soy | 20 +++-- .../spec11/Spec11EmailUtilsTest.java | 87 +++++++------------ 2 files changed, 44 insertions(+), 63 deletions(-) diff --git a/core/src/main/resources/google/registry/reporting/spec11/soy/Spec11Email.soy b/core/src/main/resources/google/registry/reporting/spec11/soy/Spec11Email.soy index 44c9eaf61..31d0fb125 100644 --- a/core/src/main/resources/google/registry/reporting/spec11/soy/Spec11Email.soy +++ b/core/src/main/resources/google/registry/reporting/spec11/soy/Spec11Email.soy @@ -37,17 +37,18 @@ {/call}

Please work with the registrant to mitigate any security issues and have the - domains delisted.

+ domains delisted. If you believe that any of the domains were reported in error, or are still + receiving reports for issues that have been remediated, + please submit a + request to have the site reviewed.

{call .resourceList} {param resources: $resources /} {/call}

You will continue to receive a monthly summary of all domains managed by your registrar - that remain on our lists of potential security threats. You will additionally receive a daily - notice when any new domains that are added to these lists. Once the registrant has resolved - the security issues and followed the steps to have his or her domain reviewed and delisted - it will automatically be removed from our monthly reporting.

+ that remain on our lists of potential security threats. You will also receive a daily + notice when any new domains are added to these lists.

If you have any questions regarding this notice, please contact {$replyToEmail}.

{/template} @@ -79,11 +80,14 @@ {param resources: $resources /} {/call} +

If you believe that any of the domains were reported in error, or are still receiving + reports for issues that have been remediated, + please submit + a request to have the site reviewed.

+

You will continue to receive daily notices when new domains managed by your registrar are flagged for abuse, as well as a monthly summary of all of your domains under management - that remain flagged for abuse. Once the registrant has resolved the security issues and - followed the steps to have his or her domain reviewed and delisted it will automatically - be removed from our reporting.

+ that remain flagged for abuse.

If you would like to change the email to which these notices are sent please update your abuse contact using your registrar portal account.

diff --git a/core/src/test/java/google/registry/reporting/spec11/Spec11EmailUtilsTest.java b/core/src/test/java/google/registry/reporting/spec11/Spec11EmailUtilsTest.java index 637159596..3ecf8e36c 100644 --- a/core/src/test/java/google/registry/reporting/spec11/Spec11EmailUtilsTest.java +++ b/core/src/test/java/google/registry/reporting/spec11/Spec11EmailUtilsTest.java @@ -61,63 +61,40 @@ public class Spec11EmailUtilsTest { private static final ImmutableList FAKE_RESOURCES = ImmutableList.of("foo"); private static final String DAILY_EMAIL_FORMAT = - "Dear registrar partner," - + "" - + "

Super Cool Registry conducts a daily analysis of all domains registered in its " - + "TLDs to identify potential security concerns. On 2018-07-15, the following domains " - + "that your registrar manages were flagged for potential security concerns:

" - + "" - + "" - + "" - + "%s" - + "
Domain NameThreat Type
" - + "

Please communicate these findings to the registrant and work with the " - + "registrant to mitigate any security issues and have the domains delisted.

" - + "" + "Dear registrar partner,

Super Cool Registry conducts a daily analysis of all domains" + + " registered in its TLDs to identify potential security concerns. On 2018-07-15, the" + + " following domains that your registrar manages were flagged for potential security" + + " concerns:

%s" + + "
Domain NameThreat Type

Please communicate these findings to the registrant and work with the" + + " registrant to mitigate any security issues and have the domains delisted.

" + "Some helpful resources for getting off a blocked list include:" - + "

" - + "" - + "You will continue to receive daily notices when new domains managed by your registrar " - + "are flagged for abuse, as well as a monthly summary of all of your domains under " - + "management that remain flagged for abuse. Once the registrant has resolved the " - + "security issues and followed the steps to have his or her domain reviewed and " - + "delisted it will automatically be removed from our reporting.

" - + "" - + "

If you would like to change the email to which these notices are sent please " - + "update your abuse contact using your registrar portal account.

" - + "" - + "

If you have any questions regarding this notice, please contact " - + "abuse@test.com.

"; + + "

If you believe that any of the domains were reported in" + + " error, or are still receiving reports for issues that have been remediated, please" + + " submit" + + " a request to have the site reviewed.

You will continue to receive daily" + + " notices when new domains managed by your registrar are flagged for abuse, as well as" + + " a monthly summary of all of your domains under management that remain flagged for" + + " abuse.

If you would like to change the email to which these notices are sent" + + " please update your abuse contact using your registrar portal account.

If you" + + " have any questions regarding this notice, please contact abuse@test.com.

"; private static final String MONTHLY_EMAIL_FORMAT = - "Dear registrar partner," - + "" - + "

Super Cool Registry previously notified you when the following " - + "domains managed by your registrar were flagged for potential security concerns.

" - + "

The following domains that you manage continue to be flagged by our analysis " - + "for potential security concerns. This may be because the registrants have not " - + "completed the requisite steps to mitigate the potential security abuse and/or have " - + "it reviewed and delisted.

" - + "" - + "" - + "" - + "%s" - + "
Domain NameThreat Type
" - + "" - + "

Please work with the registrant to mitigate any security issues " - + "and have the domains delisted.

" - + "" - + "Some helpful resources for getting off a blocked list include:" - + "

" - + "" - + "You will continue to receive a monthly summary of all domains managed by your " - + "registrar that remain on our lists of potential security threats. You will " - + "additionally receive a daily notice when any new domains that are added to these " - + "lists. Once the registrant has resolved the security issues and followed the steps to " - + "have his or her domain reviewed and delisted it will automatically be removed from " - + "our monthly reporting.

" - + "" - + "

If you have any questions regarding this notice, please contact " - + "abuse@test.com.

"; + "Dear registrar partner,

Super Cool Registry previously notified you when the following" + + " domains managed by your registrar were flagged for potential security" + + " concerns.

The following domains that you manage continue to be flagged by our" + + " analysis for potential security concerns. This may be because the registrants have" + + " not completed the requisite steps to mitigate the potential security abuse and/or" + + " have it reviewed and delisted.

%s
Domain NameThreat" + + " Type

Please work with the registrant to mitigate any security" + + " issues and have the domains delisted. If you believe that any of the domains were" + + " reported in error, or are still receiving reports for issues that have been" + + " remediated, please submit a" + + " request to have the site reviewed.

Some helpful resources for getting off a" + + " blocked list include:

You will continue to receive a monthly" + + " summary of all domains managed by your registrar that remain on our lists of" + + " potential security threats. You will also receive a daily notice when any new" + + " domains are added to these lists.

If you have any questions regarding this" + + " notice, please contact abuse@test.com.

"; @Rule public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();