diff --git a/java/google/registry/config/RegistryConfig.java b/java/google/registry/config/RegistryConfig.java index 802ae4fd2..f597ec730 100644 --- a/java/google/registry/config/RegistryConfig.java +++ b/java/google/registry/config/RegistryConfig.java @@ -1186,6 +1186,12 @@ public final class RegistryConfig { return config.registryTool.clientSecretFilename; } + @Provides + @Config("rdapTos") + public static ImmutableList provideRdapTos(RegistryConfigSettings config) { + return ImmutableList.copyOf(Splitter.on('\n').split(config.registryPolicy.rdapTos)); + } + /** * Returns the help text to be used by RDAP. * @@ -1195,7 +1201,8 @@ public final class RegistryConfig { @Singleton @Provides @Config("rdapHelpMap") - public static ImmutableMap provideRdapHelpMap() { + public static ImmutableMap provideRdapHelpMap( + @Config("rdapTos") ImmutableList rdapTos) { return new ImmutableMap.Builder() .put("/", RdapNoticeDescriptor.builder() .setTitle("RDAP Help") @@ -1216,33 +1223,7 @@ public final class RegistryConfig { .build()) .put("/tos", RdapNoticeDescriptor.builder() .setTitle("RDAP Terms of Service") - .setDescription(ImmutableList.of( - "By querying our Domain Database as part of the RDAP pilot program (RDAP Domain" - + "Database), you are agreeing to comply with these terms, so please read" - + " them carefully.", - "Any information provided is 'as is' without any guarantee of accuracy.", - "Please do not misuse the RDAP Domain Database. It is intended solely for" - + " query-based access on an experimental basis and should not be used for or" - + " relied upon for any other purpose.", - "Don't use the RDAP Domain Database to allow, enable, or otherwise support the" - + " transmission of mass unsolicited, commercial advertising or" - + " solicitations.", - "Don't access our RDAP Domain Database through the use of high volume, automated" - + " electronic processes that send queries or data to the systems of any" - + " ICANN-accredited registrar.", - "You may only use the information contained in the RDAP Domain Database for" - + " lawful purposes.", - "Do not compile, repackage, disseminate, or otherwise use the information" - + " contained in the RDAP Domain Database in its entirety, or in any" - + " substantial portion, without our prior written permission.", - "We may retain certain details about queries to our RDAP Domain Database for the" - + " purposes of detecting and preventing misuse.", - "We reserve the right to restrict or deny your access to the RDAP Domain Database" - + " if we suspect that you have failed to comply with these terms.", - "We reserve the right to modify or discontinue our participation in the RDAP" - + " pilot program and suspend or terminate access to the RDAP Domain Database" - + " at any time and for any reason in our sole discretion.", - "We reserve the right to modify this agreement at any time.")) + .setDescription(rdapTos) .setLinkValueSuffix("help/tos") .build()) .build(); diff --git a/java/google/registry/config/RegistryConfigSettings.java b/java/google/registry/config/RegistryConfigSettings.java index 0aeabba1d..eb6ce6f66 100644 --- a/java/google/registry/config/RegistryConfigSettings.java +++ b/java/google/registry/config/RegistryConfigSettings.java @@ -90,6 +90,7 @@ public class RegistryConfigSettings { public String premiumTermsExportDisclaimer; public String reservedTermsExportDisclaimer; public String whoisDisclaimer; + public String rdapTos; } /** Configuration for Cloud Datastore. */ diff --git a/java/google/registry/config/files/default-config.yaml b/java/google/registry/config/files/default-config.yaml index de850501e..8c51b0cfc 100644 --- a/java/google/registry/config/files/default-config.yaml +++ b/java/google/registry/config/files/default-config.yaml @@ -103,6 +103,45 @@ registryPolicy: unlawful behavior. We reserve the right to restrict or deny your access to the WHOIS database, and may modify these terms at any time. + # 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 + Domain Database), you are agreeing to comply with these terms, so please + read them carefully. + + Any information provided is 'as is' without any guarantee of accuracy. + + Please do not misuse the RDAP Domain Database. It is intended solely for + query-based access on an experimental basis and should not be used for or + relied upon for any other purpose. + + Don't use the RDAP Domain Database to allow, enable, or otherwise support + the transmission of mass unsolicited, commercial advertising or + solicitations. + + Don't access our RDAP Domain Database through the use of high volume, + automated electronic processes that send queries or data to the systems + of any ICANN-accredited registrar. + + You may only use the information contained in the RDAP Domain Database for + lawful purposes. + + Do not compile, repackage, disseminate, or otherwise use the information + contained in the RDAP Domain Database in its entirety, or in any + substantial portion, without our prior written permission. + + We may retain certain details about queries to our RDAP Domain Database + for the purposes of detecting and preventing misuse. + + We reserve the right to restrict or deny your access to the RDAP Domain + Database if we suspect that you have failed to comply with these terms. + + We reserve the right to modify or discontinue our participation in the + RDAP pilot program and suspend or terminate access to the RDAP Domain + Database at any time and for any reason in our sole discretion. + + We reserve the right to modify this agreement at any time. + datastore: # Number of commit log buckets in Datastore. Lowering this after initial # install risks losing up to a days' worth of differential backups.