Add RDAP Relation extension

whois-api/src/main/java/net/ripe/db/whois/api/rdap/RdapConformance.java

@@ -6,7 +6,12 @@ public enum RdapConformance {
     NRO_PROFILE_0("nro_rdap_profile_0"),
     FLAT_MODEL("nro_rdap_profile_asn_flat_0"),
     REDACTED("redacted"),
-    GEO_FEED_1("geofeed1");
+    GEO_FEED_1("geofeed1"),
+    RIR_SEARCH_1("rirSearch1"),
+    IPS("ips"),
+    IP_SEARCH_RESULTS("ipSearchResults"),
+    AUTNUMS("autnums"),
+    AUTNUM_SEARCH_RESULTS("autnumSearchResults");
 
 
     private final String value;

whois-api/src/main/java/net/ripe/db/whois/api/rdap/RdapObjectMapper.java

@@ -125,6 +125,7 @@ class RdapObjectMapper {
             ZONE_C, Role.ZONE,
             ORG, Role.REGISTRANT,// TODO: [MA] both mnt_by and org have same role
             MNT_IRT, Role.ABUSE);
+    private final RdapRelationService rdapRelationService;
 
     @Autowired
     public RdapObjectMapper(
@@ -133,13 +134,14 @@ public RdapObjectMapper(
             final ReservedResources reservedResources,
             final Ipv4Tree ipv4Tree,
             final Ipv6Tree ipv6Tree,
-            @Value("${rdap.port43:}") final String port43) {
+            @Value("${rdap.port43:}") final String port43, RdapRelationService rdapRelationService) {
         this.noticeFactory = noticeFactory;
         this.rpslObjectDao = rpslObjectDao;
         this.ipv4Tree = ipv4Tree;
         this.ipv6Tree = ipv6Tree;
         this.port43 = port43;
         this.reservedResources = reservedResources;
+        this.rdapRelationService = rdapRelationService;
     }
 
     public Object map(final String requestUrl,
@@ -183,6 +185,7 @@ public Object mapSearch(final String requestUrl, final List<RpslObject> objects,
 
         final RdapObject rdapObject = mapCommonNoticesAndPort(searchResult, requestUrl);
         mapCommonLinks(rdapObject, requestUrl);
+        includeRirSearchConformance(rdapObject, requestUrl);
         return mapCommonConformances(rdapObject);
     }
 
@@ -198,6 +201,7 @@ public Object mapDomainEntity(
         rdapObject.getLinks().add(COPYRIGHT_LINK);
 
         mapRedactions(rdapObject);
+        includeRirSearchConformance(rdapObject, requestUrl);
         return mapCommonConformances(rdapObject);
     }
 
@@ -323,6 +327,7 @@ private RdapObject mapCommons(final RdapObject rdapResponse, final String reques
         final RdapObject rdapObject = mapCommonNoticesAndPort(rdapResponse, requestUrl);
         mapCommonLinks(rdapObject, requestUrl);
         mapRedactions(rdapResponse);
+        includeRirSearchConformance(rdapObject, requestUrl);
         return mapCommonConformances(rdapObject);
     }
 
@@ -362,6 +367,10 @@ private RdapObject mapCommonConformances(final RdapObject rdapResponse) {
         return rdapResponse;
     }
 
+    private void includeRirSearchConformance(final RdapObject rdapResponse, final String requestUrl) {
+        rdapRelationService.includeRirSearchConformance(rdapResponse, requestUrl);
+    }
+
     private Ip createIp(final RpslObject rpslObject, final String requestUrl) {
         final Ip ip = new Ip();
         final IpInterval ipInterval = IpInterval.parse(rpslObject.getKey());

whois-api/src/main/java/net/ripe/db/whois/api/rdap/RdapRelationService.java

@@ -1,6 +1,8 @@
 package net.ripe.db.whois.api.rdap;
 
 import com.google.common.collect.Sets;
+import net.ripe.db.whois.api.rdap.domain.RdapObject;
+import net.ripe.db.whois.api.rdap.domain.RdapRequestType;
 import net.ripe.db.whois.api.rdap.domain.RelationType;
 import net.ripe.db.whois.common.dao.RpslObjectDao;
 import net.ripe.db.whois.common.domain.CIString;
@@ -66,6 +68,21 @@ public List<String> getDomainsByRelationType(final String pkey, final RelationTy
                 .toList();
     }
 
+
+    public void includeRirSearchConformance(final RdapObject rdapObject, final String requestUrl){
+        rdapObject.getRdapConformance().add(RdapConformance.RIR_SEARCH_1.getValue());
+        if (requestUrl == null) {
+            return;
+        }
+        if (requestUrl.contains(RdapRequestType.IPS.name().toLowerCase())){
+            rdapObject.getRdapConformance().addAll(List.of(RdapConformance.IPS.getValue(), RdapConformance.IP_SEARCH_RESULTS.getValue()));
+            return;
+        }
+        if (requestUrl.contains(RdapRequestType.AUTNUMS.name().toLowerCase())){
+            rdapObject.getRdapConformance().addAll(List.of(RdapConformance.AUTNUMS.getValue(), RdapConformance.AUTNUM_SEARCH_RESULTS.getValue()));
+        }
+    }
+
     public List<String> getInetnumRelationPkeys(final String pkey, final RelationType relationType){
         final IpInterval ip = IpInterval.parse(pkey);
         final List<IpEntry> ipEntries = getEntries(getIpTree(ip), relationType, ip);

whois-api/src/test/java/net/ripe/db/whois/api/elasticsearch/RdapElasticServiceTestIntegration.java

@@ -999,7 +999,8 @@ public void search_redactions() {
                 .map(Redaction::getPrePath)
                 .collect(Collectors.toList()), containsInAnyOrder("$.entities[?(@.handle=='PP1-TEST')].vcardArray[1][?(@[0]=='e-mail')]"));
 
-        assertThat(result.getRdapConformance(), containsInAnyOrder("cidr0", "rdap_level_0", "nro_rdap_profile_0", "redacted"));
+        assertThat(result.getRdapConformance(), containsInAnyOrder("cidr0", "rdap_level_0", "nro_rdap_profile_0",
+                "redacted", "rirSearch1"));
     }
 
     // helper methods
@@ -1043,9 +1044,9 @@ protected void assertErrorDescriptionContains(final WebApplicationException exce
 
     private void assertCommon(RdapObject object) {
         assertThat(object.getPort43(), is("whois.ripe.net"));
-        assertThat(object.getRdapConformance(), hasSize(4));
+        assertThat(object.getRdapConformance(), hasSize(5));
         assertThat(object.getRdapConformance(), containsInAnyOrder("rdap_level_0", "cidr0", "nro_rdap_profile_0",
-                "redacted"));
+                "redacted", "rirSearch1"));
     }
 
     private void assertTnCNotice(final Notice notice, final String value) {