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

Correct devalidation and QUIT event issues

Browse Source
This commit is contained in:
Pragmatic Software 2013-09-14 01:56:00 +00:00
parent 23d2e57527
commit 7decfdf28a
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PBot/AntiFlood.pm
View File

@ -175,8 +175,6 @@ sub add_message {
$self->message_history->{$account}->{channels}->{$channel}{join_watch}++; $self->message_history->{$account}->{channels}->{$channel}{join_watch}++;
} else { } else {
# PART or QUIT # PART or QUIT
$self->message_history->{$account}->{channels}->{$channel}{validated} = 0;
# check QUIT message for netsplits, and decrement joinwatch if found # check QUIT message for netsplits, and decrement joinwatch if found
if($text =~ /^QUIT .*\.net .*\.split/) { if($text =~ /^QUIT .*\.net .*\.split/) {
$self->message_history->{$account}->{channels}->{$channel}{join_watch}--; $self->message_history->{$account}->{channels}->{$channel}{join_watch}--;
@ -238,8 +236,7 @@ sub check_flood {
# (these events come from $channel nick!user@host, not a specific channel or nick, # (these events come from $channel nick!user@host, not a specific channel or nick,
# so they need to be dispatched to all channels the bot exists on) # so they need to be dispatched to all channels the bot exists on)
if($mode == $self->{FLOOD_JOIN} and $text =~ /^QUIT/) { if($mode == $self->{FLOOD_JOIN} and $text =~ /^QUIT/) {
foreach my $chan (lc keys %{ $self->{pbot}->channels->channels->hash }) { foreach my $chan (map lc, keys %{ $self->{pbot}->channels->channels->hash }) {
next if $chan eq $channel; # skip nick!user@host "channel" next if $chan eq $channel; # skip nick!user@host "channel"
if(not exists $self->message_history->{$account}->{channels}->{$chan}) { if(not exists $self->message_history->{$account}->{channels}->{$chan}) {
@ -251,6 +248,9 @@ sub check_flood {
} }
$self->add_message($account, $chan, $text, $mode); $self->add_message($account, $chan, $text, $mode);
# remove validation on QUITs so we check for ban-evasion when user returns at a later time
$self->message_history->{$account}->{channels}->{$chan}{validated} = 0;
} }
# don't do flood processing for QUIT events # don't do flood processing for QUIT events
@ -271,6 +271,11 @@ sub check_flood {
# do not do flood processing if channel is not in bot's channel list or bot is not set as chanop for the channel # do not do flood processing if channel is not in bot's channel list or bot is not set as chanop for the channel
return if ($channel =~ /^#/) and (not exists $self->{pbot}->channels->channels->hash->{$channel} or $self->{pbot}->channels->channels->hash->{$channel}{chanop} == 0); return if ($channel =~ /^#/) and (not exists $self->{pbot}->channels->channels->hash->{$channel} or $self->{pbot}->channels->channels->hash->{$channel}{chanop} == 0);
if($channel =~ /^#/ and $mode == $self->{FLOOD_JOIN} and $text =~ /^PART/) {
# remove validation on PART so we check for ban-evasion when user returns at a later time
$self->message_history->{$account}->{channels}->{$channel}{validated} = 0;
}
# do not do flood enforcement for this event if bot is lagging # do not do flood enforcement for this event if bot is lagging
if($self->{pbot}->lagchecker->lagging) { if($self->{pbot}->lagchecker->lagging) {
$self->{pbot}->logger->log("Disregarding enforcement of anti-flood due to lag: " . $self->{pbot}->lagchecker->lagstring . "\n"); $self->{pbot}->logger->log("Disregarding enforcement of anti-flood due to lag: " . $self->{pbot}->lagchecker->lagstring . "\n");
@ -518,9 +523,9 @@ sub devalidate_accounts {
} }
if((defined $nickserv_account and $nickserv_account eq $ban_account) or $account =~ m/^$mask$/i) { if((defined $nickserv_account and $nickserv_account eq $ban_account) or $account =~ m/^$mask$/i) {
$self->{pbot}->logger->log("anti-flood: [devalidate-accounts] $account matches $mask_original, devalidating\n"); $self->{pbot}->logger->log("anti-flood: [devalidate-accounts] $account matches $mask_original in $channel, devalidating\n");
$self->message_history->{$mask}->{channels}->{$channel}{validated} = 0; $self->message_history->{$account}->{channels}->{$channel}{validated} = 0;
} }
} }
} }

2
PBot/VERSION.pm
View File

@ -13,7 +13,7 @@ use warnings;
# These are set automatically by the build/commit script # These are set automatically by the build/commit script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 431, BUILD_REVISION => 432,
BUILD_DATE => "2013-09-13", BUILD_DATE => "2013-09-13",
}; };