zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-28 07:13:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Change behavior when searching contacts by name

Browse source 
We no longer find contacts by name if the request is not authorized to see the name.

Several changes cascade from this. Previously, the code assumed that deleted contacts might still have full names, and therefore be searchable. This is not possible in all cases, because Datastore doesn't have the right index to find deleted contacts by name with a matching registrar. However, luckily, this situation can never occur, because contacts always have their name fields nulled out when they are deleted.

So instead, we simply ignore deleted records when searching by name, knowing that none can ever match.

The tests were then changed so that deleted records look the way the really will, meaning devoid of personal information.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172776926
This commit is contained in:
mountford 2017-10-19 11:51:03 -07:00 • committed by jianglai
parent f89ad27e17
commit ac822053cc
5 changed files with 182 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

128
javatests/google/registry/rdap/RdapEntitySearchActionTest.java
View file

@ -21,6 +21,7 @@ import static google.registry.testing.DatastoreHelper.persistResource;
import static google.registry.testing.DatastoreHelper.persistResources;
import static google.registry.testing.DatastoreHelper.persistSimpleResources;
import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistContactResource;
import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistDeletedContactResource;
import static google.registry.testing.FullFieldsTestEntityHelper.makeContactResource;
import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar;
import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrarContacts;
@ -48,6 +49,7 @@ import java.util.Optional;
import javax.annotation.Nullable;
import javax.servlet.http.HttpServletRequest;
import org.joda.time.DateTime;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import org.junit.Before;
import org.junit.Rule;
@ -130,11 +132,8 @@ public class RdapEntitySearchActionTest {
clock.nowUtc(),
registrarTest);
makeAndPersistContactResource(
makeAndPersistDeletedContactResource(
"clyde",
"Clyde (愚図た)",
"clyde@c.tld",
ImmutableList.of("123 Example Blvd <script>"),
clock.nowUtc().minusYears(1),
registrarDeleted,
clock.nowUtc().minusMonths(6));
@ -219,7 +218,7 @@ public class RdapEntitySearchActionTest {
builder.put("rdapConformance", ImmutableList.of("rdap_level_0"));
RdapTestHelper.addNotices(builder, "https://example.com/rdap/");
RdapTestHelper.addNonDomainBoilerplateRemarks(builder);
return builder.build();
return new JSONObject(builder.build());
}
private void createManyContactsAndRegistrars(
@ -421,16 +420,14 @@ public class RdapEntitySearchActionTest {
}
@Test
public void testNameMatchContact_found_notLoggedIn() throws Exception {
runSuccessfulNameTestWithBlinky(
"Blinky (赤ベイ)", "rdap_contact_no_personal_data_with_remark.json");
public void testNameMatchContact_notFound_notLoggedIn() throws Exception {
runNotFoundNameTest("Blinky (赤ベイ)");
}
@Test
public void testNameMatchContact_found_loggedInAsOtherRegistrar() throws Exception {
public void testNameMatchContact_notFound_loggedInAsOtherRegistrar() throws Exception {
login("2-Registrar");
runSuccessfulNameTestWithBlinky(
"Blinky (赤ベイ)", "rdap_contact_no_personal_data_with_remark.json");
runNotFoundNameTest("Blinky (赤ベイ)");
}
@Test
@ -475,17 +472,17 @@ public class RdapEntitySearchActionTest {
}
@Test
public void testNameMatchContact_found_deletedWhenLoggedInAsSameRegistrar() throws Exception {
public void testNameMatchContact_notFound_deletedWhenLoggedInAsSameRegistrar() throws Exception {
login("2-Registrar");
action.includeDeletedParam = Optional.of(true);
runSuccessfulNameTest(
"Cl*",
"6-ROID",
"Clyde (愚図た)",
"removed",
"clyde@c.tld",
"\"123 Example Blvd <script>\"",
"rdap_contact_deleted.json");
runNotFoundNameTest("Cl*");
}
@Test
public void testNameMatchContact_notFound_deletedWhenLoggedInAsAdmin() throws Exception {
loginAsAdmin();
action.includeDeletedParam = Optional.of(true);
runNotFoundNameTest("Cl*");
}
@Test
@ -640,6 +637,91 @@ public class RdapEntitySearchActionTest {
runNotFoundHandleTest("2-ROID");
}
@Test
public void testHandleMatchContact_notFound_deleted() throws Exception {
login("2-RegistrarTest");
runNotFoundHandleTest("6-ROID");
}
@Test
public void testHandleMatchContact_notFound_deletedWhenLoggedInAsOtherRegistrar()
throws Exception {
login("2-RegistrarTest");
action.includeDeletedParam = Optional.of(true);
runNotFoundHandleTest("6-ROID");
}
@Test
public void testHandleMatchContact_found_deletedWhenLoggedInAsSameRegistrar() throws Exception {
login("2-Registrar");
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
"6-ROID",
"6-ROID",
"",
"removed",
"",
"",
"rdap_contact_deleted.json");
}
@Test
public void testHandleMatchContact_found_deletedWhenLoggedInAsAdmin() throws Exception {
loginAsAdmin();
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
"6-ROID",
"6-ROID",
"",
"removed",
"",
"",
"rdap_contact_deleted.json");
}
@Test
public void testHandleMatchContact_notFound_deletedWildcard() throws Exception {
login("2-RegistrarTest");
runNotFoundHandleTest("6-ROI*");
}
@Test
public void testHandleMatchContact_notFound_deletedWildcardWhenLoggedInAsOtherRegistrar()
throws Exception {
login("2-RegistrarTest");
action.includeDeletedParam = Optional.of(true);
runNotFoundHandleTest("6-ROI*");
}
@Test
public void testHandleMatchContact_found_deletedWildcardWhenLoggedInAsSameRegistrar()
throws Exception {
login("2-Registrar");
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
"6-ROI*",
"6-ROID",
"",
"removed",
"",
"",
"rdap_contact_deleted.json");
}
@Test
public void testHandleMatchContact_found_deletedWildcardWhenLoggedInAsAdmin() throws Exception {
loginAsAdmin();
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
"6-ROI*",
"6-ROID",
"",
"removed",
"",
"",
"rdap_contact_deleted.json");
}
@Test
public void testHandleMatchRegistrar_found() throws Exception {
runSuccessfulHandleTest("20", "20", "Yes Virginia <script>", "rdap_registrar.json");
@ -685,6 +767,12 @@ public class RdapEntitySearchActionTest {
runNotFoundHandleTest("2-RO*");
}
@Test
public void testHandleMatchContact_found_deleted() throws Exception {
login("2-RegistrarTest");
runSuccessfulHandleTestWithBlinky("2-RO*", "rdap_contact.json");
}
@Test
public void testHandleMatchContact_notFound_wildcard() throws Exception {
runNotFoundHandleTest("20*");