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

Return proper RDAP error messages when invalid IP addresses are specified

Browse source 
We were relying on Dagger to validate the IP address, but that resulted in 500 errors when the IP address was not valid, which is undesirable. Instead, accept the parameters as strings, then convert them to IP addresses and throw a proper error when conversion fails.

Also fixes an improperly specified test.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173172516
This commit is contained in:
mountford 2017-10-23 14:40:05 -07:00 • committed by jianglai
parent 52fd9d8c4e
commit 4267fa7e48
6 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

11
java/google/registry/rdap/RdapNameserverSearchAction.java
View file

@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Iterables;
import com.google.common.net.InetAddresses;
import com.google.common.primitives.Booleans;
import com.googlecode.objectify.cmd.Query;
import google.registry.model.domain.DomainResource;
@ -66,7 +67,7 @@ public class RdapNameserverSearchAction extends RdapActionBase {
@Inject Clock clock;
@Inject @Parameter("name") Optional<String> nameParam;
@Inject @Parameter("ip") Optional<InetAddress> ipParam;
@Inject @Parameter("ip") Optional<String> ipParam;
@Inject RdapNameserverSearchAction() {}
@Override
@ -107,7 +108,13 @@ public class RdapNameserverSearchAction extends RdapActionBase {
results = searchByName(RdapSearchPattern.create(Idn.toASCII(nameParam.get()), true), now);
} else {
// syntax: /rdap/nameservers?ip=1.2.3.4
results = searchByIp(ipParam.get(), now);
InetAddress inetAddress;
try {
inetAddress = InetAddresses.forString(ipParam.get());
} catch (IllegalArgumentException e) {
throw new BadRequestException("Invalid value of ip parameter");
}
results = searchByIp(inetAddress, now);
}
if (results.jsonList().isEmpty()) {
throw new NotFoundException("No nameservers found");