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

Remove per-domain nameserver restrictions in reserved lists

Browse source 
This also removes the related setting on the Registry entity. We never used
either of these, and keeping them around in our codebase just adds complexity
for no purpose. We already achieve the goals of this feature by restricting
nameservers on entire TLDs and by registry-locking important domain names.

This is also two fewer things we'll have to worry about carrying over to the new
schema in Registry 3.0.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=243816241
This commit is contained in:
mcilwain 2019-04-16 08:57:07 -07:00 • committed by jianglai
parent f6dbc4156a
commit ff3aeff0ed
15 changed files with 24 additions and 794 deletions
Download patch file Download diff file Expand all files Collapse all files

75
java/google/registry/flows/domain/DomainFlowUtils.java
View file

@ -32,10 +32,8 @@ import static google.registry.model.registry.Registry.TldState.GENERAL_AVAILABIL
import static google.registry.model.registry.Registry.TldState.PREDELEGATION;
import static google.registry.model.registry.Registry.TldState.START_DATE_SUNRISE;
import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED;
import static google.registry.model.registry.label.ReservationType.NAMESERVER_RESTRICTED;
import static google.registry.model.registry.label.ReservationType.RESERVED_FOR_ANCHOR_TENANT;
import static google.registry.model.registry.label.ReservationType.RESERVED_FOR_SPECIFIC_USE;
import static google.registry.model.registry.label.ReservedList.getAllowedNameservers;
import static google.registry.pricing.PricingEngineProxy.isDomainPremium;
import static google.registry.util.CollectionUtils.nullToEmpty;
import static google.registry.util.DateTimeUtils.END_OF_TIME;
@ -344,12 +342,6 @@ public class DomainFlowUtils {
throw new NameserversNotSpecifiedForTldWithNameserverWhitelistException(
domainName.toString());
}
// For domains with a nameserver restricted reservation, they must have at least 1 nameserver.
ImmutableSet<String> domainNameserversWhitelist = getAllowedNameservers(domainName);
if (!domainNameserversWhitelist.isEmpty() && count == 0) {
throw new NameserversNotSpecifiedForNameserverRestrictedDomainException(
domainName.toString());
}
if (count > MAX_NAMESERVERS_PER_DOMAIN) {
throw new TooManyNameserversException(
String.format("Only %d nameservers are allowed per domain", MAX_NAMESERVERS_PER_DOMAIN));
@ -424,34 +416,6 @@ public class DomainFlowUtils {
}
}
/**
* Validates if the requested nameservers can be set on the requested domain.
*
* @param domainName the domain to be created.
* @param fullyQualifiedHostNames the set of nameservers to be set on the domain.
* @throws EppException
*/
static void validateNameserversAllowedOnDomain(
InternetDomainName domainName, Set<String> fullyQualifiedHostNames) throws EppException {
ImmutableSet<ReservationType> reservationTypes = getReservationTypes(domainName);
if (reservationTypes.contains(NAMESERVER_RESTRICTED)) {
ImmutableSet<String> allowedNameservers = getAllowedNameservers(domainName);
Set<String> disallowedNameservers = difference(fullyQualifiedHostNames, allowedNameservers);
if (!disallowedNameservers.isEmpty()) {
throw new NameserversNotAllowedForDomainException(disallowedNameservers);
}
}
}
/** Validates if the requested domain can be reated on a domain create restricted TLD. */
static void validateDomainAllowedOnCreateRestrictedTld(InternetDomainName domainName)
throws EppException {
ImmutableSet<ReservationType> reservationTypes = getReservationTypes(domainName);
if (!reservationTypes.contains(NAMESERVER_RESTRICTED)) {
throw new DomainNotAllowedForTldWithCreateRestrictionException(domainName.toString());
}
}
static void verifyNotReserved(InternetDomainName domainName, boolean isSunrise)
throws EppException {
if (isReserved(domainName, isSunrise)) {
@ -915,7 +879,6 @@ public class DomainFlowUtils {
ImmutableSet<String> fullyQualifiedHostNames = command.getNameserverFullyQualifiedHostNames();
validateNameserversCountForTld(tld, domainName, fullyQualifiedHostNames.size());
validateNameserversAllowedOnTld(tld, fullyQualifiedHostNames);
validateNameserversAllowedOnDomain(domainName, fullyQualifiedHostNames);
}
/** Validate the secDNS extension, if present. */
@ -1330,21 +1293,6 @@ public class DomainFlowUtils {
}
}
/**
* Requested domain does not have nameserver-restricted reservation for a TLD that requires such a
* reservation to create domains.
*/
static class DomainNotAllowedForTldWithCreateRestrictionException
extends StatusProhibitsOperationException {
public DomainNotAllowedForTldWithCreateRestrictionException(String domainName) {
super(
String.format(
"%s is not allowed without a nameserver-restricted reservation"
+ " for a TLD that requires such reservation",
domainName));
}
}
/**
* The requested domain name is on the premium price list, and this registrar has blocked premium
* registrations.
@ -1437,17 +1385,6 @@ public class DomainFlowUtils {
}
}
/** Nameservers are not whitelisted for this domain. */
public static class NameserversNotAllowedForDomainException
extends StatusProhibitsOperationException {
public NameserversNotAllowedForDomainException(Set<String> fullyQualifiedHostNames) {
super(
String.format(
"Nameservers '%s' are not whitelisted for this domain",
Joiner.on(',').join(fullyQualifiedHostNames)));
}
}
/** Nameservers not specified for domain on TLD with nameserver whitelist. */
public static class NameserversNotSpecifiedForTldWithNameserverWhitelistException
extends StatusProhibitsOperationException {
@ -1460,18 +1397,6 @@ public class DomainFlowUtils {
}
}
/** Nameservers not specified for domain with nameserver-restricted reservation. */
public static class NameserversNotSpecifiedForNameserverRestrictedDomainException
extends StatusProhibitsOperationException {
public NameserversNotSpecifiedForNameserverRestrictedDomainException(String domain) {
super(
String.format(
"At least one nameserver must be specified for domain %s"
+ " on a TLD with nameserver restriction",
domain));
}
}
/** Command is not allowed in the current registry phase. */
public static class BadCommandForRegistryPhaseException extends CommandUseErrorException {
public BadCommandForRegistryPhaseException() {