untaint --server and --port

diff --git a/Makefile.PL b/Makefile.PL
index a83aa865f7d9b078129faec77ce35a590ef4f628..446b493232952c509665ac69421faa3f76079cf5 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -19,7 +19,8 @@ WriteMakefile(
                   POE                                     0
                   POE::Component::IRC::Plugin::AutoJoin   0
                   POE::Component::IRC::Plugin::NickServID 0
-                  POE::Component::IRC::State              0/,
+                  POE::Component::IRC::State              0
+                  Regexp::Common                          0/,
        },
        META_MERGE       => {
                dynamic_config => 0,

diff --git a/lib/App/Devbot.pm b/lib/App/Devbot.pm
index 1e0f5c8ff1d54a3db96c67fab02708e05639cb10..d7cd700b47482b3ff191e5b1ec4308356343b9ee 100644 (file)
--- a/lib/App/Devbot.pm
+++ b/lib/App/Devbot.pm
@@ -15,11 +15,10 @@ use IRC::Utils qw/parse_user/;
 
 use Getopt::Long;
 use POSIX qw/strftime/;
+use Regexp::Common qw /net/;
 
 ##################################################
 
-our $VERSION;
-
 my $nick='devbot';
 my $password;
 my $server='irc.oftc.net';
@@ -73,7 +72,14 @@ sub bot_start{
        Retry_when_banned => 60,
   ));
 
-       $irc->yield(register => "all");
+  if ($server =~ /^($RE{net}{domain})$/) {
+      $server = $1;
+  }
+  if ($port =~ /^([0-9]+)$/) {
+      $port = $1;
+  }
+
+  $irc->yield(register => "all");
   $irc->yield(
        connect => {
          Nick     => $nick,