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

Add Carriage Return in WHOIS disclaimer text

Browse source 
WHOIS disclaimer is read from the config yaml file directly and the line breaks
within the text does not contain carriage return, which ICANN requires. This
CL fixes the non-compliance.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=156359526
This commit is contained in:
jianglai 2017-05-17 15:05:58 -07:00 • committed by Ben McIlwain
parent 16f2799ad9
commit 3f5735ed4b
21 changed files with 60 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
java/google/registry/whois/WhoisResponseImpl.java
View file

@ -157,7 +157,7 @@ abstract class WhoisResponseImpl implements WhoisResponse {
/** Returns raw text that should be appended to the end of ALL WHOIS responses. */
E emitFooter(String disclaimer) {
stringBuilder.append(disclaimer).append("\r\n");
stringBuilder.append(disclaimer.replaceAll("\r?\n", "\r\n").trim()).append("\r\n");
return thisCastToDerived();
}

13
javatests/google/registry/whois/DomainWhoisResponseTest.java
View file

@ -254,7 +254,10 @@ public class DomainWhoisResponseTest {
public void getPlainTextOutputTest() {
DomainWhoisResponse domainWhoisResponse =
new DomainWhoisResponse(domainResource, clock.nowUtc());
assertThat(domainWhoisResponse.getResponse(false, "Doodle Disclaimer"))
assertThat(
domainWhoisResponse.getResponse(
false,
"Doodle Disclaimer\nI exist so that carriage return\nin disclaimer can be tested."))
.isEqualTo(WhoisResponseResults.create(loadWhoisTestFile("whois_domain.txt"), 1));
}
@ -263,7 +266,13 @@ public class DomainWhoisResponseTest {
DomainWhoisResponse domainWhoisResponse =
new DomainWhoisResponse(
domainResource.asBuilder().setStatusValues(null).build(), clock.nowUtc());
assertThat(domainWhoisResponse.getResponse(false, "Doodle Disclaimer").plainTextOutput())
assertThat(
domainWhoisResponse
.getResponse(
false,
"Doodle Disclaimer\nI exist so that carriage return\n"
+ "in disclaimer can be tested.")
.plainTextOutput())
.contains("Domain Status: ok");
}
}

10
javatests/google/registry/whois/NameserverWhoisResponseTest.java
View file

@ -76,7 +76,10 @@ public class NameserverWhoisResponseTest {
public void testGetTextOutput() {
NameserverWhoisResponse nameserverWhoisResponse =
new NameserverWhoisResponse(hostResource1, clock.nowUtc());
assertThat(nameserverWhoisResponse.getResponse(false, "Doodle Disclaimer"))
assertThat(
nameserverWhoisResponse.getResponse(
false,
"Doodle Disclaimer\nI exist so that carriage return\nin disclaimer can be tested."))
.isEqualTo(WhoisResponseResults.create(loadWhoisTestFile("whois_nameserver.txt"), 1));
}
@ -84,7 +87,10 @@ public class NameserverWhoisResponseTest {
public void testGetMultipleNameserversResponse() {
NameserverWhoisResponse nameserverWhoisResponse =
new NameserverWhoisResponse(ImmutableList.of(hostResource1, hostResource2), clock.nowUtc());
assertThat(nameserverWhoisResponse.getResponse(false, "Doodle Disclaimer"))
assertThat(
nameserverWhoisResponse.getResponse(
false,
"Doodle Disclaimer\nI exist so that carriage return\nin disclaimer can be tested."))
.isEqualTo(
WhoisResponseResults.create(loadWhoisTestFile("whois_multiple_nameservers.txt"), 2));
}

8
javatests/google/registry/whois/RegistrarWhoisResponseTest.java
View file

@ -115,7 +115,10 @@ public class RegistrarWhoisResponseTest {
RegistrarWhoisResponse registrarWhoisResponse =
new RegistrarWhoisResponse(registrar, clock.nowUtc());
assertThat(registrarWhoisResponse.getResponse(false, "Doodle Disclaimer"))
assertThat(
registrarWhoisResponse.getResponse(
false,
"Doodle Disclaimer\nI exist so that carriage return\nin disclaimer can be tested."))
.isEqualTo(WhoisResponseResults.create(loadWhoisTestFile("whois_registrar.txt"), 1));
}
@ -127,6 +130,7 @@ public class RegistrarWhoisResponseTest {
RegistrarWhoisResponse registrarWhoisResponse =
new RegistrarWhoisResponse(registrar, clock.nowUtc());
// Just make sure this doesn't NPE.
registrarWhoisResponse.getResponse(false, "Doodle Disclaimer");
registrarWhoisResponse.getResponse(
false, "Doodle Disclaimer\nI exist so that carriage return\nin disclaimer can be tested.");
}
}

3
javatests/google/registry/whois/WhoisHttpServerTest.java
View file

@ -80,7 +80,8 @@ public class WhoisHttpServerTest {
whoisServer.whoisReader = new WhoisReader(new WhoisCommandFactory());
whoisServer.whoisMetrics = new WhoisMetrics();
whoisServer.metricBuilder = WhoisMetric.builderForRequest(clock);
whoisServer.disclaimer = "Doodle Disclaimer";
whoisServer.disclaimer =
"Doodle Disclaimer\nI exist so that carriage return\nin disclaimer can be tested.";
return whoisServer;
}

3
javatests/google/registry/whois/WhoisServerTest.java
View file

@ -78,7 +78,8 @@ public class WhoisServerTest {
whoisServer.whoisReader = new WhoisReader(new WhoisCommandFactory());
whoisServer.whoisMetrics = new WhoisMetrics();
whoisServer.metricBuilder = WhoisMetric.builderForRequest(clock);
whoisServer.disclaimer = "Doodle Disclaimer";
whoisServer.disclaimer =
"Doodle Disclaimer\nI exist so that carriage return\nin disclaimer can be tested.";
whoisServer.retrier = new Retrier(new FakeSleeper(clock), 3);
return whoisServer;
}

2
javatests/google/registry/whois/testdata/whois_domain.txt vendored
View file

@ -63,3 +63,5 @@ URL of the ICANN Whois Inaccuracy Complaint Form: https://www.icann.org/wicf/
For more information on Whois status codes, please visit https://icann.org/epp
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_multiple_nameservers.txt vendored
View file

@ -14,3 +14,5 @@ Registrar URL: http://www.referral.example/path
>>> Last update of WHOIS database: 2009-05-29T20:15:00Z <<<
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_nameserver.txt vendored
View file

@ -7,3 +7,5 @@ Registrar URL: http://www.referral.example/path
>>> Last update of WHOIS database: 2009-05-29T20:15:00Z <<<
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_registrar.txt vendored
View file

@ -24,3 +24,5 @@ Email: johngeek@example-registrar.tld
>>> Last update of WHOIS database: 2009-05-29T20:15:00Z <<<
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_server_domain.txt vendored
View file

@ -61,3 +61,5 @@ URL of the ICANN Whois Inaccuracy Complaint Form: https://www.icann.org/wicf/
For more information on Whois status codes, please visit https://icann.org/epp
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_server_domain_not_found.txt vendored
View file

@ -2,3 +2,5 @@ Domain not found.
>>> Last update of WHOIS database: 2009-06-29T20:13:00Z <<<
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_server_idn_punycode.txt vendored
View file

@ -61,3 +61,5 @@ URL of the ICANN Whois Inaccuracy Complaint Form: https://www.icann.org/wicf/
For more information on Whois status codes, please visit https://icann.org/epp
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_server_idn_utf8.txt vendored
View file

@ -61,3 +61,5 @@ URL of the ICANN Whois Inaccuracy Complaint Form: https://www.icann.org/wicf/
For more information on Whois status codes, please visit https://icann.org/epp
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_server_ip_not_found.txt vendored
View file

@ -2,3 +2,5 @@ No nameservers found.
>>> Last update of WHOIS database: 2009-06-29T20:13:00Z <<<
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_server_malformed_path.txt vendored
View file

@ -2,3 +2,5 @@ Malformed path query.
>>> Last update of WHOIS database: 2009-06-29T20:13:00Z <<<
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_server_nameserver.txt vendored
View file

@ -6,3 +6,5 @@ Registrar URL: http://www.referral.example/path
>>> Last update of WHOIS database: 2009-06-29T20:13:00Z <<<
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_server_nameserver_not_found.txt vendored
View file

@ -2,3 +2,5 @@ Nameserver not found.
>>> Last update of WHOIS database: 2009-06-29T20:13:00Z <<<
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_server_no_command.txt vendored
View file

@ -2,3 +2,5 @@ No WHOIS command specified.
>>> Last update of WHOIS database: 2009-06-29T20:13:00Z <<<
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_server_registrar.txt vendored
View file

@ -20,3 +20,5 @@ Email: johndoe@example.com
>>> Last update of WHOIS database: 2009-06-29T20:13:00Z <<<
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.

2
javatests/google/registry/whois/testdata/whois_server_registrar_not_found.txt vendored
View file

@ -2,3 +2,5 @@ No registrar found.
>>> Last update of WHOIS database: 2009-06-29T20:13:00Z <<<
Doodle Disclaimer
I exist so that carriage return
in disclaimer can be tested.