mirror of
https://github.com/google/nomulus.git
synced 2025-05-07 23:38:21 +02:00
This CL adds transferredRegistrationExpirationTime as a TransferData field persisted to Datastore. It's only relevant for domains, and it represents the registration expiration time resulting from the approval of the most recent transfer request. For pending transfers, we assume the transfer will be server-approved, and thus in DomainTransferRequestFlow we set this field to the existing computed value serverApproveNewExpirationTime, which is what we use for setting up the server-approve autorenew billing event and poll message. In DomainTransferApproveFlow we overwrite this field with the freshly computed newExpirationTime, whereas in DomainTransferCancel/RejectFlow (and in the implicit cancel of DomainDeleteFlow during a pending transfer) we null it out. There are two key benefits to having this field, which are described in more detail in b/36405140. 1) b/25084229 - it allows storage of a frozen value to back the "exDate" field of DomainTransferResponse, which we can use to fix various errors with how exDate display currently works. 2) b/36354434 - it allows DomainResource.cloneProjectedAtTime() to just directly set the registrationExpirationTime to this value, without computing it de novo, which reduces duplicated logic and ensures that the new expiration time matches the autorenew child objects. This CL only starts writing the field on TransferData as persisted directly on the DomainResource itself. We'll then want to backfill the field for at least pending transfers, whether expired or not (so we can do (2) above), but I think we might as well backfill it for all pending and approved transfers so that we also fix (1) even for historical transfers. And then we can start actually reading the field for both purposes. (Note that for (1), this will only fix synchronous transfer responses served via DomainTransferQueryFlow, not async transfer responses served via poll messages, since these have already been persisted with a potentially bad exDate, but I don't think it's worth a backfill for those). One last naming note: I chose the verbose transferredRegistrationExpirationTime rather than the extendedRegistrationExpirationTime of DomainTransferResponse because (as is the case in autorenew grace, or for a superuser transfer) the new registration time isn't necessarily extended at all; it may be the same as the pre-transfer expiration time. Also, including "registration" helps clarify w.r.t. pendingTransferExpirationTime which refers confusingly to the expiry of the transfer itself, rather than the domain registration. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=171858083
376 lines
16 KiB
Java
376 lines
16 KiB
Java
// Copyright 2017 The Nomulus Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package google.registry.flows.domain;
|
|
|
|
import static com.google.common.truth.Truth.assertThat;
|
|
import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.RESTORED_DOMAINS;
|
|
import static google.registry.model.reporting.DomainTransactionRecord.TransactionReportField.TRANSFER_SUCCESSFUL;
|
|
import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_CREATE;
|
|
import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_TRANSFER_CANCEL;
|
|
import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST;
|
|
import static google.registry.testing.DatastoreHelper.assertBillingEvents;
|
|
import static google.registry.testing.DatastoreHelper.createPollMessageForImplicitTransfer;
|
|
import static google.registry.testing.DatastoreHelper.deleteResource;
|
|
import static google.registry.testing.DatastoreHelper.getOnlyHistoryEntryOfType;
|
|
import static google.registry.testing.DatastoreHelper.getPollMessages;
|
|
import static google.registry.testing.DatastoreHelper.loadRegistrar;
|
|
import static google.registry.testing.DatastoreHelper.persistResource;
|
|
import static google.registry.testing.DomainResourceSubject.assertAboutDomains;
|
|
import static google.registry.testing.HistoryEntrySubject.assertAboutHistoryEntries;
|
|
import static google.registry.util.DateTimeUtils.END_OF_TIME;
|
|
|
|
import com.google.common.collect.ImmutableList;
|
|
import com.google.common.collect.ImmutableSet;
|
|
import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException;
|
|
import google.registry.flows.ResourceFlowUtils.ResourceDoesNotExistException;
|
|
import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException;
|
|
import google.registry.flows.exceptions.NotPendingTransferException;
|
|
import google.registry.flows.exceptions.NotTransferInitiatorException;
|
|
import google.registry.model.contact.ContactAuthInfo;
|
|
import google.registry.model.domain.DomainAuthInfo;
|
|
import google.registry.model.domain.DomainResource;
|
|
import google.registry.model.domain.GracePeriod;
|
|
import google.registry.model.eppcommon.AuthInfo.PasswordAuth;
|
|
import google.registry.model.poll.PollMessage;
|
|
import google.registry.model.registry.Registry;
|
|
import google.registry.model.reporting.DomainTransactionRecord;
|
|
import google.registry.model.reporting.HistoryEntry;
|
|
import google.registry.model.transfer.TransferData;
|
|
import google.registry.model.transfer.TransferResponse.DomainTransferResponse;
|
|
import google.registry.model.transfer.TransferStatus;
|
|
import org.joda.time.DateTime;
|
|
import org.joda.time.Duration;
|
|
import org.junit.Before;
|
|
import org.junit.Test;
|
|
|
|
/** Unit tests for {@link DomainTransferCancelFlow}. */
|
|
public class DomainTransferCancelFlowTest
|
|
extends DomainTransferFlowTestCase<DomainTransferCancelFlow, DomainResource> {
|
|
|
|
@Before
|
|
public void setUp() throws Exception {
|
|
setEppInput("domain_transfer_cancel.xml");
|
|
setClientIdForFlow("NewRegistrar");
|
|
setupDomainWithPendingTransfer("example", "tld");
|
|
}
|
|
|
|
private void doSuccessfulTest(String commandFilename, String expectedXmlFilename)
|
|
throws Exception {
|
|
setEppInput(commandFilename);
|
|
|
|
// Replace the ROID in the xml file with the one generated in our test.
|
|
eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
|
|
// Make sure the implicit billing event is there; it will be deleted by the flow.
|
|
// We also expect to see autorenew events for the gaining and losing registrars.
|
|
assertBillingEvents(
|
|
getBillingEventForImplicitTransfer(),
|
|
getGainingClientAutorenewEvent(),
|
|
getLosingClientAutorenewEvent());
|
|
// We should see poll messages for the implicit ack case going to both registrars, and an
|
|
// autorenew poll message for the new registrar.
|
|
HistoryEntry historyEntryDomainTransferRequest =
|
|
getOnlyHistoryEntryOfType(domain, HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST);
|
|
assertPollMessages(
|
|
"NewRegistrar",
|
|
new PollMessage.Autorenew.Builder()
|
|
.setTargetId(getUniqueIdFromCommand())
|
|
.setClientId("NewRegistrar")
|
|
.setEventTime(EXTENDED_REGISTRATION_EXPIRATION_TIME)
|
|
.setAutorenewEndTime(END_OF_TIME)
|
|
.setMsg("Domain was auto-renewed.")
|
|
.setParent(historyEntryDomainTransferRequest)
|
|
.build(),
|
|
createPollMessageForImplicitTransfer(
|
|
domain,
|
|
historyEntryDomainTransferRequest,
|
|
"NewRegistrar",
|
|
TRANSFER_REQUEST_TIME,
|
|
TRANSFER_EXPIRATION_TIME,
|
|
TRANSFER_REQUEST_TIME,
|
|
EXTENDED_REGISTRATION_EXPIRATION_TIME));
|
|
assertPollMessages(
|
|
"TheRegistrar",
|
|
createPollMessageForImplicitTransfer(
|
|
domain,
|
|
historyEntryDomainTransferRequest,
|
|
"TheRegistrar",
|
|
TRANSFER_REQUEST_TIME,
|
|
TRANSFER_EXPIRATION_TIME,
|
|
TRANSFER_REQUEST_TIME,
|
|
EXTENDED_REGISTRATION_EXPIRATION_TIME));
|
|
clock.advanceOneMilli();
|
|
|
|
// Setup done; run the test.
|
|
assertTransactionalFlow(true);
|
|
DateTime originalExpirationTime = domain.getRegistrationExpirationTime();
|
|
ImmutableSet<GracePeriod> originalGracePeriods = domain.getGracePeriods();
|
|
TransferData originalTransferData = domain.getTransferData();
|
|
runFlowAssertResponse(readFile(expectedXmlFilename));
|
|
|
|
// Transfer should have been cancelled. Verify correct fields were set.
|
|
domain = reloadResourceByForeignKey();
|
|
assertTransferFailed(domain, TransferStatus.CLIENT_CANCELLED, originalTransferData);
|
|
assertAboutDomains().that(domain)
|
|
.hasRegistrationExpirationTime(originalExpirationTime).and()
|
|
.hasLastTransferTimeNotEqualTo(clock.nowUtc());
|
|
assertAboutDomains()
|
|
.that(domain)
|
|
.hasOneHistoryEntryEachOfTypes(
|
|
DOMAIN_CREATE, DOMAIN_TRANSFER_REQUEST, DOMAIN_TRANSFER_CANCEL);
|
|
final HistoryEntry historyEntryTransferCancel =
|
|
getOnlyHistoryEntryOfType(domain, DOMAIN_TRANSFER_CANCEL);
|
|
assertAboutHistoryEntries().that(historyEntryTransferCancel).hasClientId("NewRegistrar")
|
|
.and().hasOtherClientId("TheRegistrar");
|
|
// The only billing event left should be the original autorenew event, now reopened.
|
|
assertBillingEvents(
|
|
getLosingClientAutorenewEvent().asBuilder().setRecurrenceEndTime(END_OF_TIME).build());
|
|
// The poll message (in the future) to the gaining registrar for implicit ack should be gone.
|
|
assertThat(getPollMessages("NewRegistrar", clock.nowUtc().plusMonths(1)))
|
|
.isEmpty();
|
|
// The poll message in the future to the losing registrar should be gone too, but there should
|
|
// be two at the current time to the losing registrar - one for the original autorenew event,
|
|
// and another for the transfer being cancelled.
|
|
assertPollMessages(
|
|
"TheRegistrar",
|
|
new PollMessage.Autorenew.Builder()
|
|
.setTargetId(getUniqueIdFromCommand())
|
|
.setClientId("TheRegistrar")
|
|
.setEventTime(originalExpirationTime)
|
|
.setAutorenewEndTime(END_OF_TIME)
|
|
.setMsg("Domain was auto-renewed.")
|
|
.setParent(getOnlyHistoryEntryOfType(domain, DOMAIN_CREATE))
|
|
.build(),
|
|
new PollMessage.OneTime.Builder()
|
|
.setClientId("TheRegistrar")
|
|
.setEventTime(clock.nowUtc())
|
|
.setResponseData(ImmutableList.of(new DomainTransferResponse.Builder()
|
|
.setFullyQualifiedDomainName(getUniqueIdFromCommand())
|
|
.setTransferStatus(TransferStatus.CLIENT_CANCELLED)
|
|
.setTransferRequestTime(TRANSFER_REQUEST_TIME)
|
|
.setGainingClientId("NewRegistrar")
|
|
.setLosingClientId("TheRegistrar")
|
|
.setPendingTransferExpirationTime(clock.nowUtc())
|
|
.build()))
|
|
.setMsg("Transfer cancelled.")
|
|
.setParent(getOnlyHistoryEntryOfType(domain, DOMAIN_TRANSFER_CANCEL))
|
|
.build());
|
|
|
|
// The original grace periods should remain untouched.
|
|
assertThat(domain.getGracePeriods()).containsExactlyElementsIn(originalGracePeriods);
|
|
}
|
|
|
|
private void doFailingTest(String commandFilename) throws Exception {
|
|
setEppInput(commandFilename);
|
|
// Replace the ROID in the xml file with the one generated in our test.
|
|
eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
|
|
// Setup done; run the test.
|
|
assertTransactionalFlow(true);
|
|
runFlow();
|
|
}
|
|
|
|
@Test
|
|
public void testDryRun() throws Exception {
|
|
setEppInput("domain_transfer_cancel.xml");
|
|
eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
|
|
dryRunFlowAssertResponse(readFile("domain_transfer_cancel_response.xml"));
|
|
}
|
|
|
|
@Test
|
|
public void testSuccess() throws Exception {
|
|
doSuccessfulTest("domain_transfer_cancel.xml", "domain_transfer_cancel_response.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testSuccess_domainAuthInfo() throws Exception {
|
|
doSuccessfulTest("domain_transfer_cancel_domain_authinfo.xml",
|
|
"domain_transfer_cancel_response.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testSuccess_contactAuthInfo() throws Exception {
|
|
doSuccessfulTest("domain_transfer_cancel_contact_authinfo.xml",
|
|
"domain_transfer_cancel_response.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_badContactPassword() throws Exception {
|
|
// Change the contact's password so it does not match the password in the file.
|
|
contact = persistResource(
|
|
contact.asBuilder()
|
|
.setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("badpassword")))
|
|
.build());
|
|
thrown.expect(BadAuthInfoForResourceException.class);
|
|
doFailingTest("domain_transfer_cancel_contact_authinfo.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_badDomainPassword() throws Exception {
|
|
// Change the domain's password so it does not match the password in the file.
|
|
domain = persistResource(domain.asBuilder()
|
|
.setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("badpassword")))
|
|
.build());
|
|
thrown.expect(BadAuthInfoForResourceException.class);
|
|
doFailingTest("domain_transfer_cancel_domain_authinfo.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_neverBeenTransferred() throws Exception {
|
|
changeTransferStatus(null);
|
|
thrown.expect(NotPendingTransferException.class);
|
|
doFailingTest("domain_transfer_cancel.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_clientApproved() throws Exception {
|
|
changeTransferStatus(TransferStatus.CLIENT_APPROVED);
|
|
thrown.expect(NotPendingTransferException.class);
|
|
doFailingTest("domain_transfer_cancel.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_clientRejected() throws Exception {
|
|
changeTransferStatus(TransferStatus.CLIENT_REJECTED);
|
|
thrown.expect(NotPendingTransferException.class);
|
|
doFailingTest("domain_transfer_cancel.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_clientCancelled() throws Exception {
|
|
changeTransferStatus(TransferStatus.CLIENT_CANCELLED);
|
|
thrown.expect(NotPendingTransferException.class);
|
|
doFailingTest("domain_transfer_cancel.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_serverApproved() throws Exception {
|
|
changeTransferStatus(TransferStatus.SERVER_APPROVED);
|
|
thrown.expect(NotPendingTransferException.class);
|
|
doFailingTest("domain_transfer_cancel.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_serverCancelled() throws Exception {
|
|
changeTransferStatus(TransferStatus.SERVER_CANCELLED);
|
|
thrown.expect(NotPendingTransferException.class);
|
|
doFailingTest("domain_transfer_cancel.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_sponsoringClient() throws Exception {
|
|
setClientIdForFlow("TheRegistrar");
|
|
thrown.expect(NotTransferInitiatorException.class);
|
|
doFailingTest("domain_transfer_cancel.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_unrelatedClient() throws Exception {
|
|
setClientIdForFlow("ClientZ");
|
|
thrown.expect(NotTransferInitiatorException.class);
|
|
doFailingTest("domain_transfer_cancel.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_deletedDomain() throws Exception {
|
|
domain = persistResource(
|
|
domain.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
|
|
thrown.expect(
|
|
ResourceDoesNotExistException.class,
|
|
String.format("(%s)", getUniqueIdFromCommand()));
|
|
doFailingTest("domain_transfer_cancel.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_nonexistentDomain() throws Exception {
|
|
deleteResource(domain);
|
|
thrown.expect(
|
|
ResourceDoesNotExistException.class,
|
|
String.format("(%s)", getUniqueIdFromCommand()));
|
|
doFailingTest("domain_transfer_cancel.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testFailure_notAuthorizedForTld() throws Exception {
|
|
persistResource(
|
|
loadRegistrar("NewRegistrar")
|
|
.asBuilder()
|
|
.setAllowedTlds(ImmutableSet.<String>of())
|
|
.build());
|
|
thrown.expect(NotAuthorizedForTldException.class);
|
|
doSuccessfulTest("domain_transfer_cancel.xml", "domain_transfer_cancel_response.xml");
|
|
}
|
|
|
|
@Test
|
|
public void testSuccess_superuserNotAuthorizedForTld() throws Exception {
|
|
persistResource(
|
|
loadRegistrar("NewRegistrar")
|
|
.asBuilder()
|
|
.setAllowedTlds(ImmutableSet.<String>of())
|
|
.build());
|
|
clock.advanceOneMilli();
|
|
runFlowAssertResponse(
|
|
CommitMode.LIVE,
|
|
UserPrivileges.SUPERUSER,
|
|
readFile("domain_transfer_cancel_response.xml"));
|
|
}
|
|
|
|
// NB: No need to test pending delete status since pending transfers will get cancelled upon
|
|
// entering pending delete phase. So it's already handled in that test case.
|
|
|
|
@Test
|
|
public void testIcannActivityReportField_getsLogged() throws Exception {
|
|
clock.advanceOneMilli();
|
|
runFlow();
|
|
assertIcannReportingActivityFieldLogged("srs-dom-transfer-cancel");
|
|
assertTldsFieldLogged("tld");
|
|
}
|
|
|
|
@Test
|
|
public void testIcannTransactionRecord_noRecordsToCancel() throws Exception {
|
|
clock.advanceOneMilli();
|
|
runFlow();
|
|
HistoryEntry persistedEntry = getOnlyHistoryEntryOfType(domain, DOMAIN_TRANSFER_CANCEL);
|
|
// No cancellation records should be produced
|
|
assertThat(persistedEntry.getDomainTransactionRecords()).isEmpty();
|
|
}
|
|
|
|
@Test
|
|
public void testIcannTransactionRecord_cancelsPreviousRecords() throws Exception {
|
|
clock.advanceOneMilli();
|
|
persistResource(
|
|
Registry.get("tld")
|
|
.asBuilder()
|
|
.setAutomaticTransferLength(Duration.standardDays(2))
|
|
.setTransferGracePeriodLength(Duration.standardDays(3))
|
|
.build());
|
|
DomainTransactionRecord previousSuccessRecord =
|
|
DomainTransactionRecord.create("tld", clock.nowUtc().plusDays(1), TRANSFER_SUCCESSFUL, 1);
|
|
// We only want to cancel TRANSFER_SUCCESSFUL records
|
|
DomainTransactionRecord notCancellableRecord =
|
|
DomainTransactionRecord.create("tld", clock.nowUtc().plusDays(1), RESTORED_DOMAINS, 5);
|
|
persistResource(
|
|
new HistoryEntry.Builder()
|
|
.setType(DOMAIN_TRANSFER_REQUEST)
|
|
.setParent(domain)
|
|
.setModificationTime(clock.nowUtc().minusDays(4))
|
|
.setDomainTransactionRecords(
|
|
ImmutableSet.of(previousSuccessRecord, notCancellableRecord))
|
|
.build());
|
|
runFlow();
|
|
HistoryEntry persistedEntry = getOnlyHistoryEntryOfType(domain, DOMAIN_TRANSFER_CANCEL);
|
|
// We should only produce a cancellation record for the original transfer success
|
|
assertThat(persistedEntry.getDomainTransactionRecords())
|
|
.containsExactly(previousSuccessRecord.asBuilder().setReportAmount(-1).build());
|
|
}
|
|
}
|