From 14eb8a77479507875fe77640dd044d1a462e568a Mon Sep 17 00:00:00 2001 From: William Heimbigner Date: Wed, 9 May 2012 16:06:14 +0000 Subject: I got tired of checking things in individually so here's one big massive checkin --- config-default/channels.xml | 109 +++++++++++++++++++++++++++++--------------- config-default/users.xml | 6 +++ freenoder1893 | 1 - modules/classes.pl | 5 +- modules/event.pl | 7 +-- modules/inspect.pl | 2 +- modules/mysql.pl | 2 +- 7 files changed, 86 insertions(+), 46 deletions(-) delete mode 100644 freenoder1893 diff --git a/config-default/channels.xml b/config-default/channels.xml index 4a68575..a23eebb 100644 --- a/config-default/channels.xml +++ b/config-default/channels.xml @@ -12,7 +12,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -36,8 +36,9 @@ ##hamradio-ops - + + @@ -77,8 +78,7 @@ - charitwo - charitwo + vegadark @@ -107,6 +107,14 @@ + + + + + + + + @@ -141,6 +149,7 @@ Plazma Plazma-Rooolz mquin + ttuttle njan denny Gary @@ -171,7 +180,7 @@ #ubuntu-ops-monitor - + @@ -196,24 +205,28 @@ flyingparchment roberthl + Snowolf seanw + charitwo vvv #wikimedia-ops - + + + tomaw - + - + @@ -230,13 +243,13 @@ #reddit-priv - + #reddit-priv - + @@ -256,22 +269,26 @@ #ubuntu-ops-monitor - + #ubuntu-fr-ops-log - + - + + + + + charitwo @@ -296,8 +313,11 @@ Thehelpfulone Tanvir jeremyb + Logan_ charitwo - log + Rjd0060 + Fluffernutter + TBloemink #wikimedia-ops @@ -308,9 +328,9 @@ killiondude matanya Tanvir - log Thehelpfulone Snowolf + Logan_ Kanonkas @@ -330,6 +350,7 @@ jeremyb AfterDeath charitwo + TBloemink slakr @@ -360,6 +381,17 @@ Barras PeterSymonds + Snowolf + Thehelpfulone + Snowolf + Rjd0060 + TBloemink + Savh + Fluffernutter + Pmlineditor + juancarlos + omtsh + MBisanz #wikimedia-ops @@ -369,6 +401,7 @@ Thehelpfulone Snowolf + Rjd0060 #wikimedia-ops @@ -401,6 +434,7 @@ Snowolf Tanvir TBloemink + Rjd0060 bumm13_ Cyrius DanielB @@ -433,21 +467,17 @@ + AfterDeath Werdan7 - wimt Thehelpfulone PeterSymonds - Not_the_NSA Prodego - Jake_Wartenberg - AfterDeath shimgray stwalkerster Jamesofur SpitfireWP Barras jeremyb - Maximillion DeltaQuad Theo10011 Gfoley4 @@ -456,20 +486,12 @@ Steven_Zhang Shirik TBloemink - Rudha-an + foxj + Rjd0060 Cobi - Cbrown1023 - DanielB Golbez - JohnReaves - Luna-Santin - Mike42 - Tawker - NotASpy - |X| agkwiki KFP - Ryanposs slakr Courcelles closedmouth @@ -510,8 +532,8 @@ Barras Barras Ocaasi + mabdul KFP - chzz Gfoley4 sonia @@ -525,7 +547,16 @@ #wikimedia-ops - + + + + + + + + + + 5:3 dnsbl.ahbl.org @@ -536,14 +567,13 @@ .* .* ^DCC (SEND|S?CHAT) |\bDCC (SEND|S?CHAT) "?[A-Za-z0-9]+"? \d+ \d+ \d+ - DCC SEND - DCC SEND + \bDCC SEND + \bDCC SEND \bDCC SEND debugantispambotdebug dnsbl.dronebl.org rbl.efnetrbl.org - ([^ ]{4,} +)\1{5,} - ^(?:([A-Za-z0-9,.])(?!\1\1)){30,}$ + 10:20 (?i)\bgnaa\b (?i)\bgnaa\b 5:20 @@ -551,7 +581,9 @@ \bstartkeylogger\b|\bstopkeylogger\b (?i)(http://(\S+\.)?on\.nimp\.org|http://(\S+\.)?feenode.net|http://wikipaste\.eu|http://(\S+\.)?bioghost\.com|http://(\S+\.)?on\.zoy\.org|http://(lastmeasure|dirtysanchez|doom3|freeipods|halflife2|halo2|lastmeasure4|lastmeasureunified|softmeasure|traceroute)\.zoy\.org) contentisuseless + .*!~NUMONE@.*!REAL_NAME 4:4 + (?i).*eepsheep.* 60:10 dnsbl.njabl.org .* @@ -563,7 +595,7 @@ dnsbl.sorbs.net (suck.*dick) (?i)^sure are a ?lot of .*fags? in here - [ð-÷][€-¿]{3} + THISHASBEENDISABLED[ð-÷][€-¿]{3} 󠁟 Corey @@ -574,6 +606,7 @@ ##asb-nexus + #antispammeta diff --git a/config-default/users.xml b/config-default/users.xml index a3e01bb..80f120c 100644 --- a/config-default/users.xml +++ b/config-default/users.xml @@ -9,17 +9,22 @@ + + + + + @@ -27,6 +32,7 @@ + diff --git a/freenoder1893 b/freenoder1893 deleted file mode 100644 index 04f4837..0000000 --- a/freenoder1893 +++ /dev/null @@ -1 +0,0 @@ -freenoder1893 diff --git a/modules/classes.pl b/modules/classes.pl index 6896ce7..d747815 100644 --- a/modules/classes.pl +++ b/modules/classes.pl @@ -78,6 +78,7 @@ sub dnsbl # return unless index($event->{host}, '/') == -1; # hopefully getting rid of this won't cause shit to assplode # but I'm getting rid of it so it can detect cgi:irc shit + return 0; if (defined $rev) { print "Querying $rev$chk->{content}\n" if $::debugx{dnsbl}; my $iaddr = gethostbyname( "$rev$chk->{content}" ); @@ -151,7 +152,7 @@ sub splitflood { $text=$event->{args}->[0]; } return unless defined($text); - return unless length($text) >= 10; +# return unless length($text) >= 10; if (defined($bs{$id}{$text}) && (time <= $bs{$id}{$text} + 600)) { return 1; } @@ -181,7 +182,7 @@ sub advsplitflood { $text=$event->{args}->[0]; } return unless defined($text); - $text=~s/^\d+(.*)\d+$/$1/; + $text=~s/^\d*(.*)\d*$/$1/; return unless length($text) >= 10; if (defined($bs{$id}{$text}) && (time <= $bs{$id}{$text} + 600)) { return 1; diff --git a/modules/event.pl b/modules/event.pl index f2c6695..39c733d 100644 --- a/modules/event.pl +++ b/modules/event.pl @@ -127,6 +127,7 @@ sub on_account sub on_connect { my ($conn, $event) = @_; # need to check for no services + $conn->sl('MODE AntiSpamMeta +Q'); $conn->privmsg( 'NickServ', "ghost $::settings->{nick} $::settings->{pass}" ) if lc $event->{args}->[0] ne lc $::settings->{nick}; $conn->sl('CAP REQ :extended-join multi-prefix account-notify'); #god help you if you try to use this bot off freenode } @@ -200,7 +201,7 @@ sub on_msg my ($conn, $event) = @_; $::commander->command($conn, $event); print strftime("%F %T ", gmtime) . "(msg) " . $event->{from} . " - " . $event->{args}->[0] . "\n"; - $conn->privmsg('##asb-nexus', $event->{from} . ' told me: ' . $event->{args}->[0]); + $conn->privmsg('#antispammeta', $event->{from} . ' told me: ' . $event->{args}->[0]); } sub on_public @@ -241,9 +242,9 @@ sub on_quit $event->{to} = \@channels; $::db->logg( $event ); if (($::netsplit == 0) && ($event->{args}->[0] eq "*.net *.split")) { #special, netsplit situation - $conn->privmsg("##asb-nexus", "Entering netsplit mode - JOIN and QUIT inspection will be disabled for 60 minutes"); + $conn->privmsg("#antispammeta", "Entering netsplit mode - JOIN and QUIT inspection will be disabled for 60 minutes"); $::netsplit = 1; - $conn->schedule(60*60, sub { $::netsplit = 0; $conn->privmsg('##asb-nexus', 'Returning to regular operation'); }); + $conn->schedule(60*60, sub { $::netsplit = 0; $conn->privmsg('#antispammeta', 'Returning to regular operation'); }); } $::inspector->inspect( $conn, $event ) unless $::netsplit; $::log->logg( $event ); diff --git a/modules/inspect.pl b/modules/inspect.pl index f6b8dd1..c3a9c1a 100644 --- a/modules/inspect.pl +++ b/modules/inspect.pl @@ -32,7 +32,7 @@ sub inspect { } } else { - $iaddr = gethostbyname($event->{host}); +# $iaddr = gethostbyname($event->{host}); $rev = join('.', reverse(unpack('C4', $iaddr))).'.' if (defined $iaddr); } ## NB: isn't there a better way to do this with grep, somehow? diff --git a/modules/mysql.pl b/modules/mysql.pl index 23f9dae..ff4e0da 100644 --- a/modules/mysql.pl +++ b/modules/mysql.pl @@ -63,13 +63,13 @@ sub record #FIXME: This function is shit. Also, it doesn't work like I want it to with mode. sub logg { - return; #Disabling logging of individual stuff to mysql. no point. my $self = shift; my ($event) = @_; my $dbh = $self->{DBH_LOG}; my $table = $event->{type}; $table = 'action' if ($table eq 'caction'); $table = 'privmsg' if ($table eq 'public'); + return if (($table eq 'action') or ($table eq 'privmsg')); #Disabling logging of privmsg stuffs to mysql. no point. my $realtable = $table; $realtable = 'joins' if $realtable eq 'join'; #mysql doesn't like a table named join my $string = 'INSERT INTO `' . $realtable . '` ('; -- cgit v1.2.3