Improve regexp validation in Xchat::XPI::Net::whois()

diff --git a/Xchat/XPI/Net.pm b/Xchat/XPI/Net.pm
index 9c83b14594c253cb2c4c90da880027972dc8aed0..96c4af30f71f4803986e8752adc3b4e0222ae828 100644 (file)
--- a/Xchat/XPI/Net.pm
+++ b/Xchat/XPI/Net.pm
@@ -62,16 +62,21 @@ my %whois_servers = (
  ipv6 => { default => 'whois.6bone.net' },
 );
 
  ipv6 => { default => 'whois.6bone.net' },
 );
 

+my $ipv4_rx = qr/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/;
+my $ipv6_rx = qr/[0-9:]+/;
+

 sub whois {
  my ($host, $callback, $args) = @_;
  return unless $host and $callback;
 
  my $server;
 sub whois {
  my ($host, $callback, $args) = @_;
  return unless $host and $callback;
 
  my $server;

- if ($host =~ /^\s*\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\/\d{1,2})?$/) {
+ if ($host =~ /^\s*($ipv4_rx)(?:\/[0-9]{1,2})?[\s\.]*$/o) {
+  $host   = $1;

   $server = $whois_servers{ipv4}{default};
   $server = $whois_servers{ipv4}{default};

- } elsif ($host =~ /^\s*[\d:]*(\/\d{1,2})?\s*$/) {
+ } elsif ($host =~ /^\s*($ipv6_rx)(?:\/[0-9]{1,2})?[\s\.]*$/o) {
+  $host   = $1;

   $server = $whois_servers{ipv6}{default};
   $server = $whois_servers{ipv6}{default};

- } elsif ($host =~ /([^\.]+)\.+([a-z]+)\.*$/) {
+ } elsif ($host =~ /([^\.]+)\.+([a-z]+)[\.\s]*$/) {

   $host   = $1 . '.' . $2;
   $server = $whois_servers{domain}{$2};
   $server = $whois_servers{domain}{default} unless $server;
   $host   = $1 . '.' . $2;
   $server = $whois_servers{domain}{$2};
   $server = $whois_servers{domain}{default} unless $server;