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

Don't allow non-active registrars to create domains or applications

Browse source 
Specifically, this prevents suspended registrars from creating domains or applications. Pending registrars already can't perform these actions because they get an error message when attempting to log in.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170481338
This commit is contained in:
mcilwain 2017-09-29 07:42:40 -07:00 • committed by Ben McIlwain
parent d09bd89629
commit 1c4e79f99e
14 changed files with 89 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

25
java/google/registry/model/registrar/Registrar.java
View file

@ -145,10 +145,8 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
/** Represents the state of a persisted registrar entity. */
public enum State {
/**
* This registrar is provisioned and may have access to the testing environment, but is not yet
* allowed to access the production environment.
*/
/** This registrar is provisioned but not yet active, and cannot log in. */
PENDING,
/** This is an active registrar account which is allowed to provision and modify domains. */
@ -177,8 +175,8 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
/** Regex for telephone support passcode (5 digit string). */
public static final Pattern PHONE_PASSCODE_PATTERN = Pattern.compile("\\d{5}");
/** The states in which a {@link Registrar} is considered {@link #isActive active}. */
private static final ImmutableSet<State> ACTIVE_STATES =
/** The states in which a {@link Registrar} is considered {@link #isLive live}. */
private static final ImmutableSet<State> LIVE_STATES =
Sets.immutableEnumSet(State.ACTIVE, State.SUSPENDED);
/**
@ -486,14 +484,19 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
return nullToEmptyImmutableSortedCopy(allowedTlds);
}
/** Returns {@code true} if registrar is active. */
public boolean isActive() {
return ACTIVE_STATES.contains(state);
/**
* Returns {@code true} if the registrar is live.
*
* <p>A live registrar is one that can have live domains/contacts/hosts in the registry, meaning
* that it is either currently active or used to be active (i.e. suspended).
*/
public boolean isLive() {
return LIVE_STATES.contains(state);
}
/** Returns {@code true} if registrar should be visible in WHOIS results. */
public boolean isActiveAndPubliclyVisible() {
return ACTIVE_STATES.contains(state) && PUBLICLY_VISIBLE_TYPES.contains(type);
public boolean isLiveAndPubliclyVisible() {
return LIVE_STATES.contains(state) && PUBLICLY_VISIBLE_TYPES.contains(type);
}
public String getClientCertificate() {