From 09202562c723fee1e63a14d0f91f358e720fa363 Mon Sep 17 00:00:00 2001
From: mountford <mountford@google.com>
Date: Tue, 30 Oct 2018 11:17:40 -0700
Subject: [PATCH] RDAP: Add link to static TOS page

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219332975
---
 .../registry/config/RegistryConfig.java       | 66 ++++++++++++-------
 .../config/RegistryConfigSettings.java        |  1 +
 .../registry/config/files/default-config.yaml |  4 ++
 3 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/java/google/registry/config/RegistryConfig.java b/java/google/registry/config/RegistryConfig.java
index 65f9883d5..813946e75 100644
--- a/java/google/registry/config/RegistryConfig.java
+++ b/java/google/registry/config/RegistryConfig.java
@@ -1225,6 +1225,18 @@ public final class RegistryConfig {
       return ImmutableList.copyOf(Splitter.on('\n').split(config.registryPolicy.rdapTos));
     }
 
+    /**
+     * Link to static Web page with RDAP terms of service. Displayed in RDAP responses.
+     *
+     * @see google.registry.rdap.RdapJsonFormatter
+     */
+    @Provides
+    @Config("rdapTosStaticUrl")
+    @Nullable
+    public static String provideRdapTosStaticUrl(RegistryConfigSettings config) {
+      return config.registryPolicy.rdapTosStaticUrl;
+    }
+
     /**
      * Returns the help text to be used by RDAP.
      *
@@ -1235,30 +1247,38 @@ public final class RegistryConfig {
     @Provides
     @Config("rdapHelpMap")
     public static ImmutableMap<String, RdapNoticeDescriptor> provideRdapHelpMap(
-        @Config("rdapTos") ImmutableList<String> rdapTos) {
+        @Config("rdapTos") ImmutableList<String> rdapTos,
+        @Config("rdapTosStaticUrl") @Nullable String rdapTosStaticUrl) {
       return new ImmutableMap.Builder<String, RdapNoticeDescriptor>()
-          .put("/", RdapNoticeDescriptor.builder()
-              .setTitle("RDAP Help")
-              .setDescription(ImmutableList.of(
-                  "domain/XXXX",
-                  "nameserver/XXXX",
-                  "entity/XXXX",
-                  "domains?name=XXXX",
-                  "domains?nsLdhName=XXXX",
-                  "domains?nsIp=XXXX",
-                  "nameservers?name=XXXX",
-                  "nameservers?ip=XXXX",
-                  "entities?fn=XXXX",
-                  "entities?handle=XXXX",
-                  "help/XXXX"))
-              .setLinkValueSuffix("help/")
-              .setLinkHrefUrlString("https://github.com/google/nomulus/blob/master/docs/rdap.md")
-              .build())
-          .put("/tos", RdapNoticeDescriptor.builder()
-              .setTitle("RDAP Terms of Service")
-              .setDescription(rdapTos)
-              .setLinkValueSuffix("help/tos")
-              .build())
+          .put(
+              "/",
+              RdapNoticeDescriptor.builder()
+                  .setTitle("RDAP Help")
+                  .setDescription(
+                      ImmutableList.of(
+                          "domain/XXXX",
+                          "nameserver/XXXX",
+                          "entity/XXXX",
+                          "domains?name=XXXX",
+                          "domains?nsLdhName=XXXX",
+                          "domains?nsIp=XXXX",
+                          "nameservers?name=XXXX",
+                          "nameservers?ip=XXXX",
+                          "entities?fn=XXXX",
+                          "entities?handle=XXXX",
+                          "help/XXXX"))
+                  .setLinkValueSuffix("help/")
+                  .setLinkHrefUrlString(
+                      "https://github.com/google/nomulus/blob/master/docs/rdap.md")
+                  .build())
+          .put(
+              "/tos",
+              RdapNoticeDescriptor.builder()
+                  .setTitle("RDAP Terms of Service")
+                  .setDescription(rdapTos)
+                  .setLinkValueSuffix("help/tos")
+                  .setLinkHrefUrlString(rdapTosStaticUrl)
+                  .build())
           .build();
     }
 
diff --git a/java/google/registry/config/RegistryConfigSettings.java b/java/google/registry/config/RegistryConfigSettings.java
index 58561f0fa..2449c1c58 100644
--- a/java/google/registry/config/RegistryConfigSettings.java
+++ b/java/google/registry/config/RegistryConfigSettings.java
@@ -88,6 +88,7 @@ public class RegistryConfigSettings {
     public String reservedTermsExportDisclaimer;
     public String whoisDisclaimer;
     public String rdapTos;
+    public String rdapTosStaticUrl;
     public String spec11EmailBodyTemplate;
   }
 
diff --git a/java/google/registry/config/files/default-config.yaml b/java/google/registry/config/files/default-config.yaml
index 9c4a37628..85fe99625 100644
--- a/java/google/registry/config/files/default-config.yaml
+++ b/java/google/registry/config/files/default-config.yaml
@@ -145,6 +145,10 @@ registryPolicy:
 
     We reserve the right to modify this agreement at any time.
 
+  # Link to static Web page with RDAP terms of service. Displayed in RDAP
+  # responses. If null, no static Web page link is generated.
+  rdapTosStaticUrl: null
+
   # Body of the spec 11 email sent to registrars.
   # Items in braces are to be replaced.
   spec11EmailBodyTemplate: |