zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-04-30 03:57:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add a missing verification to DomainApplicationUpdateFlow.

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=135712711
This commit is contained in:
cgoldfeder 2016-10-10 13:25:12 -07:00 • committed by Ben McIlwain
parent dfe0ba32cb
commit 049c636966
17 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/flows.md
View file

@ -752,6 +752,7 @@ application. Updates cannot change the domain name that is being applied for.
* Application status prohibits this domain update.
* 2306
* Cannot add and remove the same value.
* Application referenced does not match specified domain name.
* More than one contact for a given role is not allowed.
* Missing type attribute for contact.
* The secDNS:all element must have value 'true' if present.

3
java/google/registry/flows/domain/DomainApplicationUpdateFlow.java
View file

@ -30,6 +30,7 @@ import static google.registry.flows.domain.DomainFlowUtils.validateNameserversCo
import static google.registry.flows.domain.DomainFlowUtils.validateNoDuplicateContacts;
import static google.registry.flows.domain.DomainFlowUtils.validateRegistrantAllowedOnTld;
import static google.registry.flows.domain.DomainFlowUtils.validateRequiredContactsPresent;
import static google.registry.flows.domain.DomainFlowUtils.verifyApplicationDomainMatchesTargetId;
import static google.registry.flows.domain.DomainFlowUtils.verifyClientUpdateNotProhibited;
import static google.registry.flows.domain.DomainFlowUtils.verifyNotInPendingDelete;
import static google.registry.flows.domain.DomainFlowUtils.verifyStatusChangesAreClientSettable;
@ -79,6 +80,7 @@ import javax.inject.Inject;
* @error {@link google.registry.flows.exceptions.ResourceHasClientUpdateProhibitedException}
* @error {@link google.registry.flows.exceptions.ResourceStatusProhibitsOperationException}
* @error {@link google.registry.flows.exceptions.StatusNotClientSettableException}
* @error {@link DomainFlowUtils.ApplicationDomainNameMismatchException}
* @error {@link DomainFlowUtils.DuplicateContactForRoleException}
* @error {@link DomainFlowUtils.EmptySecDnsUpdateException}
* @error {@link DomainFlowUtils.LinkedResourcesDoNotExistException}
@ -133,6 +135,7 @@ public class DomainApplicationUpdateFlow extends LoggedInFlow implements Transac
Update command = cloneAndLinkReferences((Update) resourceCommand, now);
DomainApplication existingApplication = verifyExistence(
DomainApplication.class, applicationId, loadDomainApplication(applicationId, now));
verifyApplicationDomainMatchesTargetId(existingApplication, targetId);
verifyNoDisallowedStatuses(existingApplication, UPDATE_DISALLOWED_STATUSES);
verifyOptionalAuthInfoForResource(authInfo, existingApplication);
verifyUpdateAllowed(existingApplication, command);

9
javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java
View file

@ -35,6 +35,7 @@ import google.registry.flows.ResourceFlowTestCase;
import google.registry.flows.ResourceFlowUtils.ResourceDoesNotExistException;
import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException;
import google.registry.flows.domain.DomainApplicationUpdateFlow.ApplicationStatusProhibitsUpdateException;
import google.registry.flows.domain.DomainFlowUtils.ApplicationDomainNameMismatchException;
import google.registry.flows.domain.DomainFlowUtils.DuplicateContactForRoleException;
import google.registry.flows.domain.DomainFlowUtils.EmptySecDnsUpdateException;
import google.registry.flows.domain.DomainFlowUtils.LinkedResourcesDoNotExistException;
@ -399,6 +400,14 @@ public class DomainApplicationUpdateFlowTest
runFlow();
}
@Test
public void testFailure_applicationDomainNameMismatch() throws Exception {
persistReferencedEntities();
persistResource(newApplicationBuilder().setFullyQualifiedDomainName("something.tld").build());
thrown.expect(ApplicationDomainNameMismatchException.class);
runFlow();
}
@Test
public void testFailure_neverExisted() throws Exception {
persistReferencedEntities();

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_add_remove_same_contact.xml vendored
View file

@ -3,7 +3,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
<domain:add>
<domain:contact type="tech">sh8013</domain:contact>
<domain:status s="clientHold"

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_authinfo.xml vendored
View file

@ -3,7 +3,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
<domain:chg>
<domain:authInfo>
<domain:pw>2BARfoo</domain:pw>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add.xml vendored
View file

@ -5,7 +5,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
</domain:update>
</update>
<extension>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add_rem.xml vendored
View file

@ -5,7 +5,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
</domain:update>
</update>
<extension>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add_rem_same.xml vendored
View file

@ -5,7 +5,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
</domain:update>
</update>
<extension>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_empty.xml vendored
View file

@ -5,7 +5,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
</domain:update>
</update>
<extension>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem.xml vendored
View file

@ -5,7 +5,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
</domain:update>
</update>
<extension>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem_all.xml vendored
View file

@ -5,7 +5,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
</domain:update>
</update>
<extension>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem_all_false.xml vendored
View file

@ -5,7 +5,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
</domain:update>
</update>
<extension>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_urgent.xml vendored
View file

@ -5,7 +5,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
</domain:update>
</update>
<extension>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_maxsiglife.xml vendored
View file

@ -5,7 +5,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
</domain:update>
</update>
<extension>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_registrant_to_tech.xml vendored
View file

@ -3,7 +3,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
<domain:add>
<domain:contact type="tech">sh8013</domain:contact>
</domain:add>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_remove_admin.xml vendored
View file

@ -3,7 +3,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
<domain:rem>
<domain:contact type="admin">sh8013</domain:contact>
</domain:rem>

2
javatests/google/registry/flows/domain/testdata/domain_update_sunrise_remove_multiple_contacts.xml vendored
View file

@ -3,7 +3,7 @@
<update>
<domain:update
xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>example.com</domain:name>
<domain:name>example.tld</domain:name>
<domain:add>
<domain:contact type="admin">mak21</domain:contact>
<domain:contact type="billing">mak21</domain:contact>