Link the Registrar's RDAP server from RDAP domain replies

To do this we add a field of "rdapServers" in the Registrar object. Currently, we can only set this field manually, but a subsequent CL will add a cron-job to read these values from the ICANN servers.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=252438618
This commit is contained in:
guyben 2019-06-10 10:54:19 -07:00 committed by jianglai
parent 7c64992c73
commit 4110cae814
14 changed files with 186 additions and 30 deletions

View file

@ -436,6 +436,7 @@ class google.registry.model.registrar.Registrar {
java.util.List<google.registry.util.CidrAddressBlock> ipAddressWhitelist;
java.util.Map<org.joda.money.CurrencyUnit, google.registry.model.registrar.Registrar$BillingAccountEntry> billingAccountMap;
java.util.Set<java.lang.String> allowedTlds;
java.util.Set<java.lang.String> rdapBaseUrls;
org.joda.time.DateTime lastCertificateUpdateTime;
}
class google.registry.model.registrar.Registrar$BillingAccountEntry {

View file

@ -19,6 +19,18 @@
"type": "application/rdap+json",
"rel": "self",
"value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
}
],
"events": [

View file

@ -19,6 +19,18 @@
"type": "application/rdap+json",
"rel": "self",
"value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
}
],
"events": [

View file

@ -20,6 +20,18 @@
"type": "application/rdap+json",
"rel": "self",
"value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
}
],
"events": [

View file

@ -19,6 +19,18 @@
"type": "application/rdap+json",
"rel": "self",
"value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
}
],
"events": [

View file

@ -20,6 +20,18 @@
"type": "application/rdap+json",
"rel": "self",
"value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
}
],
"events": [

View file

@ -20,6 +20,18 @@
"type": "application/rdap+json",
"rel": "self",
"value": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%"
}
],
"events": [

View file

@ -17,6 +17,18 @@
"rel" : "self",
"href" : "https://example.tld/rdap/domain/cat.xn--q9jyb4c",
"type" : "application/rdap+json"
},
{
"value" : "https://rdap.example.com/withSlash/domain/cat.xn--q9jyb4c",
"rel" : "related",
"href" : "https://rdap.example.com/withSlash/domain/cat.xn--q9jyb4c",
"type" : "application/rdap+json"
},
{
"value" : "https://rdap.example.com/withoutSlash/domain/cat.xn--q9jyb4c",
"rel" : "related",
"href" : "https://rdap.example.com/withoutSlash/domain/cat.xn--q9jyb4c",
"type" : "application/rdap+json"
}
],
"events": [

View file

@ -17,6 +17,18 @@
"rel": "self",
"href": "https://example.tld/rdap/domain/cat.xn--q9jyb4c",
"type": "application/rdap+json"
},
{
"href": "https://rdap.example.com/withSlash/domain/cat.xn--q9jyb4c",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withSlash/domain/cat.xn--q9jyb4c"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/cat.xn--q9jyb4c",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withoutSlash/domain/cat.xn--q9jyb4c"
}
],
"events": [

View file

@ -18,6 +18,18 @@
"rel": "self",
"href": "https://example.tld/rdap/domain/fish.xn--q9jyb4c",
"type": "application/rdap+json"
},
{
"href": "https://rdap.example.com/withSlash/domain/fish.xn--q9jyb4c",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withSlash/domain/fish.xn--q9jyb4c"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/fish.xn--q9jyb4c",
"type": "application/rdap+json",
"rel": "related",
"value": "https://rdap.example.com/withoutSlash/domain/fish.xn--q9jyb4c"
}
],
"events": [

View file

@ -80,6 +80,8 @@ public final class FullFieldsTestEntityHelper {
.setFaxNumber("+1.2125551213")
.setEmailAddress("contact-us@example.com")
.setWhoisServer("whois.example.com")
.setRdapBaseUrls(ImmutableSet.of(
"https://rdap.example.com/withSlash/", "https://rdap.example.com/withoutSlash"))
.setUrl("http://my.fake.url")
.build();
}