zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-20 11:19:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use the registrar client ID and abuse email address in Spec11

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=244899045
This commit is contained in:
gbrodman 2019-04-23 12:04:40 -07:00 • committed by jianglai
parent 0644fab76e
commit 53c1557d2a
9 changed files with 87 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
java/google/registry/reporting/spec11/Spec11EmailUtils.java
View file

@ -27,6 +27,8 @@ import com.google.template.soy.parseinfo.SoyTemplateInfo;
import com.google.template.soy.tofu.SoyTofu;
import com.google.template.soy.tofu.SoyTofu.Renderer;
import google.registry.config.RegistryConfig.Config;
import google.registry.model.registrar.Registrar;
import google.registry.model.registrar.RegistrarContact;
import google.registry.reporting.spec11.soy.Spec11EmailSoyInfo;
import google.registry.util.EmailMessage;
import google.registry.util.SendEmailService;
@ -105,11 +107,10 @@ public class Spec11EmailUtils {
String.format("Spec11 Emailing Failure %s", date),
String.format("Emailing Spec11 reports failed due to %s", firstThrowable.getMessage()));
for (int i = 1; i < failedMatches.size(); i++) {
// TODO(b/129401965): Use only client IDs in this message
logger.atSevere().withCause(failedMatchesList.get(i).getValue()).log(
"Additional exception thrown when sending email to registrar %s, in addition to the"
+ " re-thrown exception",
failedMatchesList.get(i).getKey().registrarEmailAddress());
failedMatchesList.get(i).getKey().clientId());
}
throw new RuntimeException(
"Emailing Spec11 reports failed, first exception:", firstThrowable);
@ -131,7 +132,7 @@ public class Spec11EmailUtils {
.setBody(getContent(date, soyTemplateInfo, registrarThreatMatches))
.setContentType(MediaType.HTML_UTF_8)
.setFrom(outgoingEmailAddress)
.addRecipient(new InternetAddress(registrarThreatMatches.registrarEmailAddress()))
.addRecipient(getEmailAddressForRegistrar(registrarThreatMatches.clientId()))
.setBcc(spec11ReplyToAddress)
.build());
}
@ -176,4 +177,19 @@ public class Spec11EmailUtils {
throw new RuntimeException("The spec11 alert e-mail system failed.", e);
}
}
private InternetAddress getEmailAddressForRegistrar(String clientId) throws MessagingException {
// Attempt to use the registrar's WHOIS abuse contact, then fall back to the regular address.
Registrar registrar =
Registrar.loadByClientIdCached(clientId)
.orElseThrow(
() ->
new IllegalArgumentException(
String.format("Could not find registrar %s", clientId)));
return new InternetAddress(
registrar
.getWhoisAbuseContact()
.map(RegistrarContact::getEmailAddress)
.orElse(registrar.getEmailAddress()));
}
}