Add basic AllocationToken validation/redemption for domain creates

The next step is to add them for domain checks as well (which is simpler
because it doesn't involve validation).

This requires the addition of a TrimWhitespaceAdapter for XML JAXB objects,
which will prove useful for other @XmlValue attributes in the future.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=181526726
This commit is contained in:
mcilwain 2018-01-10 15:27:07 -08:00 committed by Ben McIlwain
parent 646dcecd7e
commit e07d011bc6
11 changed files with 246 additions and 16 deletions

View file

@ -59,11 +59,14 @@ import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedMap;
import com.googlecode.objectify.Key;
import google.registry.flows.EppException;
import google.registry.flows.EppException.UnimplementedExtensionException;
import google.registry.flows.EppRequestSource;
import google.registry.flows.ExtensionManager.UndeclaredServiceExtensionException;
import google.registry.flows.ResourceFlowTestCase;
import google.registry.flows.domain.AllocationTokenFlowUtils.AlreadyRedeemedAllocationTokenException;
import google.registry.flows.domain.AllocationTokenFlowUtils.InvalidAllocationTokenException;
import google.registry.flows.domain.DomainCreateFlow.DomainHasOpenApplicationsException;
import google.registry.flows.domain.DomainCreateFlow.NoGeneralRegistrationsInCurrentPhaseException;
import google.registry.flows.domain.DomainFlowUtils.AcceptedTooLongAgoException;
@ -120,6 +123,7 @@ import google.registry.flows.exceptions.ResourceAlreadyExistsException;
import google.registry.model.billing.BillingEvent;
import google.registry.model.billing.BillingEvent.Flag;
import google.registry.model.billing.BillingEvent.Reason;
import google.registry.model.domain.AllocationToken;
import google.registry.model.domain.DomainResource;
import google.registry.model.domain.GracePeriod;
import google.registry.model.domain.LrpTokenEntity;
@ -381,11 +385,40 @@ public class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow,
}
@Test
public void testSuccess_allocationToken_isIgnored() throws Exception {
// TODO(b/70628322): Change this test to fail on invalid allocationToken.
public void testFailure_invalidAllocationToken() throws Exception {
setEppInput("domain_create_allocationtoken.xml");
persistContactsAndHosts();
EppException thrown = expectThrows(InvalidAllocationTokenException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
}
@Test
public void testFailure_alreadyRedemeedAllocationToken() throws Exception {
setEppInput("domain_create_allocationtoken.xml");
persistContactsAndHosts();
persistResource(
new AllocationToken.Builder()
.setToken("abc123")
.setRedemptionHistoryEntry(Key.create(HistoryEntry.class, 505L))
.build());
clock.advanceOneMilli();
EppException thrown =
expectThrows(AlreadyRedeemedAllocationTokenException.class, this::runFlow);
assertAboutEppExceptions().that(thrown).marshalsToXml();
}
@Test
public void testSuccess_validAllocationToken_isRedeemed() throws Exception {
setEppInput("domain_create_allocationtoken.xml");
persistContactsAndHosts();
AllocationToken token =
persistResource(new AllocationToken.Builder().setToken("abc123").build());
clock.advanceOneMilli();
doSuccessfulTest();
HistoryEntry historyEntry =
ofy().load().type(HistoryEntry.class).ancestor(reloadResourceByForeignKey()).first().now();
assertThat(ofy().load().entity(token).now().getRedemptionHistoryEntry())
.isEqualTo(Key.create(historyEntry));
}
@Test

View file

@ -72,4 +72,12 @@ public class AllocationTokenTest extends EntityTestCase {
() -> builder.setCreationTime(DateTime.parse("2010-11-13T05:00:00Z")));
assertThat(thrown).hasMessageThat().isEqualTo("creationTime can only be set once");
}
@Test
public void testSetToken_cantCallMoreThanOnce() throws Exception {
AllocationToken.Builder builder = new AllocationToken.Builder().setToken("foobar");
IllegalStateException thrown =
expectThrows(IllegalStateException.class, () -> builder.setToken("barfoo"));
assertThat(thrown).hasMessageThat().isEqualTo("token can only be set once");
}
}

View file

@ -25,6 +25,7 @@ import org.junit.runners.JUnit4;
/** Unit tests for {@link DateAdapter}. */
@RunWith(JUnit4.class)
public class DateAdapterTest {
@Test
public void testMarshal() {
assertThat(new DateAdapter().marshal(

View file

@ -0,0 +1,45 @@
// 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.xml;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
/** Unit tests for {@link TrimWhitespaceAdapter}. */
@RunWith(JUnit4.class)
public class TrimWhitespaceAdapterTest {
@Test
public void testUnmarshal() {
TrimWhitespaceAdapter adapter = new TrimWhitespaceAdapter();
assertThat(adapter.unmarshal("blah")).isEqualTo("blah");
assertThat(adapter.unmarshal("")).isEmpty();
assertThat(adapter.unmarshal(null)).isNull();
assertThat(adapter.unmarshal("\n test foo bar \n \r")).isEqualTo("test foo bar");
}
@Test
public void testMarshal() {
TrimWhitespaceAdapter adapter = new TrimWhitespaceAdapter();
assertThat(adapter.marshal("blah")).isEqualTo("blah");
assertThat(adapter.marshal("")).isEmpty();
assertThat(adapter.marshal(null)).isNull();
assertThat(adapter.marshal("\n test foo bar \n \r"))
.isEqualTo("\n test foo bar \n \r");
}
}

View file

@ -27,6 +27,7 @@ import org.junit.runners.JUnit4;
/** Unit tests for {@link UtcDateTimeAdapter}. */
@RunWith(JUnit4.class)
public class UtcDateTimeAdapterTest {
@Test
public void testMarshal() {
assertThat(new UtcDateTimeAdapter().marshal(new DateTime(2010, 10, 17, 4, 20, 0, UTC)))