Remove WHOIS classes and configuration (#2859)

This is steps one and two of b/454947209

We already haven't been serving WHOIS for a while, so there's no point
in keeping the old code around. This can simplify some code paths in the
future (like, certain foreign-key-loads that are only used in WHOIS
queries).

Author: gbrodman

core/build.gradle

@@ -55,9 +55,6 @@ def dockerIncompatibleTestPatterns = [
 // objects retained by frameworks.
 // TODO(weiminyu): identify cause and fix offending tests.
 def fragileTestPatterns = [
-    // Changes cache timeouts and for some reason appears to have contention
-    // with other tests.
-    "google/registry/whois/WhoisCommandFactoryTest.*",
     // Breaks random other tests when running with standardTests.
     "google/registry/bsa/UploadBsaUnavailableDomainsActionTest.*",
     // Currently changes a global configuration parameter that for some reason

core/src/main/java/google/registry/config/RegistryConfig.java

@@ -976,17 +976,6 @@ public static int provideTransientFailureRetries(RegistryConfigSettings config)
       return config.misc.transientFailureRetries;
     }
 
-    /**
-     * Amount of time public HTTP proxies are permitted to cache our WHOIS responses.
-     *
-     * @see google.registry.whois.WhoisHttpAction
-     */
-    @Provides
-    @Config("whoisHttpExpires")
-    public static Duration provideWhoisHttpExpires() {
-      return Duration.standardDays(1);
-    }
-
     /**
      * Maximum number of results to return for an RDAP search query
      *
@@ -998,39 +987,6 @@ public static int provideRdapResultSetMaxSize() {
       return 100;
     }
 
-    /**
-     * Redaction text for email address in WHOIS
-     *
-     * @see google.registry.whois.WhoisResponse
-     */
-    @Provides
-    @Config("whoisRedactedEmailText")
-    public static String provideWhoisRedactedEmailText(RegistryConfigSettings config) {
-      return config.registryPolicy.whoisRedactedEmailText;
-    }
-
-    /**
-     * Disclaimer displayed at the end of WHOIS query results.
-     *
-     * @see google.registry.whois.WhoisResponse
-     */
-    @Provides
-    @Config("whoisDisclaimer")
-    public static String provideWhoisDisclaimer(RegistryConfigSettings config) {
-      return config.registryPolicy.whoisDisclaimer;
-    }
-
-    /**
-     * Message template for whois response when queried domain is blocked by BSA.
-     *
-     * @see google.registry.whois.WhoisResponse
-     */
-    @Provides
-    @Config("domainBlockedByBsaTemplate")
-    public static String provideDomainBlockedByBsaTemplate(RegistryConfigSettings config) {
-      return config.registryPolicy.domainBlockedByBsaTemplate;
-    }
-
     /**
      * Maximum QPS for the Google Cloud Monitoring V3 (aka Stackdriver) API. The QPS limit can be
      * adjusted by contacting Cloud Support.
@@ -1105,12 +1061,6 @@ public static String provideCustomLogicFactoryClass(RegistryConfigSettings confi
       return config.registryPolicy.customLogicFactoryClass;
     }
 
-    @Provides
-    @Config("whoisCommandFactoryClass")
-    public static String provideWhoisCommandFactoryClass(RegistryConfigSettings config) {
-      return config.registryPolicy.whoisCommandFactoryClass;
-    }
-
     @Provides
     @Config("dnsCountQueryCoordinatorClass")
     public static String dnsCountQueryCoordinatorClass(RegistryConfigSettings config) {

core/src/main/java/google/registry/config/RegistryConfigSettings.java

@@ -90,7 +90,6 @@ public static class RegistryPolicy {
     public String contactAndHostRoidSuffix;
     public String productName;
     public String customLogicFactoryClass;
-    public String whoisCommandFactoryClass;
     public String dnsCountQueryCoordinatorClass;
     public int contactAutomaticTransferDays;
     public String greetingServerId;
@@ -102,9 +101,6 @@ public static class RegistryPolicy {
     public String registryAdminClientId;
     public String premiumTermsExportDisclaimer;
     public String reservedTermsExportDisclaimer;
-    public String whoisRedactedEmailText;
-    public String whoisDisclaimer;
-    public String domainBlockedByBsaTemplate;
     public String rdapTos;
     public String rdapTosStaticUrl;
     public String registryName;

core/src/main/java/google/registry/config/files/default-config.yaml

@@ -65,10 +65,6 @@ registryPolicy:
   # See flows/custom/CustomLogicFactory.java
   customLogicFactoryClass: google.registry.flows.custom.CustomLogicFactory
 
-  # WHOIS command factory fully-qualified class name.
-  # See whois/WhoisCommandFactory.java
-  whoisCommandFactoryClass: google.registry.whois.WhoisCommandFactory
-
   # Custom logic class for handling DNS query count reporting for ICANN.
   # See reporting/icann/DnsCountQueryCoordinator.java
   dnsCountQueryCoordinatorClass: google.registry.reporting.icann.DummyDnsCountQueryCoordinator
@@ -114,31 +110,6 @@ registryPolicy:
     to publish. This list is subject to change. The most up-to-date source
     is always the registry itself, by sending domain check EPP commands.
 
-  # Redaction text for email address in WHOIS
-  whoisRedactedEmailText: |
-    Please query the WHOIS server of the owning registrar identified in this
-    output for information on how to contact the Registrant, Admin, or Tech
-    contact of the queried domain name.
-
-  # Disclaimer at the top of WHOIS results.
-  whoisDisclaimer: |
-    WHOIS information is provided by the registry solely for query-based,
-    informational purposes. Any information provided is "as is" without any
-    guarantee of accuracy. You may not use such information to (a) allow,
-    enable, or otherwise support the transmission of mass unsolicited,
-    commercial advertising or solicitations; (b) enable high volume, automated,
-    electronic processes that access the registry's systems or any
-    ICANN-Accredited Registrar, except as reasonably necessary to register
-    domain names or modify existing registrations; or (c) engage in or support
-    unlawful behavior. We reserve the right to restrict or deny your access to
-    the WHOIS database, and may modify these terms at any time.
-
-  # BSA blocked domain name template.
-  domainBlockedByBsaTemplate: |
-    Domain Name: %s
-    >>> This name is not available for registration.
-    >>> This name has been blocked by a GlobalBlock service.
-
   # RDAP Terms of Service text displayed at the /rdap/help/tos endpoint.
   rdapTos: >
     By querying our Domain Database as part of the RDAP pilot program (RDAP

core/src/main/java/google/registry/env/common/pubapi/WEB-INF/web.xml

@@ -57,11 +57,6 @@
       <!-- Verbatim JavaScript sources (only visible to admins for debugging). -->
       <url-pattern>/assets/sources/*</url-pattern>
 
-      <!-- TODO(b/26776367): Move these files to /assets/sources. -->
-      <url-pattern>/assets/js/registrar_bin.js.map</url-pattern>
-      <url-pattern>/assets/js/registrar_dbg.js</url-pattern>
-      <url-pattern>/assets/css/registrar_dbg.css</url-pattern>
-
     </web-resource-collection>
     <auth-constraint>
       <role-name>admin</role-name>

core/src/main/java/google/registry/model/EppResourceUtils.java

@@ -130,7 +130,7 @@ public static <T extends EppResource> Optional<T> loadByForeignKey(
    * past.
    *
    * <p>Do not call this cached version for anything that needs transactional consistency. It should
-   * only be used when it's OK if the data is potentially being out of date, e.g. WHOIS.
+   * only be used when it's OK if the data is potentially being out of date, e.g. RDAP.
    *
    * @param clazz the resource type to load
    * @param foreignKey id to match
@@ -181,7 +181,7 @@ private static <T extends EppResource> Optional<T> loadByForeignKeyHelper(
       return Optional.empty();
     }
     // When setting status values based on a time, choose the greater of "now" and the resource's
-    // UpdateAutoTimestamp. For non-mutating uses (info, whois, etc.), this is equivalent to rolling
+    // UpdateAutoTimestamp. For non-mutating uses (info, RDAP, etc.), this is equivalent to rolling
     // "now" forward to at least the last update on the resource, so that a read right after a write
     // doesn't appear stale. For mutating flows, if we had to roll now forward then the flow will
     // fail when it tries to save anything, since "now" is needed to be > the last update time for

core/src/main/java/google/registry/model/registrar/Registrar.java

@@ -492,7 +492,7 @@ public boolean isLive() {
     return LIVE_STATES.contains(state);
   }
 
-  /** Returns {@code true} if registrar should be visible in WHOIS results. */
+  /** Returns {@code true} if registrar should be visible in RDAP results. */
   public boolean isLiveAndPubliclyVisible() {
     return LIVE_STATES.contains(state) && PUBLICLY_VISIBLE_TYPES.contains(type);
   }

core/src/main/java/google/registry/module/RequestComponent.java

@@ -131,9 +131,6 @@
 import google.registry.ui.server.console.settings.ContactAction;
 import google.registry.ui.server.console.settings.RdapRegistrarFieldsAction;
 import google.registry.ui.server.console.settings.SecurityAction;
-import google.registry.whois.WhoisAction;
-import google.registry.whois.WhoisHttpAction;
-import google.registry.whois.WhoisModule;
 
 /** Dagger component with per-request lifetime. */
 @RequestScope
@@ -161,8 +158,7 @@
       Spec11Module.class,
       TmchModule.class,
       ToolsServerModule.class,
-      WhiteboxModule.class,
-      WhoisModule.class,
+      WhiteboxModule.class
     })
 interface RequestComponent {
   FlowComponent.Builder flowComponentBuilder();
@@ -343,10 +339,6 @@ interface RequestComponent {
 
   VerifyOteAction verifyOteAction();
 
-  WhoisAction whoisAction();
-
-  WhoisHttpAction whoisHttpAction();
-  
   WipeOutContactHistoryPiiAction wipeOutContactHistoryPiiAction();
 
   @Subcomponent.Builder

core/src/main/java/google/registry/module/pubapi/PubApiRequestComponent.java

@@ -36,9 +36,6 @@
 import google.registry.request.RequestComponentBuilder;
 import google.registry.request.RequestModule;
 import google.registry.request.RequestScope;
-import google.registry.whois.WhoisAction;
-import google.registry.whois.WhoisHttpAction;
-import google.registry.whois.WhoisModule;
 
 /** Dagger component with per-request lifetime for "pubapi" App Engine module. */
 @RequestScope
@@ -49,8 +46,7 @@
       EppTlsModule.class,
       RdapModule.class,
       RequestModule.class,
-      WhiteboxModule.class,
-      WhoisModule.class,
+      WhiteboxModule.class
     })
 public interface PubApiRequestComponent {
   CheckApiAction checkApiAction();
@@ -67,9 +63,6 @@ public interface PubApiRequestComponent {
 
   ReadinessProbeActionPubApi readinessProbeActionPubApi();
 
-  WhoisHttpAction whoisHttpAction();
-  WhoisAction whoisAction();
-
   @Subcomponent.Builder
   abstract class Builder implements RequestComponentBuilder<PubApiRequestComponent> {
     @Override public abstract Builder requestModule(RequestModule requestModule);

core/src/main/java/google/registry/request/RequestMetrics.java

@@ -67,15 +67,13 @@ public void record(
   private static String truncatePath(String path) {
     // We want to bucket RDAP requests by type to use less metric space,
     // e.g. "/rdap/domains" rather than "/rdap/domains/foo.tld"
-
     if (path.startsWith("/rdap")) {
       List<String> splitPath = Splitter.on("/").omitEmptyStrings().splitToList(path);
       return Streams.stream(Iterables.limit(splitPath, 2))
           .collect(Collectors.joining("/", "/", "/"));
-      // Similarly, we put all web WHOIS requests under the same path because otherwise its
-      // cardinality is unbound, and it is possible to generate a huge amount of metrics with all
-      // the different paths.
     } else if (path.startsWith("/whois")) {
+      // Though we don't serve WHOIS requests anymore, bucket any non-served WHOIS requests together
+      // to avoid an unbound cardinality
       return "/whois";
     }
     return path;