GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-10-01 17:16:39 +02:00
Code Issues Projects Releases Wiki Activity

Fix recursive alias infinite loop potentional

Browse Source
This commit is contained in:
Pragmatic Software 2007-05-20 21:37:58 +00:00
parent c1ed583744
commit 9ba81accdd
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pbot2.pl
View File

@ -8,12 +8,13 @@
# Version History: # Version History:
######################## ########################
my $VERSION = "0.3.11"; my $VERSION = "0.3.12";
######################## ########################
# todo! add support for admin management # todo! add support for admin management
# todo! gah, multi-channel support pathetic # todo! gah, multi-channel support pathetic
# todo! most of this crap needs to be refactored # todo! most of this crap needs to be refactored
# 0.3.12(05/20/07): lol? Prevent recursive aliasing infinite loop, x -> a, a -> x
# 0.3.11(05/20/07): added 'alias' # 0.3.11(05/20/07): added 'alias'
# 0.3.10(05/08/05): dont ban by nick, wait for nickserv response before joining chans # 0.3.10(05/08/05): dont ban by nick, wait for nickserv response before joining chans
# 0.3.9 (05/06/05): stop logging joins, fixed join flood ban? # 0.3.9 (05/06/05): stop logging joins, fixed join flood ban?
@ -130,11 +131,11 @@ my %commands = ( version => {
my %admins = ( adminnick => { my %admins = ( adminnick => {
password => '*', password => '*',
level => 50, level => 50,
host => "localhost.com" }, host => "host.com" },
anotheradminnick => { anothernick => {
password => '*', password => '*',
level => 50, level => 20,
host => ".*.anotherhost.com" } host => ".*.wildcardhost.com" }
); );
my %channels = (); my %channels = ();
@ -919,7 +920,7 @@ sub plog {
} }
sub interpret_command { sub interpret_command {
my ($from, $nick, $host, $command) = @_; my ($from, $nick, $host, $count, $command) = @_;
my ($keyword, $arguments, $tonick); my ($keyword, $arguments, $tonick);
my $text; my $text;
@ -964,7 +965,8 @@ sub interpret_command {
$commands{$keyword}{ref_count}++; $commands{$keyword}{ref_count}++;
$commands{$keyword}{ref_user} = $nick; $commands{$keyword}{ref_user} = $nick;
return interpret_command($from, $nick, $host, $command); return "Too many levels of aliasing, aborted." if(++$count > 5);
return interpret_command($from, $nick, $host, $count, $command);
} }
} }
@ -1382,7 +1384,7 @@ sub on_public {
} }
if(defined $command) { if(defined $command) {
$result = interpret_command($from, $nick, $host, $command); $result = interpret_command($from, $nick, $host, 1, $command);
if(defined $result) { if(defined $result) {
if($result =~ s/^\/me\s+//i) { if($result =~ s/^\/me\s+//i) {
$conn->me($from, $result); $conn->me($from, $result);