mirror of
https://github.com/google/nomulus.git
synced 2025-05-30 01:10:14 +02:00
Change redacted output for domain whois query
The redacted text for the email field displays a longer prompt to contact the registrar, per the request filed at b/123573370. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=232716133
This commit is contained in:
parent
6a6c7e3b09
commit
7fe16689d8
18 changed files with 81 additions and 38 deletions
|
@ -256,7 +256,7 @@ public class DomainWhoisResponseTest {
|
|||
@Test
|
||||
public void getPlainTextOutputTest() {
|
||||
DomainWhoisResponse domainWhoisResponse =
|
||||
new DomainWhoisResponse(domainBase, false, clock.nowUtc());
|
||||
new DomainWhoisResponse(domainBase, false, "Please contact registrar", clock.nowUtc());
|
||||
assertThat(
|
||||
domainWhoisResponse.getResponse(
|
||||
false,
|
||||
|
@ -268,8 +268,9 @@ public class DomainWhoisResponseTest {
|
|||
public void getPlainTextOutputTest_registrarAbuseInfoMissing() {
|
||||
persistResource(abuseContact.asBuilder().setVisibleInDomainWhoisAsAbuse(false).build());
|
||||
DomainWhoisResponse domainWhoisResponse =
|
||||
new DomainWhoisResponse(domainBase, false, clock.nowUtc());
|
||||
assertThat(domainWhoisResponse.getResponse(false, "Footer"))
|
||||
new DomainWhoisResponse(domainBase, false, "Please contact registrar", clock.nowUtc());
|
||||
assertThat(
|
||||
domainWhoisResponse.getResponse(false, "Footer"))
|
||||
.isEqualTo(
|
||||
WhoisResponseResults.create(
|
||||
loadFile("whois_domain_registrar_abuse_info_missing.txt"), 1));
|
||||
|
@ -278,7 +279,7 @@ public class DomainWhoisResponseTest {
|
|||
@Test
|
||||
public void getPlainTextOutputTest_fullOutput() {
|
||||
DomainWhoisResponse domainWhoisResponse =
|
||||
new DomainWhoisResponse(domainBase, true, clock.nowUtc());
|
||||
new DomainWhoisResponse(domainBase, true, "Please contact registrar", clock.nowUtc());
|
||||
assertThat(
|
||||
domainWhoisResponse.getResponse(
|
||||
false,
|
||||
|
@ -290,7 +291,10 @@ public class DomainWhoisResponseTest {
|
|||
public void addImplicitOkStatusTest() {
|
||||
DomainWhoisResponse domainWhoisResponse =
|
||||
new DomainWhoisResponse(
|
||||
domainBase.asBuilder().setStatusValues(null).build(), false, clock.nowUtc());
|
||||
domainBase.asBuilder().setStatusValues(null).build(),
|
||||
false,
|
||||
"Contact the registrar",
|
||||
clock.nowUtc());
|
||||
assertThat(
|
||||
domainWhoisResponse
|
||||
.getResponse(
|
||||
|
|
|
@ -131,6 +131,7 @@ public class RegistrarWhoisResponseTest {
|
|||
new RegistrarWhoisResponse(registrar, clock.nowUtc());
|
||||
// Just make sure this doesn't NPE.
|
||||
registrarWhoisResponse.getResponse(
|
||||
false, "Doodle Disclaimer\nI exist so that carriage return\nin disclaimer can be tested.");
|
||||
false,
|
||||
"Doodle Disclaimer\nI exist so that carriage return\nin disclaimer can be tested.");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -95,7 +95,8 @@ public class WhoisActionTest {
|
|||
whoisAction.clock = clock;
|
||||
whoisAction.input = new StringReader(input);
|
||||
whoisAction.response = response;
|
||||
whoisAction.whoisReader = new WhoisReader(new WhoisCommandFactory());
|
||||
whoisAction.whoisReader =
|
||||
new WhoisReader(new WhoisCommandFactory(), "Please contact registrar");
|
||||
whoisAction.whoisMetrics = new WhoisMetrics();
|
||||
whoisAction.metricBuilder = WhoisMetric.builderForRequest(clock);
|
||||
whoisAction.disclaimer =
|
||||
|
|
|
@ -77,7 +77,8 @@ public class WhoisHttpActionTest {
|
|||
whoisAction.expires = Duration.standardHours(1);
|
||||
whoisAction.requestPath = WhoisHttpAction.PATH + pathInfo;
|
||||
whoisAction.response = response;
|
||||
whoisAction.whoisReader = new WhoisReader(new WhoisCommandFactory());
|
||||
whoisAction.whoisReader =
|
||||
new WhoisReader(new WhoisCommandFactory(), "Please contact registrar");
|
||||
whoisAction.whoisMetrics = new WhoisMetrics();
|
||||
whoisAction.metricBuilder = WhoisMetric.builderForRequest(clock);
|
||||
whoisAction.disclaimer =
|
||||
|
|
|
@ -48,7 +48,7 @@ public class WhoisReaderTest {
|
|||
@SuppressWarnings({"TypeParameterUnusedInFormals", "unchecked"})
|
||||
<T> T readCommand(String commandStr) throws Exception {
|
||||
return (T)
|
||||
new WhoisReader(new WhoisCommandFactory())
|
||||
new WhoisReader(new WhoisCommandFactory(), "Please contact registrar")
|
||||
.readCommand(new StringReader(commandStr), false, clock.nowUtc());
|
||||
}
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ Registrant Postal Code: REDACTED FOR PRIVACY
|
|||
Registrant Country: US
|
||||
Registrant Phone: REDACTED FOR PRIVACY
|
||||
Registrant Fax: REDACTED FOR PRIVACY
|
||||
Registrant Email: REDACTED FOR PRIVACY
|
||||
Registrant Email: Please contact registrar
|
||||
Registry Admin ID: REDACTED FOR PRIVACY
|
||||
Admin Name: REDACTED FOR PRIVACY
|
||||
Admin Organization: REDACTED FOR PRIVACY
|
||||
|
@ -34,7 +34,7 @@ Admin Postal Code: REDACTED FOR PRIVACY
|
|||
Admin Country: REDACTED FOR PRIVACY
|
||||
Admin Phone: REDACTED FOR PRIVACY
|
||||
Admin Fax: REDACTED FOR PRIVACY
|
||||
Admin Email: REDACTED FOR PRIVACY
|
||||
Admin Email: Please contact registrar
|
||||
Registry Tech ID: REDACTED FOR PRIVACY
|
||||
Tech Name: REDACTED FOR PRIVACY
|
||||
Tech Organization: REDACTED FOR PRIVACY
|
||||
|
@ -45,7 +45,7 @@ Tech Postal Code: REDACTED FOR PRIVACY
|
|||
Tech Country: REDACTED FOR PRIVACY
|
||||
Tech Phone: REDACTED FOR PRIVACY
|
||||
Tech Fax: REDACTED FOR PRIVACY
|
||||
Tech Email: REDACTED FOR PRIVACY
|
||||
Tech Email: Please contact registrar
|
||||
Name Server: ns1.cat.lol
|
||||
Name Server: ns2.cat.lol
|
||||
DNSSEC: signedDelegation
|
||||
|
|
|
@ -23,7 +23,7 @@ Registrant Postal Code: REDACTED FOR PRIVACY
|
|||
Registrant Country: US
|
||||
Registrant Phone: REDACTED FOR PRIVACY
|
||||
Registrant Fax: REDACTED FOR PRIVACY
|
||||
Registrant Email: REDACTED FOR PRIVACY
|
||||
Registrant Email: Please contact registrar
|
||||
Registry Admin ID: REDACTED FOR PRIVACY
|
||||
Admin Name: REDACTED FOR PRIVACY
|
||||
Admin Organization: REDACTED FOR PRIVACY
|
||||
|
@ -34,7 +34,7 @@ Admin Postal Code: REDACTED FOR PRIVACY
|
|||
Admin Country: REDACTED FOR PRIVACY
|
||||
Admin Phone: REDACTED FOR PRIVACY
|
||||
Admin Fax: REDACTED FOR PRIVACY
|
||||
Admin Email: REDACTED FOR PRIVACY
|
||||
Admin Email: Please contact registrar
|
||||
Registry Tech ID: REDACTED FOR PRIVACY
|
||||
Tech Name: REDACTED FOR PRIVACY
|
||||
Tech Organization: REDACTED FOR PRIVACY
|
||||
|
@ -45,7 +45,7 @@ Tech Postal Code: REDACTED FOR PRIVACY
|
|||
Tech Country: REDACTED FOR PRIVACY
|
||||
Tech Phone: REDACTED FOR PRIVACY
|
||||
Tech Fax: REDACTED FOR PRIVACY
|
||||
Tech Email: REDACTED FOR PRIVACY
|
||||
Tech Email: Please contact registrar
|
||||
Name Server: ns1.cat.xn--q9jyb4c
|
||||
Name Server: ns2.cat.xn--q9jyb4c
|
||||
DNSSEC: signedDelegation
|
||||
|
|
|
@ -23,7 +23,7 @@ Registrant Postal Code: REDACTED FOR PRIVACY
|
|||
Registrant Country: US
|
||||
Registrant Phone: REDACTED FOR PRIVACY
|
||||
Registrant Fax: REDACTED FOR PRIVACY
|
||||
Registrant Email: REDACTED FOR PRIVACY
|
||||
Registrant Email: Please contact registrar
|
||||
Registry Admin ID: REDACTED FOR PRIVACY
|
||||
Admin Name: REDACTED FOR PRIVACY
|
||||
Admin Organization: REDACTED FOR PRIVACY
|
||||
|
@ -34,7 +34,7 @@ Admin Postal Code: REDACTED FOR PRIVACY
|
|||
Admin Country: REDACTED FOR PRIVACY
|
||||
Admin Phone: REDACTED FOR PRIVACY
|
||||
Admin Fax: REDACTED FOR PRIVACY
|
||||
Admin Email: REDACTED FOR PRIVACY
|
||||
Admin Email: Please contact registrar
|
||||
Registry Tech ID: REDACTED FOR PRIVACY
|
||||
Tech Name: REDACTED FOR PRIVACY
|
||||
Tech Organization: REDACTED FOR PRIVACY
|
||||
|
@ -45,7 +45,7 @@ Tech Postal Code: REDACTED FOR PRIVACY
|
|||
Tech Country: REDACTED FOR PRIVACY
|
||||
Tech Phone: REDACTED FOR PRIVACY
|
||||
Tech Fax: REDACTED FOR PRIVACY
|
||||
Tech Email: REDACTED FOR PRIVACY
|
||||
Tech Email: Please contact registrar
|
||||
Name Server: ns1.cat.みんな
|
||||
Name Server: ns2.cat.みんな
|
||||
DNSSEC: signedDelegation
|
||||
|
|
|
@ -23,7 +23,7 @@ Registrant Postal Code: REDACTED FOR PRIVACY
|
|||
Registrant Country: US
|
||||
Registrant Phone: REDACTED FOR PRIVACY
|
||||
Registrant Fax: REDACTED FOR PRIVACY
|
||||
Registrant Email: REDACTED FOR PRIVACY
|
||||
Registrant Email: Please contact registrar
|
||||
Registry Admin ID: REDACTED FOR PRIVACY
|
||||
Admin Name: REDACTED FOR PRIVACY
|
||||
Admin Organization: REDACTED FOR PRIVACY
|
||||
|
@ -34,7 +34,7 @@ Admin Postal Code: REDACTED FOR PRIVACY
|
|||
Admin Country: REDACTED FOR PRIVACY
|
||||
Admin Phone: REDACTED FOR PRIVACY
|
||||
Admin Fax: REDACTED FOR PRIVACY
|
||||
Admin Email: REDACTED FOR PRIVACY
|
||||
Admin Email: Please contact registrar
|
||||
Registry Tech ID: REDACTED FOR PRIVACY
|
||||
Tech Name: REDACTED FOR PRIVACY
|
||||
Tech Organization: REDACTED FOR PRIVACY
|
||||
|
@ -45,7 +45,7 @@ Tech Postal Code: REDACTED FOR PRIVACY
|
|||
Tech Country: REDACTED FOR PRIVACY
|
||||
Tech Phone: REDACTED FOR PRIVACY
|
||||
Tech Fax: REDACTED FOR PRIVACY
|
||||
Tech Email: REDACTED FOR PRIVACY
|
||||
Tech Email: Please contact registrar
|
||||
Name Server: ns1.cat.lol
|
||||
Name Server: ns2.cat.lol
|
||||
DNSSEC: signedDelegation
|
||||
|
|
|
@ -27,7 +27,7 @@ Registrant Phone: REDACTED FOR PRIVACY
|
|||
Registrant Phone Ext: REDACTED FOR PRIVACY
|
||||
Registrant Fax: REDACTED FOR PRIVACY
|
||||
Registrant Fax Ext: REDACTED FOR PRIVACY
|
||||
Registrant Email: REDACTED FOR PRIVACY
|
||||
Registrant Email: Please contact registrar
|
||||
Registry Admin ID: REDACTED FOR PRIVACY
|
||||
Admin Name: REDACTED FOR PRIVACY
|
||||
Admin Organization: REDACTED FOR PRIVACY
|
||||
|
@ -39,7 +39,7 @@ Admin Country: REDACTED FOR PRIVACY
|
|||
Admin Phone: REDACTED FOR PRIVACY
|
||||
Admin Phone Ext: REDACTED FOR PRIVACY
|
||||
Admin Fax: REDACTED FOR PRIVACY
|
||||
Admin Email: REDACTED FOR PRIVACY
|
||||
Admin Email: Please contact registrar
|
||||
Registry Tech ID: REDACTED FOR PRIVACY
|
||||
Tech Name: REDACTED FOR PRIVACY
|
||||
Tech Organization: REDACTED FOR PRIVACY
|
||||
|
@ -52,7 +52,7 @@ Tech Phone: REDACTED FOR PRIVACY
|
|||
Tech Phone Ext: REDACTED FOR PRIVACY
|
||||
Tech Fax: REDACTED FOR PRIVACY
|
||||
Tech Fax Ext: REDACTED FOR PRIVACY
|
||||
Tech Email: REDACTED FOR PRIVACY
|
||||
Tech Email: Please contact registrar
|
||||
Name Server: ns01.exampleregistrar.tld
|
||||
Name Server: ns02.exampleregistrar.tld
|
||||
DNSSEC: signedDelegation
|
||||
|
|
|
@ -27,7 +27,7 @@ Registrant Phone: REDACTED FOR PRIVACY
|
|||
Registrant Phone Ext: REDACTED FOR PRIVACY
|
||||
Registrant Fax: REDACTED FOR PRIVACY
|
||||
Registrant Fax Ext: REDACTED FOR PRIVACY
|
||||
Registrant Email: REDACTED FOR PRIVACY
|
||||
Registrant Email: Please contact registrar
|
||||
Registry Admin ID: REDACTED FOR PRIVACY
|
||||
Admin Name: REDACTED FOR PRIVACY
|
||||
Admin Organization: REDACTED FOR PRIVACY
|
||||
|
@ -39,7 +39,7 @@ Admin Country: REDACTED FOR PRIVACY
|
|||
Admin Phone: REDACTED FOR PRIVACY
|
||||
Admin Phone Ext: REDACTED FOR PRIVACY
|
||||
Admin Fax: REDACTED FOR PRIVACY
|
||||
Admin Email: REDACTED FOR PRIVACY
|
||||
Admin Email: Please contact registrar
|
||||
Registry Tech ID: REDACTED FOR PRIVACY
|
||||
Tech Name: REDACTED FOR PRIVACY
|
||||
Tech Organization: REDACTED FOR PRIVACY
|
||||
|
@ -52,7 +52,7 @@ Tech Phone: REDACTED FOR PRIVACY
|
|||
Tech Phone Ext: REDACTED FOR PRIVACY
|
||||
Tech Fax: REDACTED FOR PRIVACY
|
||||
Tech Fax Ext: REDACTED FOR PRIVACY
|
||||
Tech Email: REDACTED FOR PRIVACY
|
||||
Tech Email: Please contact registrar
|
||||
Name Server: ns01.exampleregistrar.tld
|
||||
Name Server: ns02.exampleregistrar.tld
|
||||
DNSSEC: signedDelegation
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue