X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2FIRC%2FIrc.pl;h=49d0438ef576933c861ad69d40632a6ff4f812d5;hb=130fc9d79663d571b32c8a625e3487e7b42c10da;hp=d2bc6fae87752903c7713a0c4ed7c8557a7ca40c;hpb=b437ecf35bdd072d73c713a12901db38dd7ac7d6;p=infobot.git diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl index d2bc6fa..49d0438 100644 --- a/src/IRC/Irc.pl +++ b/src/IRC/Irc.pl @@ -7,49 +7,60 @@ if (&IsParam("useStrict")) { use strict; } +use vars qw($nickserv); +$nickserv = 0; + # static scalar variables. $mask{ip} = '(\d+)\.(\d+)\.(\d+)\.(\d+)'; $mask{host} = '[\d\w\_\-\/]+\.[\.\d\w\_\-\/]+'; -$mask{chan} = '[\#\&\+]\S*'; +$mask{chan} = '[\#\&]\S*|_default'; my $isnick1 = 'a-zA-Z\[\]\{\}\_\`\^\|\\\\'; my $isnick2 = '0-9\-'; $mask{nick} = "[$isnick1]{1}[$isnick1$isnick2]*"; +$mask{nuh} = '\S*!\S*\@\S*'; sub ircloop { my $error = 0; my $lastrun = 0; - while (1) { +loop:; + while (my $host = shift @ircServers) { # JUST IN CASE. irq was complaining about this. if ($lastrun == time()) { + &DEBUG("ircloop: hrm... lastrun == time()"); $error++; - sleep 1; + sleep 10; next; } - foreach (@ircServers) { - if (!defined $_) { - &DEBUG("ircloop: ircServers[x] = NULL."); - $lastrun = time(); - next; - } - &DEBUG("ircloop: _ => '$_'."); - next unless (exists $ircPort{$_}); + if (!defined $host) { + &DEBUG("ircloop: ircServers[x] = NULL."); + $lastrun = time(); + next; + } + next unless (exists $ircPort{$host}); - my $retval = &irc($_, $ircPort{$_}); - next unless (defined $retval and $retval == 0); - $error++; - if ($error % 3 == 0 and $error != 0) { - &ERROR("CANNOT connect to this server; next!"); - next; - } + my $retval = &irc($host, $ircPort{$host}); + next unless (defined $retval and $retval == 0); + $error++; - if ($error >= 3*3) { - &ERROR("CANNOT connect to any irc server; stopping."); - exit 1; - } + if ($error % 3 == 0 and $error != 0) { + &status("IRC: Could not connect."); + &status("IRC: "); + next; + } + + if ($error >= 3*2) { + &status("IRC: cannot connect to any IRC servers; stopping."); + &shutdown(); + exit 1; } } + + &status("IRC: ok, done one cycle of IRC servers; trying again."); + + &loadIRCServers(); + goto loop; } sub irc { @@ -61,7 +72,6 @@ sub irc { select STDOUT; &status("Connecting to port $port of server $server ..."); - sleep 3; # lame hack. # host->ip. if ($server =~ /\D$/) { @@ -74,31 +84,36 @@ sub irc { my $resolve = inet_ntoa($packed); &status(" resolved to $resolve."); + ### warning in Sys/Hostname line 78??? + ### caused inside Net::IRC? } $irc = new Net::IRC; - $conn = $irc->newconn( + my %args = ( Nick => $param{'ircNick'}, Server => $server, Port => $port, Ircname => $param{'ircName'}, - LocalAddr => $param{'ircHost'}, ); + $args{'LocalAddr'} = $param{'ircHost'} if ($param{'ircHost'}); + $args{'Password'} = $param{'ircPasswd'} if ($param{'ircPasswd'}); + + $conn = $irc->newconn(%args); if (!defined $conn) { - &ERROR("irc: conn was not created!defined!!!"); + &ERROR("internal: perl IRC connection object does not exist."); return 1; } - # clear out hashes before connecting... &clearIRCVars(); - $ident = $param{'ircNick'}; - ### IRCSTATS. - $ircstats{'ConnectTime'} = time(); - $ircstats{'ConnectCount'}++; - $ircstats{'Server'} = "$server:$port"; + # change internal timeout value for scheduler. + $irc->{_timeout} = 10; # how about 60? + # Net::IRC debugging. + $irc->{_debug} = 1; + + $ircstats{'Server'} = "$server:$port"; # handler stuff. $conn->add_handler('caction', \&on_action); @@ -106,7 +121,7 @@ sub irc { $conn->add_handler('cping', \&on_ping); $conn->add_handler('crping', \&on_ping_reply); $conn->add_handler('cversion', \&on_version); - + $conn->add_handler('crversion', \&on_crversion); $conn->add_handler('dcc_open', \&on_dcc_open); $conn->add_handler('dcc_close', \&on_dcc_close); $conn->add_handler('chat', \&on_chat); @@ -121,19 +136,30 @@ sub irc { $conn->add_handler('nick', \&on_nick); $conn->add_handler('quit', \&on_quit); $conn->add_handler('notice', \&on_notice); - $conn->add_handler('whoisuser', \&on_whoisuser); + $conn->add_handler('whoischannels', \&on_whoischannels); + $conn->add_handler('useronchannel', \&on_useronchannel); + $conn->add_handler('whois', \&on_whois); $conn->add_handler('other', \&on_other); $conn->add_global_handler('disconnect', \&on_disconnect); $conn->add_global_handler([251,252,253,254,255], \&on_init); ### $conn->add_global_handler([251,252,253,254,255,302], \&on_init); + $conn->add_global_handler(315, \&on_endofwho); + $conn->add_global_handler(422, \&on_endofwho); # nomotd. $conn->add_global_handler(324, \&on_modeis); $conn->add_global_handler(333, \&on_topicinfo); $conn->add_global_handler(352, \&on_who); $conn->add_global_handler(353, \&on_names); $conn->add_global_handler(366, \&on_endofnames); - $conn->add_global_handler(376, \&on_endofmotd); + $conn->add_global_handler(376, \&on_endofmotd); # on_connect. $conn->add_global_handler(433, \&on_nick_taken); $conn->add_global_handler(439, \&on_targettoofast); + # for proper joinnextChan behaviour + $conn->add_global_handler(471, \&on_chanfull); + $conn->add_global_handler(473, \&on_inviteonly); + $conn->add_global_handler(474, \&on_banned); + $conn->add_global_handler(475, \&on_badchankey); + $conn->add_global_handler(443, \&on_useronchan); + # end of handler stuff. $irc->start; @@ -160,21 +186,36 @@ sub rawout { sub say { my ($msg) = @_; - if (!defined $msg or $msg eq $noreply) { + if (!defined $msg) { $msg ||= "NULL"; - &DEBUG("say: msg == $msg."); + &WARN("say: msg == $msg."); return; } - if ($msg eq $last{say} and length($msg) > 256) { - &status("say: detected repeated message; skipping."); - return; - } - $last{say} = $msg; - &status(" $msg"); if (&whatInterface() =~ /IRC/) { - $msg = "zero" if ($msg =~ /^0+$/); + $msg = "zero" if ($msg =~ /^0+$/); + my $t = time(); + + if ($t == $pubtime) { + $pubcount++; + $pubsize += length $msg; + + my $i = &getChanConfDefault("sendPublicLimitLines", 3); + my $j = &getChanConfDefault("sendPublicLimitBytes", 1000); + + if ( ($pubcount % $i) == 0 and $pubcount) { + sleep 1; + } elsif ($pubsize > $j) { + sleep 1; + $pubsize -= $j; + } + + } else { + $pubcount = 0; + $pubtime = $t; + $pubsize = length $msg; + } $conn->privmsg($talkchannel, $msg); } @@ -187,27 +228,52 @@ sub msg { return; } - if (!defined $msg or $msg eq $noreply) { + if (!defined $msg) { $msg ||= "NULL"; - &DEBUG("msg: msg == $msg."); + &WARN("msg: msg == $msg."); return; } - if ($msg eq $last{msg} and length($msg) > 256) { - &status("msg: detected repeated message; skipping."); + if ($msgType =~ /chat/i) { + # todo: warn that we're using msg() to do DCC CHAT? + &dccsay($nick, $msg); + # todo: make dccsay deal with flood protection? return; } - $last{msg} = $msg; &status(">$nick< $msg"); - $conn->privmsg($nick, $msg) if (&whatInterface() =~ /IRC/); + + if (&whatInterface() =~ /IRC/) { + my $t = time(); + + if ($t == $msgtime) { + $msgcount++; + $msgsize += length $msg; + + my $i = &getChanConfDefault("sendPrivateLimitLines", 3); + my $j = &getChanConfDefault("sendPrivateLimitBytes", 1000); + if ( ($msgcount % $i) == 0 and $msgcount) { + sleep 1; + } elsif ($msgsize > $j) { + sleep 1; + $msgsize -= $j; + } + + } else { + $msgcount = 0; + $msgtime = $t; + $msgsize = length $msg; + } + + $conn->privmsg($nick, $msg); + } } # Usage: &action(nick || chan, txt); sub action { my ($target, $txt) = @_; if (!defined $txt) { - &DEBUG("action: txt == NULL."); + &WARN("action: txt == NULL."); return; } @@ -223,24 +289,47 @@ sub action { rawout($rawout); } -# Usage: &action(nick || chan, txt); -sub notice{ +# Usage: ¬ice(nick || chan, txt); +sub notice { my ($target, $txt) = @_; if (!defined $txt) { - &DEBUG("action: txt == NULL."); + &WARN("notice: txt == NULL."); return; } &status("-$target- $txt"); + my $t = time(); + + if ($t == $nottime) { + $notcount++; + $notsize += length $txt; + + my $i = &getChanConfDefault("sendNoticeLimitLines", 3); + my $j = &getChanConfDefault("sendNoticeLimitBytes", 1000); + + if ( ($notcount % $i) == 0 and $notcount) { + sleep 1; + } elsif ($notsize > $j) { + sleep 1; + $notsize -= $j; + } + + } else { + $notcount = 0; + $nottime = $t; + $notsize = length $txt; + } + $conn->notice($target, $txt); } - sub DCCBroadcast { - my ($txt) = @_; + my ($txt,$flag) = @_; + + ### FIXME: flag not supported yet. - foreach (keys %{$dcc{'CHAT'}}) { + foreach (keys %{ $dcc{'CHAT'} }) { $conn->privmsg($dcc{'CHAT'}{$_}, $txt); } } @@ -257,7 +346,7 @@ sub performReply { &checkMsgType($reply); if ($msgType eq 'public') { - if (rand() < 0.5) { + if (rand() < 0.5 or $reply =~ /[\.\?]$/) { $reply = "$orig{who}: ".$reply; } else { $reply = "$reply, ".$orig{who}; @@ -272,7 +361,7 @@ sub performReply { &msg($who, $reply); } elsif ($msgType eq 'chat') { if (!exists $dcc{'CHAT'}{$who}) { - &WARN("pSR: dcc{'CHAT'}{$who} does not exist."); + &VERB("pSR: dcc{'CHAT'}{$who} does not exist.",2); return; } $conn->privmsg($dcc{'CHAT'}{$who}, $reply); @@ -287,6 +376,10 @@ sub performAddressedReply { &performReply(@_); } +sub pSReply { + &performStrictReply(@_); +} + # Usage: &performStrictReply($reply); sub performStrictReply { my ($reply) = @_; @@ -298,16 +391,40 @@ sub performStrictReply { } elsif ($msgType eq 'public') { &say($reply); } elsif ($msgType eq 'chat') { - if (!exists $dcc{'CHAT'}{$who}) { - &WARN("pSR: dcc{'CHAT'}{$who} does not exist."); - return; - } - $conn->privmsg($dcc{'CHAT'}{$who}, $reply); + &dccsay(lc $who, $reply); } else { &ERROR("pSR: msgType invalid? ($msgType)."); } +} + +sub dccsay { + my($who, $reply) = @_; + + if (!defined $reply or $reply =~ /^\s*$/) { + &WARN("dccsay: reply == NULL."); + return; + } + + if (!exists $dcc{'CHAT'}{$who}) { + &VERB("pSR: dcc{'CHAT'}{$who} does not exist. (2)",2); + return; + } - return ''; + &status("=>$who<= $reply"); # dcc chat. + $conn->privmsg($dcc{'CHAT'}{$who}, $reply); +} + +sub dcc_close { + my($who) = @_; + my $type; + + foreach $type (keys %dcc) { + &FIXME("dcc_close: $who"); + my @who = grep /^\Q$who\E$/i, keys %{ $dcc{$type} }; + next unless (scalar @who); + $who = $who[0]; + &DEBUG("dcc_close... close $who!"); + } } sub joinchan { @@ -318,12 +435,16 @@ sub joinchan { $chan = lc $1; } - &status("joining $b_blue$chan$ob"); - + # hopefully validChan is right. if (&validChan($chan)) { &status("join: already on $chan"); } else { - $conn->join($chan); + &status("joining $b_blue$chan$ob"); + if (!$conn->join($chan)) { + &DEBUG("joinchan: join failed. trying connect!"); + &clearIRCVars(); + $conn->connect(); + } } } @@ -334,10 +455,15 @@ sub part { next if ($chan eq ""); $chan =~ tr/A-Z/a-z/; # lowercase. + if ($chan !~ /^$mask{chan}$/) { + &WARN("part: chan is invalid ($chan)"); + next; + } + &status("parting $chan"); if (!&validChan($chan)) { - &status("part: not on $chan"); - next; + &WARN("part: not on $chan; doing anyway"); +# next; } rawout("PART $chan"); @@ -354,7 +480,7 @@ sub mode { return; } - &DEBUG("MODE $chan $modes"); + &DEBUG("mode: MODE $chan $modes"); rawout("MODE $chan $modes"); } @@ -363,7 +489,7 @@ sub op { my ($chan, @who) = @_; my $os = "o" x scalar(@who); - &mode($chan, "+$os ".@who); + &mode($chan, "+$os @who"); } sub deop { @@ -406,21 +532,15 @@ sub kick { sub ban { my ($mask,$chan) = @_; - my (@chans) = ($chan eq "") ? (keys %channels) : lc($chan); + my (@chans) = ($chan =~ /^\*?$/) ? (keys %channels) : lc($chan); + my $ban = 0; - if ($chan ne "" and &validChan($chan) == 0) { + if ($chan !~ /^\*?$/ and &validChan($chan) == 0) { &ERROR("ban: invalid channel $chan."); return; } - $nick =~ tr/A-Z/a-z/; - foreach $chan (@chans) { - if (!&IsNickInChan($nick,$chan) and scalar @chans == 1) { - &status("Ban: $nick is not on $chan."); - next; - } - if (!exists $channels{$chan}{o}{$ident}) { &status("Ban: do not have ops on $chan :("); next; @@ -428,22 +548,78 @@ sub ban { &status("Banning $mask from $chan."); &rawout("MODE $chan +b $mask"); + $ban++; } + + return $ban; +} + +sub unban { + my ($mask,$chan) = @_; + my (@chans) = ($chan =~ /^\*?$/) ? (keys %channels) : lc($chan); + my $ban = 0; + + &DEBUG("unban: mask = $mask, chan = @chans"); + + foreach $chan (@chans) { + if (!exists $channels{$chan}{o}{$ident}) { + &status("unBan: do not have ops on $chan :("); + next; + } + + &status("Removed ban $mask from $chan."); + &rawout("MODE $chan -b $mask"); + $ban++; + } + + return $ban; } sub quit { my ($quitmsg) = @_; &status("QUIT $param{'ircNick'} has quit IRC ($quitmsg)"); - $conn->quit($quitmsg); + if (defined $conn) { + $conn->quit($quitmsg); + } else { + &WARN("quit: could not quit!"); + } } sub nick { my ($nick) = @_; + if (!defined $nick) { + &ERROR("nick: nick == NULL."); + return; + } + + if (defined $ident and $nick eq $ident) { + &WARN("nick: nick == ident == '$ident'."); + } + + my $bad = 0; + $bad++ if (exists $nuh{ $param{'ircNick'} }); + $bad++ if (&IsNickInAnyChan($param{'ircNick'})); + + if ($bad) { + &WARN("Nick: not going to try and get my nick back. [". + scalar(localtime). "]"); + return; + } + if ($nick =~ /^$mask{nick}$/) { rawout("NICK ".$nick); + + if (defined $ident) { + &status("nick: Changing nick to $nick (from $ident)"); + } else { + &DEBUG("first time nick change."); + $ident = $nick; + } + return 1; } + &DEBUG("nick: failed... why oh why (nick => $nick)"); return 0; } @@ -461,43 +637,54 @@ sub invite { # Usage: &joinNextChan(); sub joinNextChan { if (scalar @joinchan) { - my $chan = shift @joinchan; + $chan = shift @joinchan; &joinchan($chan); if (my $i = scalar @joinchan) { &status("joinNextChan: $i chans to join."); } - } else { - return unless (&IsParam("chanServ_ops")); - if (!$nickserv) { - &DEBUG("jNC: nickserv/chanserv not up?"); - } - my @chans = split(/[\s\t]+/, $param{'chanServ_ops'}); - foreach $chan (keys %channels) { - next unless (grep /^$chan$/i, @chans); + return; + } - if (!exists $channels{$chan}{'o'}{$ident}) { - &status("ChanServ ==> Requesting ops for $chan."); - &rawout("PRIVMSG ChanServ :OP $chan $ident"); - } - } + # !scalar @joinchan: + my @c = &getJoinChans(); + if (exists $cache{joinTime} and scalar @c) { + my $delta = time() - $cache{joinTime} - 5; + my $timestr = &Time2String($delta); + my $rate = sprintf("%.1f", $delta / @c); + delete $cache{joinTime}; + + &status("time taken to join all chans: $timestr; rate: $rate sec/join"); + } + + # chanserv check: global channels, in case we missed one. + foreach ( &ChanConfList("chanServ_ops") ) { + &chanServCheck($_); } } -# Usage: &GetNickInChans($nick,$chan); -sub GetNickInChans { +# Usage: &getNickInChans($nick); +sub getNickInChans { my ($nick) = @_; my @array; foreach (keys %channels) { - next unless (grep /^\Q$nick\E$/i, keys %{$channels{$_}{''}}); + next unless (grep /^\Q$nick\E$/i, keys %{ $channels{$_}{''} }); push(@array, $_); } return @array; } +# Usage: &getNicksInChan($chan); +sub getNicksInChan { + my ($chan) = @_; + my @array; + + return keys %{ $channels{$chan}{''} }; +} + sub IsNickInChan { my ($nick,$chan) = @_; @@ -508,9 +695,13 @@ sub IsNickInChan { return 0; } - if (grep /^\Q$nick\E$/i, keys %{$channels{$chan}{''}}) { + if (grep /^\Q$nick\E$/i, keys %{ $channels{$chan}{''} }) { return 1; } else { + foreach (keys %channels) { + next unless (/[A-Z]/); + &DEBUG("iNIC: hash channels contains mixed cased chan!!!"); + } return 0; } } @@ -519,7 +710,7 @@ sub IsNickInAnyChan { my ($nick) = @_; foreach $chan (keys %channels) { - next unless (grep /^\Q$nick\E$/i, keys %{$channels{$chan}{''}}); + next unless (grep /^\Q$nick\E$/i, keys %{ $channels{$chan}{''} }); return 1; } return 0; @@ -527,14 +718,25 @@ sub IsNickInAnyChan { # Usage: &validChan($chan); sub validChan { + # todo: use $c instead? my ($chan) = @_; + if (!defined $chan or $chan =~ /^\s*$/) { + return 0; + } + if (lc $chan ne $chan) { &WARN("validChan: lc chan != chan. ($chan); fixing."); $chan =~ tr/A-Z/a-z/; } - if (exists $channels{$chan}) { + # it's possible that this check creates the hash if empty. + if (defined $channels{$chan} or exists $channels{$chan}) { + if ($chan eq "_default") { +# &WARN("validC: chan cannot be _default! returning 0!"); + return 0; + } + return 1; } else { return 0; @@ -542,13 +744,13 @@ sub validChan { } ### -# Usage: &DeleteUserInfo($nick,@chans); -sub DeleteUserInfo { +# Usage: &delUserInfo($nick,@chans); +sub delUserInfo { my ($nick,@chans) = @_; my ($mode,$chan); foreach $chan (@chans) { - foreach $mode (keys %{$channels{$chan}}) { + foreach $mode (keys %{ $channels{$chan} }) { # use grep here? next unless (exists $channels{$chan}{$mode}{$nick}); @@ -565,38 +767,131 @@ sub clearChanVars { sub clearIRCVars { &DEBUG("clearIRCVars() called!"); - %channels = (); - @joinchan = split /[\t\s]+/, $param{'join_channels'}; + undef %channels; + undef %floodjoin; + + @joinchan = &getJoinChans(1); + $cache{joinTime} = time(); } -sub makeChanList { - my ($str) = @_; - my $inverse = 0; +sub getJoinChans { + my($show) = @_; my @chans; + my @skip; + + foreach (keys %chanconf) { + next if ($_ eq "_default"); - if ($str eq "ALL") { - return(keys %channels); - } elsif ($str =~ s/^ALL but //i) { - @chans = keys %channels; - foreach (split /[\s\t\,]+/, lc $str) { - @chans = grep !/^$_$/, @chans; + my $val = $chanconf{$_}{autojoin}; + my $skip = 0; + + if (defined $val) { + $skip++ if ($val eq "0"); + } else { + $skip++; } - } else { - foreach (split /[\s\t\,]+/, lc $str) { - next unless (&validChan($_)); - push(@chans, $_); + + if ($skip) { + push(@skip, $_); + next; } + + push(@chans, $_); } - @chans; + my $str; + if (scalar @skip) { + $str = "channels not auto-joining: @skip (joining: @chans)"; + } else { + $str = "auto-joining all chans: @chans"; + } + + &status("Chans: ".$str) if ($show); + + return @chans; } sub closeDCC { +# &DEBUG("closeDCC called."); + foreach $type (keys %dcc) { - foreach (keys %{$dcc{$type}}) { - &DEBUG("closing DCC $type to $_ (FIXME)."); -### $irc->removeconn($dcc{$type}{$_}); + next if ($type ne uc($type)); + + foreach $nick (keys %{ $dcc{$type} }) { + next unless (defined $nick); + &status("DCC CHAT: closing DCC $type to $nick."); + next unless (defined $dcc{$type}{$nick}); + + my $ref = $dcc{$type}{$nick}; + &dccsay($nick, "bye bye, $nick") if ($type =~ /^chat$/i); + $dcc{$type}{$nick}->close(); + delete $dcc{$type}{$nick}; + &DEBUG("after close for $nick"); } + delete $dcc{$type}; + } +} + +sub joinfloodCheck { + my($who,$chan,$userhost) = @_; + + return unless (&IsChanConf("joinfloodCheck")); + + if (exists $netsplit{lc $who}) { # netsplit join. + &DEBUG("joinfloodCheck: $who was in netsplit; not checking."); + } + + if (exists $floodjoin{$chan}{$who}{Time}) { + &WARN("floodjoin{$chan}{$who} already exists?"); + } + + $floodjoin{$chan}{$who}{Time} = time(); + $floodjoin{$chan}{$who}{Host} = $userhost; + + ### Check... + foreach (keys %floodjoin) { + my $c = $_; + my $count = scalar keys %{ $floodjoin{$c} }; + next unless ($count > 5); + &DEBUG("joinflood: count => $count"); + + my $time; + foreach (keys %{ $floodjoin{$c} }) { + $time += $floodjoin{$c}{$_}{Time}; + } + &DEBUG("joinflood: time => $time"); + $time /= $count; + + &DEBUG("joinflood: new time => $time"); + } + + ### Clean it up. + my $delete = 0; + my $time = time(); + foreach $chan (keys %floodjoin) { + foreach $who (keys %{ $floodjoin{$chan} }) { + my $t = $floodjoin{$chan}{$who}{Time}; + next unless (defined $t); + + my $delta = $time - $t; + next unless ($delta > 10); + + delete $floodjoin{$chan}{$who}; + $delete++; + } + } + + &DEBUG("joinfloodCheck: $delete deleted.") if ($delete); +} + +sub getHostMask { + my($n) = @_; + + if (exists $nuh{$n}) { + return &makeHostMask($nuh{$n}); + } else { + $cache{on_who_Hack} = 1; + &rawout("WHO $n"); } }