GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-26 22:09:26 +01:00
Code Issues Projects Releases Wiki Activity

AntiFlood now detects based on *!user@host instead of nick

Browse Source
This commit is contained in:
Pragmatic Software 2010-06-06 05:19:31 +00:00
parent 96fd2d7c7a
commit 96be537c39
2 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
PBot/AntiFlood.pm
View File

@ -47,6 +47,26 @@ sub initialize {
$pbot->timer->register(sub { $self->prune_message_history }, 60 * 60 * 1); $pbot->timer->register(sub { $self->prune_message_history }, 60 * 60 * 1);
} }
sub get_flood_account {
my ($self, $nick, $user, $host) = @_;
return $nick if exists ${ $self->message_history }{$nick};
foreach my $n (keys %{ $self->{message_history} }) {
my $userhost = "$user\@$host";
print "cmp ${ $self->{message_history} }{$n}{hostmask} vs $userhost\n";
if(${ $self->{message_history} }{$n}{hostmask} =~ /\Q$userhost\E/i) {
$self->{pbot}->logger->log("Using existing hostmask found with nick $n\n");
print "return $n\n";
return $n;
}
print "fail\n";
}
print "undef\n";
return undef;
}
sub check_flood { sub check_flood {
my ($self, $channel, $nick, $user, $host, $text, $max_messages, $max_time, $mode) = @_; my ($self, $channel, $nick, $user, $host, $text, $max_messages, $max_time, $mode) = @_;
my $now = gettimeofday; my $now = gettimeofday;
@ -57,21 +77,23 @@ sub check_flood {
return if $nick eq $self->{pbot}->botnick; return if $nick eq $self->{pbot}->botnick;
if(exists ${ $self->message_history }{$nick}) { my $account = $self->get_flood_account($nick, $user, $host);
if(defined $account) {
#$self->{pbot}->logger->log("nick exists\n"); #$self->{pbot}->logger->log("nick exists\n");
if(not exists ${ $self->message_history }{$nick}{$channel}) { if(not exists ${ $self->message_history }{$account}{$channel}) {
#$self->{pbot}->logger->log("adding new channel for existing nick\n"); #$self->{pbot}->logger->log("adding new channel for existing nick\n");
${ $self->message_history }{$nick}{$channel}{offenses} = 0; ${ $self->message_history }{$account}{$channel}{offenses} = 0;
${ $self->message_history }{$nick}{$channel}{join_watch} = $mode; # FLOOD_CHAT = 0; FLOOD_JOIN = 1 ${ $self->message_history }{$account}{$channel}{join_watch} = $mode; # FLOOD_CHAT = 0; FLOOD_JOIN = 1
${ $self->message_history }{$nick}{$channel}{messages} = []; ${ $self->message_history }{$account}{$channel}{messages} = [];
} }
#$self->{pbot}->logger->log("appending new message\n"); #$self->{pbot}->logger->log("appending new message\n");
push(@{ ${ $self->message_history }{$nick}{$channel}{messages} }, { timestamp => $now, msg => $text, mode => $mode }); push(@{ ${ $self->message_history }{$account}{$channel}{messages} }, { timestamp => $now, msg => $text, mode => $mode });
my $length = $#{ ${ $self->message_history }{$nick}{$channel}{messages} } + 1; my $length = $#{ ${ $self->message_history }{$account}{$channel}{messages} } + 1;
if($max_messages > $self->{pbot}->{MAX_NICK_MESSAGES}) { if($max_messages > $self->{pbot}->{MAX_NICK_MESSAGES}) {
$self->{pbot}->logger->log("Warning: max_messages greater than MAX_NICK_MESSAGES; truncating.\n"); $self->{pbot}->logger->log("Warning: max_messages greater than MAX_NICK_MESSAGES; truncating.\n");
@ -79,7 +101,7 @@ sub check_flood {
} }
if($length >= $self->{pbot}->{MAX_NICK_MESSAGES}) { if($length >= $self->{pbot}->{MAX_NICK_MESSAGES}) {
my %msg = %{ shift(@{ ${ $self->message_history }{$nick}{$channel}{messages} }) }; my %msg = %{ shift(@{ ${ $self->message_history }{$account}{$channel}{messages} }) };
#$self->{pbot}->logger->log("shifting message off top: $msg{msg}, $msg{timestamp}\n"); #$self->{pbot}->logger->log("shifting message off top: $msg{msg}, $msg{timestamp}\n");
$length--; $length--;
} }
@ -88,28 +110,28 @@ sub check_flood {
if($length >= $max_messages) { if($length >= $max_messages) {
$self->{pbot}->logger->log("More than $max_messages messages spoken, comparing time differences ($max_time)\n"); $self->{pbot}->logger->log("More than $max_messages messages spoken, comparing time differences ($max_time)\n");
my %msg = %{ @{ ${ $self->message_history }{$nick}{$channel}{messages} }[$length - $max_messages] }; my %msg = %{ @{ ${ $self->message_history }{$account}{$channel}{messages} }[$length - $max_messages] };
my %last = %{ @{ ${ $self->message_history }{$nick}{$channel}{messages} }[$length - 1] }; my %last = %{ @{ ${ $self->message_history }{$account}{$channel}{messages} }[$length - 1] };
$self->{pbot}->logger->log("Comparing " . int($last{timestamp}) . " against " . int($msg{timestamp}) . ": " . (int($last{timestamp} - $msg{timestamp})) . " seconds\n"); $self->{pbot}->logger->log("Comparing " . int($last{timestamp}) . " against " . int($msg{timestamp}) . ": " . (int($last{timestamp} - $msg{timestamp})) . " seconds\n");
if($last{timestamp} - $msg{timestamp} <= $max_time && not $self->{pbot}->admins->loggedin($channel, "$nick!$user\@$host")) { if($last{timestamp} - $msg{timestamp} <= $max_time && not $self->{pbot}->admins->loggedin($channel, "$nick!$user\@$host")) {
if($mode == $self->{FLOOD_JOIN}) { if($mode == $self->{FLOOD_JOIN}) {
if(${ $self->message_history }{$nick}{$channel}{join_watch} >= $max_messages) { if(${ $self->message_history }{$account}{$channel}{join_watch} >= $max_messages) {
$self->{pbot}->chanops->quiet_user_timed("*!$user\@$host", $channel, 60 * 60 * 2); $self->{pbot}->chanops->quiet_user_timed("*!$user\@$host", $channel, 60 * 60 * 2);
$self->{pbot}->logger->log("$nick!$user\@$host banned for two hours due to join flooding.\n"); $self->{pbot}->logger->log("$nick!$user\@$host banned for two hours due to join flooding.\n");
$self->{pbot}->conn->privmsg($nick, "You have been banned from $channel for two hours due to join flooding."); $self->{pbot}->conn->privmsg($nick, "You have been banned from $channel for two hours due to join flooding.");
${ $self->message_history }{$nick}{$channel}{join_watch} = $max_messages - 2; # give them a chance to rejoin ${ $self->message_history }{$account}{$channel}{join_watch} = $max_messages - 2; # give them a chance to rejoin
} }
} elsif($mode == $self->{FLOOD_CHAT}) { } elsif($mode == $self->{FLOOD_CHAT}) {
${ $self->message_history }{$nick}{$channel}{offenses}++; ${ $self->message_history }{$account}{$channel}{offenses}++;
my $length = ${ $self->message_history }{$nick}{$channel}{offenses} ** ${ $self->message_history }{$nick}{$channel}{offenses} * ${ $self->message_history }{$nick}{$channel}{offenses} * 30; my $length = ${ $self->message_history }{$account}{$channel}{offenses} ** ${ $self->message_history }{$account}{$channel}{offenses} * ${ $self->message_history }{$account}{$channel}{offenses} * 30;
if($channel =~ /^#/) { #channel flood (opposed to private message or otherwise) if($channel =~ /^#/) { #channel flood (opposed to private message or otherwise)
return if exists $self->{pbot}->chanops->{quieted_masks}->{"*!*\@$host"}; return if exists $self->{pbot}->chanops->{quieted_masks}->{"*!*\@$host"};
if($mode == $self->{FLOOD_CHAT}) { if($mode == $self->{FLOOD_CHAT}) {
$self->{pbot}->chanops->quiet_user_timed("*!$user\@$host", $channel, $length); $self->{pbot}->chanops->quiet_user_timed("*!$user\@$host", $channel, $length);
$self->{pbot}->logger->log("$nick $channel flood offense ${ $self->message_history }{$nick}{$channel}{offenses} earned $length second quiet\n"); $self->{pbot}->logger->log("$nick $channel flood offense ${ $self->message_history }{$account}{$channel}{offenses} earned $length second quiet\n");
if($length < 1000) { if($length < 1000) {
$length = "$length seconds"; $length = "$length seconds";
@ -121,7 +143,7 @@ sub check_flood {
} }
} else { # private message flood } else { # private message flood
return if exists $self->{pbot}->ignorelist->{ignore_list}->{"$nick!$user\@$host"}{$channel}; return if exists $self->{pbot}->ignorelist->{ignore_list}->{"$nick!$user\@$host"}{$channel};
$self->{pbot}->logger->log("$nick msg flood offense ${ $self->message_history }{$nick}{$channel}{offenses} earned $length second ignore\n"); $self->{pbot}->logger->log("$nick msg flood offense ${ $self->message_history }{$account}{$channel}{offenses} earned $length second ignore\n");
$self->{pbot}->{ignorelistcmds}->ignore_user("", "floodcontrol", "", "", "$nick!$user\@$host $channel $length"); $self->{pbot}->{ignorelistcmds}->ignore_user("", "floodcontrol", "", "", "$nick!$user\@$host $channel $length");
if($length < 1000) { if($length < 1000) {
$length = "$length seconds"; $length = "$length seconds";
@ -136,10 +158,10 @@ sub check_flood {
} }
if($mode == $self->{FLOOD_JOIN}) { if($mode == $self->{FLOOD_JOIN}) {
${ $self->message_history }{$nick}{$channel}{join_watch}++; ${ $self->message_history }{$account}{$channel}{join_watch}++;
$self->{pbot}->logger->log("$nick $channel joinwatch adjusted: ${ $self->message_history }{$nick}{$channel}{join_watch}\n"); $self->{pbot}->logger->log("$nick $channel joinwatch adjusted: ${ $self->message_history }{$account}{$channel}{join_watch}\n");
} elsif($mode == $self->{FLOOD_CHAT}) { } elsif($mode == $self->{FLOOD_CHAT}) {
${ $self->message_history }{$nick}{$channel}{join_watch} = 0; ${ $self->message_history }{$account}{$channel}{join_watch} = 0;
} }
} else { } else {
#$self->{pbot}->logger->log("brand new nick addition\n"); #$self->{pbot}->logger->log("brand new nick addition\n");
@ -147,6 +169,7 @@ sub check_flood {
${ $self->message_history }{$nick}{$channel}{offenses} = 0; ${ $self->message_history }{$nick}{$channel}{offenses} = 0;
${ $self->message_history }{$nick}{$channel}{join_watch} = $mode; # FLOOD_CHAT = 0; FLOOD_JOIN = 1 ${ $self->message_history }{$nick}{$channel}{join_watch} = $mode; # FLOOD_CHAT = 0; FLOOD_JOIN = 1
${ $self->message_history }{$nick}{$channel}{messages} = []; ${ $self->message_history }{$nick}{$channel}{messages} = [];
${ $self->message_history }{$nick}{hostmask} = "$nick!$user\@$host";
push(@{ ${ $self->message_history }{$nick}{$channel}{messages} }, { timestamp => $now, msg => $text, mode => $mode }); push(@{ ${ $self->message_history }{$nick}{$channel}{messages} }, { timestamp => $now, msg => $text, mode => $mode });
} }
} }

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 => 148, BUILD_REVISION => 149,
BUILD_DATE => "2010-06-05", BUILD_DATE => "2010-06-05",
}; };