zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-20 09:46:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

E-mail changes initiated from console to registrar contacts

Browse source 
Also, fix misspelling of "recipient."

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=237857289
This commit is contained in:
mmuller 2019-03-11 12:28:31 -07:00 • committed by Ben McIlwain
parent a7d099d2a3
commit 450e867534
10 changed files with 112 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

64
javatests/google/registry/ui/server/SendEmailUtilsTest.java
View file

@ -51,19 +51,19 @@ public class SendEmailUtilsTest {
when(emailService.createMessage()).thenReturn(message);
}
private void setRecepients(ImmutableList<String> recepients) {
private void setRecipients(ImmutableList<String> recipients) {
sendEmailUtils =
new SendEmailUtils(
"outgoing@registry.example",
"outgoing display name",
recepients,
recipients,
emailService);
}
@Test
public void testSuccess_sendToOneAddress() throws Exception {
setRecepients(ImmutableList.of("johnny@fakesite.tld"));
assertThat(sendEmailUtils.hasRecepients()).isTrue();
setRecipients(ImmutableList.of("johnny@fakesite.tld"));
assertThat(sendEmailUtils.hasRecipients()).isTrue();
assertThat(
sendEmailUtils.sendEmail(
"Welcome to the Internet",
@ -78,8 +78,8 @@ public class SendEmailUtilsTest {
@Test
public void testSuccess_sendToMultipleAddresses() throws Exception {
setRecepients(ImmutableList.of("foo@example.com", "bar@example.com"));
assertThat(sendEmailUtils.hasRecepients()).isTrue();
setRecipients(ImmutableList.of("foo@example.com", "bar@example.com"));
assertThat(sendEmailUtils.hasRecipients()).isTrue();
assertThat(
sendEmailUtils.sendEmail(
"Welcome to the Internet",
@ -93,8 +93,8 @@ public class SendEmailUtilsTest {
@Test
public void testSuccess_ignoresMalformedEmailAddress() throws Exception {
setRecepients(ImmutableList.of("foo@example.com", "1iñvalidemail"));
assertThat(sendEmailUtils.hasRecepients()).isTrue();
setRecipients(ImmutableList.of("foo@example.com", "1iñvalidemail"));
assertThat(sendEmailUtils.hasRecipients()).isTrue();
assertThat(
sendEmailUtils.sendEmail(
"Welcome to the Internet",
@ -107,8 +107,8 @@ public class SendEmailUtilsTest {
@Test
public void testFailure_noAddresses() throws Exception {
setRecepients(ImmutableList.of());
assertThat(sendEmailUtils.hasRecepients()).isFalse();
setRecipients(ImmutableList.of());
assertThat(sendEmailUtils.hasRecipients()).isFalse();
assertThat(
sendEmailUtils.sendEmail(
"Welcome to the Internet",
@ -119,8 +119,8 @@ public class SendEmailUtilsTest {
@Test
public void testFailure_onlyGivenMalformedAddress() throws Exception {
setRecepients(ImmutableList.of("1iñvalidemail"));
assertThat(sendEmailUtils.hasRecepients()).isTrue();
setRecipients(ImmutableList.of("1iñvalidemail"));
assertThat(sendEmailUtils.hasRecipients()).isTrue();
assertThat(
sendEmailUtils.sendEmail(
"Welcome to the Internet",
@ -131,8 +131,8 @@ public class SendEmailUtilsTest {
@Test
public void testFailure_exceptionThrownDuringSend() throws Exception {
setRecepients(ImmutableList.of("foo@example.com"));
assertThat(sendEmailUtils.hasRecepients()).isTrue();
setRecipients(ImmutableList.of("foo@example.com"));
assertThat(sendEmailUtils.hasRecipients()).isTrue();
doThrow(new MessagingException()).when(emailService).sendMessage(any(Message.class));
assertThat(
sendEmailUtils.sendEmail(
@ -145,6 +145,42 @@ public class SendEmailUtilsTest {
.containsExactly(new InternetAddress("foo@example.com"));
}
@Test
public void testAdditionalRecipients() throws Exception {
setRecipients(ImmutableList.of("foo@example.com"));
assertThat(sendEmailUtils.hasRecipients()).isTrue();
assertThat(
sendEmailUtils.sendEmail(
"Welcome to the Internet",
"It is a dark and scary place.",
ImmutableList.of("bar@example.com", "baz@example.com")))
.isTrue();
verifyMessageSent();
assertThat(message.getAllRecipients())
.asList()
.containsExactly(
new InternetAddress("foo@example.com"),
new InternetAddress("bar@example.com"),
new InternetAddress("baz@example.com"));
}
@Test
public void testOnlyAdditionalRecipients() throws Exception {
setRecipients(ImmutableList.of());
assertThat(sendEmailUtils.hasRecipients()).isFalse();
assertThat(
sendEmailUtils.sendEmail(
"Welcome to the Internet",
"It is a dark and scary place.",
ImmutableList.of("bar@example.com", "baz@example.com")))
.isTrue();
verifyMessageSent();
assertThat(message.getAllRecipients())
.asList()
.containsExactly(
new InternetAddress("bar@example.com"), new InternetAddress("baz@example.com"));
}
private void verifyMessageSent() throws Exception {
verify(emailService).sendMessage(message);
assertThat(message.getSubject()).isEqualTo("Welcome to the Internet");

3
javatests/google/registry/ui/server/registrar/ContactSettingsTest.java
View file

@ -65,7 +65,7 @@ public class ContactSettingsTest extends RegistrarSettingsActionTestCase {
}
@Test
public void testPost_updateContacts_success() {
public void testPost_updateContacts_success() throws Exception {
// Remove all the contacts but the first by updating with list of
// just it.
Map<String, /* @Nullable */ Object> adminContact1 = new HashMap<>();
@ -91,6 +91,7 @@ public class ContactSettingsTest extends RegistrarSettingsActionTestCase {
.build();
assertThat(loadRegistrar(CLIENT_ID).getContacts()).containsExactly(newContact);
assertMetric(CLIENT_ID, "update", "[OWNER]", "SUCCESS");
verifyContactsNotified();
}
@Test

7
javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java
View file

@ -40,7 +40,6 @@ import google.registry.util.CidrAddressBlock;
import java.util.Map;
import java.util.function.BiFunction;
import java.util.function.Function;
import javax.mail.internet.InternetAddress;
import org.json.simple.JSONValue;
import org.json.simple.parser.ParseException;
import org.junit.Test;
@ -56,11 +55,7 @@ public class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase
String expectedEmailBody = loadFile(getClass(), "update_registrar_email.txt");
action.handleJsonRequest(readJsonFromFile("update_registrar.json", getLastUpdateTime()));
verify(rsp, never()).setStatus(anyInt());
verify(emailService).createMessage();
verify(emailService).sendMessage(message);
assertThat(message.getAllRecipients()).asList().containsExactly(
new InternetAddress("notification@test.example"),
new InternetAddress("notification2@test.example"));
verifyContactsNotified();
assertThat(message.getContent()).isEqualTo(expectedEmailBody);
assertTasksEnqueued("sheet", new TaskMatcher()
.url(SyncRegistrarsSheetAction.PATH)

15
javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java
View file

@ -22,12 +22,14 @@ import static google.registry.request.auth.AuthenticatedRegistrarAccessor.Role.O
import static google.registry.security.JsonHttpTestUtils.createJsonPayload;
import static google.registry.testing.DatastoreHelper.createTlds;
import static google.registry.testing.DatastoreHelper.disallowRegistrarAccess;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.google.appengine.api.users.User;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSetMultimap;
import com.google.common.truth.Truth;
import google.registry.config.RegistryEnvironment;
import google.registry.model.ofy.Ofy;
import google.registry.request.JsonActionRunner;
@ -48,6 +50,7 @@ import java.io.StringWriter;
import java.util.Properties;
import javax.mail.Message;
import javax.mail.Session;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -156,4 +159,16 @@ public class RegistrarSettingsActionTestCase {
AuthenticatedRegistrarAccessor.createForTesting(
ImmutableSetMultimap.of(CLIENT_ID, ADMIN));
}
/** Verifies that the original contact of TheRegistrar is among those notified of a change. */
protected void verifyContactsNotified() throws Exception {
verify(emailService).createMessage();
verify(emailService).sendMessage(message);
Truth.assertThat(message.getAllRecipients())
.asList()
.containsExactly(
new InternetAddress("notification@test.example"),
new InternetAddress("notification2@test.example"),
new InternetAddress("johndoe@theregistrar.com"));
}
}

11
javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java
View file

@ -41,7 +41,7 @@ import org.junit.runners.JUnit4;
public class SecuritySettingsTest extends RegistrarSettingsActionTestCase {
@Test
public void testPost_updateCert_success() {
public void testPost_updateCert_success() throws Exception {
Registrar modified =
loadRegistrar(CLIENT_ID)
.asBuilder()
@ -55,6 +55,7 @@ public class SecuritySettingsTest extends RegistrarSettingsActionTestCase {
assertThat(response).containsEntry("results", ImmutableList.of(modified.toJsonMap()));
assertThat(loadRegistrar(CLIENT_ID)).isEqualTo(modified);
assertMetric(CLIENT_ID, "update", "[OWNER]", "SUCCESS");
verifyContactsNotified();
}
@Test
@ -71,7 +72,7 @@ public class SecuritySettingsTest extends RegistrarSettingsActionTestCase {
}
@Test
public void testChangeCertificates() {
public void testChangeCertificates() throws Exception {
Map<String, Object> jsonMap = loadRegistrar(CLIENT_ID).toJsonMap();
jsonMap.put("clientCertificate", SAMPLE_CERT);
jsonMap.put("failoverClientCertificate", null);
@ -84,10 +85,11 @@ public class SecuritySettingsTest extends RegistrarSettingsActionTestCase {
assertThat(registrar.getFailoverClientCertificate()).isNull();
assertThat(registrar.getFailoverClientCertificateHash()).isNull();
assertMetric(CLIENT_ID, "update", "[OWNER]", "SUCCESS");
verifyContactsNotified();
}
@Test
public void testChangeFailoverCertificate() {
public void testChangeFailoverCertificate() throws Exception {
Map<String, Object> jsonMap = loadRegistrar(CLIENT_ID).toJsonMap();
jsonMap.put("failoverClientCertificate", SAMPLE_CERT2);
Map<String, Object> response = action.handleJsonRequest(ImmutableMap.of(
@ -97,10 +99,11 @@ public class SecuritySettingsTest extends RegistrarSettingsActionTestCase {
assertThat(registrar.getFailoverClientCertificate()).isEqualTo(SAMPLE_CERT2);
assertThat(registrar.getFailoverClientCertificateHash()).isEqualTo(SAMPLE_CERT2_HASH);
assertMetric(CLIENT_ID, "update", "[OWNER]", "SUCCESS");
verifyContactsNotified();
}
@Test
public void testEmptyOrNullCertificate_doesNotClearOutCurrentOne() {
public void testEmptyOrNullCertificate_doesNotClearOutCurrentOne() throws Exception {
Registrar initialRegistrar =
persistResource(
loadRegistrar(CLIENT_ID)

3
javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java
View file

@ -36,7 +36,7 @@ import org.junit.runners.JUnit4;
public class WhoisSettingsTest extends RegistrarSettingsActionTestCase {
@Test
public void testPost_update_success() {
public void testPost_update_success() throws Exception {
Registrar modified =
loadRegistrar(CLIENT_ID)
.asBuilder()
@ -61,6 +61,7 @@ public class WhoisSettingsTest extends RegistrarSettingsActionTestCase {
assertThat(response.get("results")).isEqualTo(ImmutableList.of(modified.toJsonMap()));
assertThat(loadRegistrar(CLIENT_ID)).isEqualTo(modified);
assertMetric(CLIENT_ID, "update", "[OWNER]", "SUCCESS");
verifyContactsNotified();
}
@Test