Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 470412 - [SEEN] Sanitize regexp and improve performance of new wildcard matching. Patch by Cww <cwwmozilla@gmail.com>, r=Wolf

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@255622 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
psychoticwolf%carolina.rr.com 2008-12-23 01:05:06 +00:00
parent 9d5cc87853
commit bd38b026a7
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mozilla/webtools/mozbot/BotModules/Seen.bm
View File

@ -125,18 +125,32 @@ sub DoSeen {
$self->say($event, $self->{'overrides'}->{$who});
} else {
my $regexp;
my @nicksToList;
if ($who =~ m!/(.*)/!) {
my @nicksToList = ();
if ($who =~ m!^/(\S+)/$!) { # shouldn't allow mix and match or blank RE or spaces.
$regexp = $1;
@nicksToList = grep(/$regexp/i, (keys %{$seen->{'times'}}));
my $re = $self->sanitizeRegexp($regexp); # security + safety first!
$re = qr/$re/i; #precompile for performance
if ('' =~ $re){ # will match everything, throw error.
$self->say($event, 'That pattern matches everything, please be more specific.');
return;
}
@nicksToList = grep {$_ =~ $re} (keys %{$seen->{'times'}});
$pattern = 1;
} else {
if ($who =~ /\*/){ # no point going through the motions if there's no wildcard.
$regexp = quotemeta(lc $who);
$regexp =~ s/\\\*/.*/g; # replace the escaped * from quotemeta with a .*
@nicksToList = grep(/^$regexp$/, (keys %{$seen->{'times'}}));
$regexp =~ s/\\\*/\\S*/g; # replace the escaped * from quotemeta with a \S* (XXX wanted: the ? wildcard)
my $re = qr/^$regexp$/;
if ('' =~ $re){ # will match everything, throw error.
$self->say($event, 'That pattern matches everything, please be more specific.');
return;
}
@nicksToList = grep {$_ =~ $re} (keys %{$seen->{'times'}});
} else {
@nicksToList = (lc $who) if defined($seen->{'times'}{lc $who}); # short circuit for the majority of uses
}
$pattern = 0;
}
if (@nicksToList > $self->{'maxLines'}) { # if it's more than the set threshold, don't flood :)
$self->say($event,"There are more than $self->{'maxLines'} nicks matching that wildcard, please be more specific.");
} elsif (@nicksToList > 0) {