d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whois: special case certain query suffixes

Browse Source 
This extends the existing support for -NORID handles
to include -NICAT, -ARIN, and -RIPE handles.

The suffix machinery is also used to work around a problem with
lack of referrals from the Nominet server for .uk: names under
.ac.uk need to be queried directly at JANET's whois server.
This commit is contained in:
Tony Finch 2015-05-14 10:31:37 +00:00
parent 8b6444e7e4
commit c343f06104
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
usr.bin/whois/whois.c
View File

@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
#define MNICHOST "whois.ra.net" #define MNICHOST "whois.ra.net"
#define QNICHOST_TAIL ".whois-servers.net" #define QNICHOST_TAIL ".whois-servers.net"
#define BNICHOST "whois.registro.br" #define BNICHOST "whois.registro.br"
#define NORIDHOST "whois.norid.no"
#define IANAHOST "whois.iana.org" #define IANAHOST "whois.iana.org"
#define GERMNICHOST "de.whois-servers.net" #define GERMNICHOST "de.whois-servers.net"
#define FNICHOST "whois.afrinic.net" #define FNICHOST "whois.afrinic.net"
@ -84,6 +83,19 @@ __FBSDID("$FreeBSD$");
#define ishost(h) (isalnum((unsigned char)h) || h == '.' || h == '-') #define ishost(h) (isalnum((unsigned char)h) || h == '.' || h == '-')
static struct {
const char *suffix, *server;
} whoiswhere[] = {
/* Various handles */
{ "-ARIN", ANICHOST },
{ "-NICAT", "at" QNICHOST_TAIL },
{ "-NORID", "no" QNICHOST_TAIL },
{ "-RIPE", RNICHOST },
/* Nominet's whois server doesn't return referrals to JANET */
{ ".ac.uk", "ac.uk" QNICHOST_TAIL },
{ NULL, NULL }
};
static const char *ip_whois[] = { LNICHOST, RNICHOST, PNICHOST, BNICHOST, static const char *ip_whois[] = { LNICHOST, RNICHOST, PNICHOST, BNICHOST,
FNICHOST, NULL }; FNICHOST, NULL };
static const char *port = DEFAULT_PORT; static const char *port = DEFAULT_PORT;
@ -176,10 +188,8 @@ main(int argc, char *argv[])
usage(); usage();
/* /*
* If no host or country is specified determine the top level domain * If no host or country is specified, try to determine the top
* from the query. If the TLD is a number, query ARIN. Otherwise, use * level domain from the query, or fall back to NICHOST.
* TLD.whois-server.net. If the domain does not contain '.', fall
* back to NICHOST.
*/ */
if (host == NULL && country == NULL) { if (host == NULL && country == NULL) {
if ((host = getenv("RA_SERVER")) == NULL) { if ((host = getenv("RA_SERVER")) == NULL) {
@ -210,25 +220,32 @@ main(int argc, char *argv[])
* returns a pointer to newly allocated memory containing the whois server to * returns a pointer to newly allocated memory containing the whois server to
* be queried, or a NULL if the correct server couldn't be determined. The * be queried, or a NULL if the correct server couldn't be determined. The
* caller must remember to free(3) the allocated memory. * caller must remember to free(3) the allocated memory.
*
* If the domain is an IPv6 address or has a known suffix, that determines
* the server, else if the TLD is a number, query ARIN, else use
* TLD.whois-server.net. Fail if the domain does not contain '.'.
*/ */
static char * static char *
choose_server(char *domain) choose_server(char *domain)
{ {
char *pos, *retval; char *pos, *retval;
int i;
if (strchr(domain, ':')) { if (strchr(domain, ':')) {
s_asprintf(&retval, "%s", ANICHOST); s_asprintf(&retval, "%s", ANICHOST);
return (retval); return (retval);
} }
for (pos = strchr(domain, '\0'); pos > domain && *--pos == '.';) for (pos = strchr(domain, '\0'); pos > domain && pos[-1] == '.';)
*pos = '\0'; *--pos = '\0';
if (*domain == '\0') if (*domain == '\0')
errx(EX_USAGE, "can't search for a null string"); errx(EX_USAGE, "can't search for a null string");
if (strlen(domain) > sizeof("-NORID")-1 && for (i = 0; whoiswhere[i].suffix != NULL; i++) {
strcasecmp(domain + strlen(domain) - sizeof("-NORID") + 1, size_t suffix_len = strlen(whoiswhere[i].suffix);
"-NORID") == 0) { if (domain + suffix_len < pos &&
s_asprintf(&retval, "%s", NORIDHOST); strcasecmp(pos - suffix_len, whoiswhere[i].suffix) == 0) {
return (retval); s_asprintf(&retval, "%s", whoiswhere[i].server);
return (retval);
}
} }
while (pos > domain && *pos != '.') while (pos > domain && *pos != '.')
--pos; --pos;