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

RDAP: Change data policy remark for redacted contacts

Browse source 
Changes the code to be in compliance with the RDAP Pilot Profile document,
which specifies:

1.4.11.  If permitted or required by an ICANN agreement provision, waiver, or Consensus Policy, an RDAP response may contain redacted registrant, administrative, technical and/or other contact information. If any information is redacted, the response MUST include a remarks member with title "Data Policy", type "object truncated due to authorization", a description containing the string "Some of the data in this object has been removed" and a links member with the elements rel:alternate and href indicating where the data policy can be found. An entity with redacted information MUST include the "removed" value in the status element.

We were using the "removed" status to indicate deleted contacts and inactive
registrars. Instead, we will now use "inactive", so that we can use "removed"
to indicated redaction.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=185039201
This commit is contained in:
mountford 2018-02-08 13:06:14 -08:00 • committed by jianglai
parent 178760622b
commit 85f5535811
12 changed files with 112 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

32
java/google/registry/rdap/RdapJsonFormatter.java
View file

@ -272,8 +272,8 @@ public class RdapJsonFormatter {
private static final ImmutableList<String> STATUS_LIST_ACTIVE =
ImmutableList.of(RdapStatus.ACTIVE.rfc7483String);
private static final ImmutableList<String> STATUS_LIST_REMOVED =
ImmutableList.of(RdapStatus.REMOVED.rfc7483String);
private static final ImmutableList<String> STATUS_LIST_INACTIVE =
ImmutableList.of(RdapStatus.INACTIVE.rfc7483String);
private static final ImmutableMap<String, ImmutableList<String>> PHONE_TYPE_VOICE =
ImmutableMap.of("type", ImmutableList.of("voice"));
private static final ImmutableMap<String, ImmutableList<String>> PHONE_TYPE_FAX =
@ -496,7 +496,9 @@ public class RdapJsonFormatter {
jsonBuilder.put(
"status",
makeStatusValueList(
domainResource.getStatusValues(), domainResource.getDeletionTime().isBefore(now)));
domainResource.getStatusValues(),
false, // isRedacted
domainResource.getDeletionTime().isBefore(now)));
jsonBuilder.put("links", ImmutableList.of(
makeLink("domain", domainResource.getFullyQualifiedDomainName(), linkBase)));
boolean displayContacts =
@ -612,7 +614,10 @@ public class RdapJsonFormatter {
}
jsonBuilder.put(
"status",
makeStatusValueList(statuses.build(), hostResource.getDeletionTime().isBefore(now)));
makeStatusValueList(
statuses.build(),
false, // isRedacted
hostResource.getDeletionTime().isBefore(now)));
jsonBuilder.put("links", ImmutableList.of(
makeLink("nameserver", hostResource.getFullyQualifiedHostName(), linkBase)));
List<ImmutableMap<String, Object>> remarks;
@ -691,6 +696,8 @@ public class RdapJsonFormatter {
DateTime now,
OutputDataType outputDataType,
RdapAuthorization authorization) {
boolean isAuthorized =
authorization.isAuthorizedForClientId(contactResource.getCurrentSponsorClientId());
ImmutableMap.Builder<String, Object> jsonBuilder = new ImmutableMap.Builder<>();
ImmutableList.Builder<ImmutableMap<String, Object>> remarksBuilder
= new ImmutableList.Builder<>();
@ -702,13 +709,14 @@ public class RdapJsonFormatter {
isLinked(Key.create(contactResource), now)
? union(contactResource.getStatusValues(), StatusValue.LINKED)
: contactResource.getStatusValues(),
!isAuthorized,
contactResource.getDeletionTime().isBefore(now)));
contactType.ifPresent(
type -> jsonBuilder.put("roles", ImmutableList.of(convertContactTypeToRdapRole(type))));
jsonBuilder.put("links",
ImmutableList.of(makeLink("entity", contactResource.getRepoId(), linkBase)));
// If we are logged in as the owner of this contact, create the vCard.
if (authorization.isAuthorizedForClientId(contactResource.getCurrentSponsorClientId())) {
if (isAuthorized) {
ImmutableList.Builder<Object> vcardBuilder = new ImmutableList.Builder<>();
vcardBuilder.add(VCARD_ENTRY_VERSION);
PostalInfo postalInfo = contactResource.getInternationalizedPostalInfo();
@ -794,7 +802,7 @@ public class RdapJsonFormatter {
jsonBuilder.put("objectClassName", "entity");
Long ianaIdentifier = registrar.getIanaIdentifier();
jsonBuilder.put("handle", (ianaIdentifier == null) ? "(none)" : ianaIdentifier.toString());
jsonBuilder.put("status", registrar.isLive() ? STATUS_LIST_ACTIVE : STATUS_LIST_REMOVED);
jsonBuilder.put("status", registrar.isLive() ? STATUS_LIST_ACTIVE : STATUS_LIST_INACTIVE);
jsonBuilder.put("roles", ImmutableList.of(RdapEntityRole.REGISTRAR.rfc7483String));
if (ianaIdentifier != null) {
jsonBuilder.put("links",
@ -1086,20 +1094,24 @@ public class RdapJsonFormatter {
/**
* Creates a string array of status values.
*
* <p>The spec indicates that OK should be listed as "active". We use the "removed" status to
* indicate deleted objects.
* <p>The spec indicates that OK should be listed as "active". We use the "inactive" status to
* indicate deleted objects, and as directed by the profile, the "removed" status to indicate
* redacted objects.
*/
private static ImmutableList<String> makeStatusValueList(
ImmutableSet<StatusValue> statusValues, boolean isDeleted) {
ImmutableSet<StatusValue> statusValues, boolean isRedacted, boolean isDeleted) {
Stream<RdapStatus> stream =
statusValues
.stream()
.map(status -> statusToRdapStatusMap.getOrDefault(status, RdapStatus.OBSCURED));
if (isRedacted) {
stream = Streams.concat(stream, Stream.of(RdapStatus.REMOVED));
}
if (isDeleted) {
stream =
Streams.concat(
stream.filter(rdapStatus -> !Objects.equals(rdapStatus, RdapStatus.ACTIVE)),
Stream.of(RdapStatus.REMOVED));
Stream.of(RdapStatus.INACTIVE));
}
return stream
.map(RdapStatus::getDisplayName)