mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-06 16:17:13 +00:00
Code Issues Releases Wiki Activity

Clean up issues with RDAP redaction (#2067)

Browse Source 
Instead of using REDACTED FOR PRIVACY everywhere we should just include
the empty string (this is what the spec says, what other gTLD registrars
do, and what the RDAP conformance tool at
https://github.com/icann/rdap-conformance-tool says to do.

In the contact VCards, we omit redacted fields entirely unless the spec
requires that they exist (the version number and an empty 'fn' field).
This also applies to the "handle" field.

Eventually we will probably want to add the redaction extension but
that's not RFCed yet and isn't required for the August RDAP conformance
deadline.
This commit is contained in:
gbrodman
2023-07-06 14:48:51 -04:00
committed by GitHub
parent 599a55d5b1
commit fe19f0fe78
8 changed files with 94 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/resources/google/registry/rdap/rdap_associated_contact_no_personal_data.json
+3 -20
View File
@@ -5,7 +5,7 @@
"icann_rdap_technical_implementation_guide_0"
],
"objectClassName" : "entity",
"handle" : "REDACTED FOR PRIVACY",
"handle" : "",
"events": [
{
"eventAction": "last update of RDAP database",
@@ -15,25 +15,8 @@
"vcardArray": [
"vcard",
[
["version",{},"text","4.0"],
["fn",{},"text","REDACTED FOR PRIVACY"],
["org",{},"text","REDACTED FOR PRIVACY"],
[
"adr",
{},
"text",
[
"",
"",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"XX"
]
],
["tel",{"type":["voice"]},"uri","tel:REDACTED FOR PRIVACY"],
["tel",{"type":["fax"]},"uri","tel:REDACTED FOR PRIVACY"]
["version", {}, "text", "4.0"],
["fn", {}, "text", ""]
]
],
"remarks": [
core/src/test/resources/google/registry/rdap/rdap_contact_no_personal_data_with_remark.json
+3 -20
View File
@@ -5,7 +5,7 @@
"icann_rdap_technical_implementation_guide_0"
],
"objectClassName" : "entity",
"handle" : "REDACTED FOR PRIVACY",
"handle" : "",
"events": [
{
"eventAction": "last update of RDAP database",
@@ -15,25 +15,8 @@
"vcardArray": [
"vcard",
[
["version",{},"text","4.0"],
["fn",{},"text","REDACTED FOR PRIVACY"],
["org",{},"text","REDACTED FOR PRIVACY"],
[
"adr",
{},
"text",
[
"",
"",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"XX"
]
],
["tel",{"type":["voice"]},"uri","tel:REDACTED FOR PRIVACY"],
["tel",{"type":["fax"]},"uri","tel:REDACTED FOR PRIVACY"]
["version", {}, "text", "4.0"],
["fn", {}, "text", ""]
]
],
"remarks": [
core/src/test/resources/google/registry/rdap/rdap_domain_no_contacts_with_remark.json
+6 -18
View File
@@ -150,7 +150,7 @@
},
{
"objectClassName": "entity",
"handle": "REDACTED FOR PRIVACY",
"handle": "",
"roles":["administrative"],
"remarks": [
{
@@ -180,18 +180,14 @@
"vcard",
[
["version", {}, "text", "4.0"],
["fn", {}, "text", "REDACTED FOR PRIVACY"],
["org", {}, "text", "REDACTED FOR PRIVACY"],
["adr", {}, "text", ["", "", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "XX"]],
["tel", {"type":["voice"]}, "uri", "tel:REDACTED FOR PRIVACY"],
["tel", {"type":["fax"]}, "uri", "tel:REDACTED FOR PRIVACY"]
["fn", {}, "text", ""]
]
]
},
{
"objectClassName":"entity",
"handle":"REDACTED FOR PRIVACY",
"handle":"",
"remarks":[
{
"title":"REDACTED FOR PRIVACY",
@@ -221,18 +217,14 @@
"vcard",
[
["version", {}, "text", "4.0"],
["fn", {}, "text", "REDACTED FOR PRIVACY"],
["org", {}, "text", "REDACTED FOR PRIVACY"],
["adr", {}, "text", ["", "", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "XX"]],
["tel", {"type":["voice"]}, "uri", "tel:REDACTED FOR PRIVACY"],
["tel", {"type":["fax"]}, "uri", "tel:REDACTED FOR PRIVACY"]
["fn", {}, "text", ""]
]
]
},
{
"objectClassName":"entity",
"handle":"REDACTED FOR PRIVACY",
"handle":"",
"remarks":[
{
"title":"REDACTED FOR PRIVACY",
@@ -262,11 +254,7 @@
"vcard",
[
["version", {}, "text", "4.0"],
["fn", {}, "text", "REDACTED FOR PRIVACY"],
["org", {}, "text", "REDACTED FOR PRIVACY"],
["adr", {}, "text", ["", "", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "XX"]],
["tel", {"type":["voice"]}, "uri", "tel:REDACTED FOR PRIVACY"],
["tel", {"type":["fax"]}, "uri", "tel:REDACTED FOR PRIVACY"]
["fn", {}, "text", ""]
]
]
}
core/src/test/resources/google/registry/rdap/rdap_domain_unicode_no_contacts_with_remark.json
+6 -19
View File
@@ -153,7 +153,7 @@
},
{
"objectClassName": "entity",
"handle": "REDACTED FOR PRIVACY",
"handle": "",
"roles":["administrative"],
"remarks": [
{
@@ -183,18 +183,14 @@
"vcard",
[
["version", {}, "text", "4.0"],
["fn", {}, "text", "REDACTED FOR PRIVACY"],
["org", {}, "text", "REDACTED FOR PRIVACY"],
["adr", {}, "text", ["", "", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "XX"]],
["tel", {"type":["voice"]}, "uri", "tel:REDACTED FOR PRIVACY"],
["tel", {"type":["fax"]}, "uri", "tel:REDACTED FOR PRIVACY"]
["fn", {}, "text", ""]
]
]
},
{
"objectClassName":"entity",
"handle":"REDACTED FOR PRIVACY",
"handle":"",
"remarks":[
{
"title":"REDACTED FOR PRIVACY",
@@ -224,18 +220,13 @@
"vcard",
[
["version", {}, "text", "4.0"],
["fn", {}, "text", "REDACTED FOR PRIVACY"],
["org", {}, "text", "REDACTED FOR PRIVACY"],
["adr", {}, "text", ["", "", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "XX"]],
["tel", {"type":["voice"]}, "uri", "tel:REDACTED FOR PRIVACY"],
["tel", {"type":["fax"]}, "uri", "tel:REDACTED FOR PRIVACY"]
]
["fn", {}, "text", ""] ]
]
},
{
"objectClassName":"entity",
"handle":"REDACTED FOR PRIVACY",
"handle":"",
"remarks":[
{
"title":"REDACTED FOR PRIVACY",
@@ -265,11 +256,7 @@
"vcard",
[
["version", {}, "text", "4.0"],
["fn", {}, "text", "REDACTED FOR PRIVACY"],
["org", {}, "text", "REDACTED FOR PRIVACY"],
["adr", {}, "text", ["", "", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "REDACTED FOR PRIVACY", "XX"]],
["tel", {"type":["voice"]}, "uri", "tel:REDACTED FOR PRIVACY"],
["tel", {"type":["fax"]}, "uri", "tel:REDACTED FOR PRIVACY"]
["fn", {}, "text", ""]
]
]
}
core/src/test/resources/google/registry/rdap/rdapjson_domain_logged_out.json
+9 -60
View File
@@ -137,7 +137,7 @@
},
{
"objectClassName": "entity",
"handle": "REDACTED FOR PRIVACY",
"handle": "",
"roles": ["administrative"],
"remarks": [
{
@@ -166,31 +166,14 @@
"vcardArray": [
"vcard",
[
["version",{},"text","4.0"],
["fn",{},"text","REDACTED FOR PRIVACY"],
["org",{},"text","REDACTED FOR PRIVACY"],
[
"adr",
{},
"text",
[
"",
"",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"XX"
]
],
["tel",{"type":["voice"]},"uri","tel:REDACTED FOR PRIVACY"],
["tel",{"type":["fax"]},"uri","tel:REDACTED FOR PRIVACY"]
["version", {}, "text", "4.0"],
["fn", {}, "text", ""]
]
]
},
{
"objectClassName": "entity",
"handle": "REDACTED FOR PRIVACY",
"handle": "",
"roles": ["technical"],
"remarks": [
{
@@ -219,31 +202,14 @@
"vcardArray": [
"vcard",
[
["version",{},"text","4.0"],
["fn",{},"text","REDACTED FOR PRIVACY"],
["org",{},"text","REDACTED FOR PRIVACY"],
[
"adr",
{},
"text",
[
"",
"",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"XX"
]
],
["tel",{"type":["voice"]},"uri","tel:REDACTED FOR PRIVACY"],
["tel",{"type":["fax"]},"uri","tel:REDACTED FOR PRIVACY"]
["version", {}, "text", "4.0"],
["fn", {}, "text", ""]
]
]
},
{
"objectClassName": "entity",
"handle": "REDACTED FOR PRIVACY",
"handle": "",
"roles": ["registrant"],
"remarks": [
{
@@ -272,25 +238,8 @@
"vcardArray": [
"vcard",
[
["version",{},"text","4.0"],
["fn",{},"text","REDACTED FOR PRIVACY"],
["org",{},"text","REDACTED FOR PRIVACY"],
[
"adr",
{},
"text",
[
"",
"",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"XX"
]
],
["tel",{"type":["voice"]},"uri","tel:REDACTED FOR PRIVACY"],
["tel",{"type":["fax"]},"uri","tel:REDACTED FOR PRIVACY"]
["version", {}, "text", "4.0"],
["fn", {}, "text", ""]
]
]
}
core/src/test/resources/google/registry/rdap/rdapjson_registrant_logged_out.json
+3 -20
View File
@@ -1,6 +1,6 @@
{
"objectClassName" : "entity",
"handle" : "REDACTED FOR PRIVACY",
"handle" : "",
"roles" : ["registrant"],
"events": [
{
@@ -11,25 +11,8 @@
"vcardArray": [
"vcard",
[
["version",{},"text","4.0"],
["fn",{},"text","REDACTED FOR PRIVACY"],
["org",{},"text","REDACTED FOR PRIVACY"],
[
"adr",
{},
"text",
[
"",
"",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"REDACTED FOR PRIVACY",
"XX"
]
],
["tel",{"type":["voice"]},"uri","tel:REDACTED FOR PRIVACY"],
["tel",{"type":["fax"]},"uri","tel:REDACTED FOR PRIVACY"]
["version", {}, "text", "4.0"],
["fn", {}, "text", ""]
]
],
"remarks": [