zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 16:37:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Re-apply server prohibited status codes in domain update for locked-down TLDs

Browse source 
For TLDs with domain create restriction. SERVER_TRANSFER_PROHIBITED and SERVER_UPDATE_PROHIBITED status codes
are automatically applied to newly created domains to make them immutable. When there is a legitimate for an update on a domain, the registry must first run nomulus update_server_locks to remove status before the registrar can request an update via EPP.

To eliminate the risk of the registry forgetting to reapply the codes after a update, we automatically re-apply these codes after a success update.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=152533379
This commit is contained in:
jianglai 2017-04-07 13:03:14 -07:00 • committed by Ben McIlwain
parent 4f94464eaf
commit bae5038b0a
2 changed files with 57 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
java/google/registry/flows/domain/DomainUpdateFlow.java
View file

@ -267,9 +267,12 @@ public final class DomainUpdateFlow implements TransactionalFlow {
checkSameValuesNotAddedAndRemoved(add.getStatusValues(), remove.getStatusValues()); checkSameValuesNotAddedAndRemoved(add.getStatusValues(), remove.getStatusValues());
Change change = command.getInnerChange(); Change change = command.getInnerChange();
SecDnsUpdateExtension secDnsUpdate = eppInput.getSingleExtension(SecDnsUpdateExtension.class); SecDnsUpdateExtension secDnsUpdate = eppInput.getSingleExtension(SecDnsUpdateExtension.class);
return domain.asBuilder() DomainResource.Builder domainBuilder =
domain
.asBuilder()
// Handle the secDNS extension. // Handle the secDNS extension.
.setDsData(secDnsUpdate != null .setDsData(
secDnsUpdate != null
? updateDsData(domain.getDsData(), secDnsUpdate) ? updateDsData(domain.getDsData(), secDnsUpdate)
: domain.getDsData()) : domain.getDsData())
.setLastEppUpdateTime(now) .setLastEppUpdateTime(now)
@ -281,8 +284,13 @@ public final class DomainUpdateFlow implements TransactionalFlow {
.addContacts(add.getContacts()) .addContacts(add.getContacts())
.removeContacts(remove.getContacts()) .removeContacts(remove.getContacts())
.setRegistrant(firstNonNull(change.getRegistrant(), domain.getRegistrant())) .setRegistrant(firstNonNull(change.getRegistrant(), domain.getRegistrant()))
.setAuthInfo(firstNonNull(change.getAuthInfo(), domain.getAuthInfo())) .setAuthInfo(firstNonNull(change.getAuthInfo(), domain.getAuthInfo()));
.build(); if (Registry.get(domain.getTld()).getDomainCreateRestricted()) {
domainBuilder
.addStatusValue(StatusValue.SERVER_TRANSFER_PROHIBITED)
.addStatusValue(StatusValue.SERVER_UPDATE_PROHIBITED);
}
return domainBuilder.build();
} }
private DomainResource convertSunrushAddToAdd( private DomainResource convertSunrushAddToAdd(

34
javatests/google/registry/flows/domain/DomainUpdateFlowTest.java
View file

@ -1260,7 +1260,7 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
} }
@Test @Test
public void testSuccess_domainCreateRestricted_addedNameserverAllowed() throws Exception { public void testSuccess_domainCreateRestricted_addedNameserverNotAllowed() throws Exception {
persistReferencedEntities(); persistReferencedEntities();
persistDomain(); persistDomain();
persistResource( persistResource(
@ -1374,6 +1374,38 @@ public class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow,
doSuccessfulTest(); doSuccessfulTest();
} }
@Test
public void testSuccess_domainCreateRestricted_reApplyServerProhibitedStatusCodes()
throws Exception {
persistReferencedEntities();
persistDomain();
persistResource(
Registry.get("tld")
.asBuilder()
.setDomainCreateRestricted(true)
.setReservedLists(
persistReservedList(
"reserved", "example,NAMESERVER_RESTRICTED,ns1.example.foo:ns2.example.foo"))
.build());
doSuccessfulTest();
assertAboutDomains()
.that(reloadResourceByForeignKey())
.hasStatusValue(StatusValue.SERVER_UPDATE_PROHIBITED)
.and()
.hasStatusValue(StatusValue.SERVER_TRANSFER_PROHIBITED);
}
@Test
public void testSuccess_domainCreateNotRestricted_doNotApplyServerProhibitedStatusCodes()
throws Exception {
persistReferencedEntities();
persistDomain();
doSuccessfulTest();
assertAboutDomains()
.that(reloadResourceByForeignKey())
.hasExactlyStatusValues(StatusValue.CLIENT_HOLD);
}
@Test @Test
public void testFailure_freePremium_wrongFee() throws Exception { public void testFailure_freePremium_wrongFee() throws Exception {
setEppInput("domain_update_fee.xml", ImmutableMap.of("FEE_VERSION", "0.11")); setEppInput("domain_update_fee.xml", ImmutableMap.of("FEE_VERSION", "0.11"));