diff options
| -rw-r--r-- | config-default/commands.xml | 45 | ||||
| -rw-r--r-- | config-default/users.xml | 59 | ||||
| -rwxr-xr-x | meta.pl | 18 | ||||
| -rw-r--r-- | modules/command.pl | 19 | ||||
| -rw-r--r-- | modules/event.pl | 93 | ||||
| -rw-r--r-- | modules/xml.pl | 23 |
6 files changed, 137 insertions, 120 deletions
diff --git a/config-default/commands.xml b/config-default/commands.xml index 098c104..7b8ecab 100644 --- a/config-default/commands.xml +++ b/config-default/commands.xml @@ -46,17 +46,25 @@ $conn->privmsg($event->{to}->[0], "$result results found."); ]]> </command> - <command cmd="^;user add (\S+) ?(\S*)$" flag="a"> + <command cmd="^;userx add (\S+) (\S+)$" flag="a"> <![CDATA[ - my $nick = lc $1; - my $host = $2; - if ($host eq '') { $host = 'IDENTIFY'; } - $::users->{person}->{$nick} = { 'host' => $host }; + my $acct = lc $1; + my $flags = $2; + if ($flags =~ /d/) { + $conn->privmsg($event->{to}->[0], "The d flag may not be assigned over IRC. Edit the configuration manually."); + return; + } + $::users->{person}->{$acct} = { 'flags' => $flags }; ASM::XML->writeUsers(); - $conn->privmsg($event->{to}->[0], "Hiya $nick"); + $conn->privmsg($event->{to}->[0], "Flags for NickServ account $acct set to $flags"); + ]]> + </command> + <command cmd="^;user add (\S+) ?(\S*)$" flag="a"> + <![CDATA[ + $conn->privmsg($event->{to}->[0], "This command has been deprecated"); ]]> </command> - <command cmd="^;user flags (\S+) ?$"> + <command cmd="^;userx? flags (\S+) ?$"> <![CDATA[ my $nick = lc $1; if (defined($::users->{person}->{$nick}->{flags})) { @@ -66,7 +74,7 @@ } ]]> </command> - <command cmd="^;user flags (\S+) (\S+)$" flag="a"> + <command cmd="^;userx? flags (\S+) (\S+)$" flag="a"> <![CDATA[ my $nick = lc $1; my $flags = $2; @@ -79,7 +87,7 @@ $conn->privmsg($event->{to}->[0], "Flags for $nick set to $flags"); ]]> </command> - <command cmd="^;user del (\S+)$" flag="a"> + <command cmd="^;userx? del (\S+)$" flag="a"> <![CDATA[ my $nick = lc $1; delete($::users->{person}->{$nick}); @@ -87,25 +95,6 @@ $conn->privmsg($event->{to}->[0], "Byebye $nick"); ]]> </command> -<!-- <command cmd="^;user flags show (\S+)$" flag="a"> - <![CDATA[ - my $nick = lc $1; - if (defined($::users->{person}->{$nick}->{flags})) { - $conn->privmsg($event->{to}->[0], "Flags for $nick: $::users->{person}->{$nick}->{flags}"); - } else { - $conn->privmsg($event->{to}->[0], "$nick has no flags"); - } - ]]> - </command> --> - <command cmd="^;autoban (\S+)$" flag="a"> - <![CDATA[ - my $chan = $1; - my $set = $::channels->{channel}->{$chan}->{op}; - if ($set eq "no") { $set = "when"; } else { $set = "no"; } - $::channels->{channel}->{$chan}->{op} = $set; - $conn->privmsg($event->{to}->[0], "Operator action for $chan set to \"$set\"."); - ]]> - </command> <command cmd="^;target (\S+) (\S+) ?(\S*)$" flag="a"> <![CDATA[ my $chan = $1; diff --git a/config-default/users.xml b/config-default/users.xml index f86542d..b4e455b 100644 --- a/config-default/users.xml +++ b/config-default/users.xml @@ -1,32 +1,31 @@ <people> - <person id="afterdeath" flags="hodat" host="freenode/weird-exception/network-troll/afterdeath" /> - <person id="afterdeath_" flags="hodat" host="freenode/weird-exception/network-troll/afterdeath" /> - <person id="dave2" flags="oath" host="freenode/staff/dave2" /> - <person id="denny" flags="ha" host="freenode/staff/denny" /> - <person id="dlange" flags="oath" host="about/linux/staff/dlange" /> - <person id="dmcdevit" flags="oath" host="IDENTIFY" /> - <person id="dungodung" flags="oath" host="wikimedia/dungodung" /> - <person id="errantego" flags="doath" host="freenode/jester/errantego" /> - <person id="gary" flags="oath" host="freenode/staff/colchester-lug.gary" /> - <person id="jonathand" flags="oath" host="freenode/staff/jonathand" /> - <person id="kibble" flags="oath" host="wikimedia/Cbrown1023" /> - <person id="m0trn_th1" flags="th" host="pdpc/supporter/professional/th1" /> - <person id="marienz" flags="oath" host="freenode/staff/marienz" /> - <person id="martinp23" flags="oath" host="freenode/staff/wikimedia.martinp23" /> - <person id="mquin" flags="hota" host="freenode/staff/mquin" /> - <person id="nhandler" flags="oath" host="freenode/staff/ubuntu.member.nhandler" /> - <person id="njan" flags="oath" host="freenode/staff/njan" /> - <person id="petersymonds" flags="oath" host="wikimedia/petersymonds" /> - <person id="pricechild" flags="oath" host="freenode/staff/ubuntu.member.pricechild" /> - <person id="richih" flags="oath" host="freenode/staff/richih" /> - <person id="sauvin" flags="oath" host="about/linux/staff/sauvin" /> - <person id="seanw" flags="oath" host="freenode/staff-emeritus/wikimedia.sean-whitton" /> - <person id="snowolf" flags="oath" host="wikimedia/Snowolf" /> - <person id="thehelpfulone" flags="oath" host="wikimedia/Thehelpfulone" /> - <person id="tomaw" flags="oathd" host="freenode/staff/tomaw" /> - <person id="troubled" flags="oath" host="unaffiliated/troubled" /> - <person id="werdan7" flags="oath" host="freenode/staff/wikimedia.werdan7" /> - <person id="wildpikachu" flags="oath" host="about/linux/staff/wildpikachu" /> - <person id="windowshasyou" flags="o" host="about/linux/staff/windowshasyou" /> - <person id="zymurgy" flags="o" host="about/linux/staff/sauvin" /> + <person id="afterdeath" flags="hodat" /> + <person id="cbrown1023" flags="oath" /> + <person id="charitwo" flags="oath" /> + <person id="dave2" flags="oath" /> + <person id="denny" flags="ha" /> + <person id="dlange" flags="oathd" /> + <person id="dmcdevit" flags="oath" /> + <person id="dungodung" flags="oath" /> + <person id="errantego" flags="doath" /> + <person id="gary" flags="oath" /> + <person id="jonathand" flags="oath" /> + <person id="marienz" flags="oath" /> + <person id="martinp23" flags="oath" /> + <person id="mquin" flags="hota" /> + <person id="nhandler" flags="oath" /> + <person id="njan" flags="oath" /> + <person id="petersymonds" flags="oath" /> + <person id="pricechild" flags="oath" /> + <person id="richih" flags="oath" /> + <person id="sauvin" flags="oath" /> + <person id="seanw" flags="oath" /> + <person id="snowolf" flags="oath" /> + <person id="th1" flags="th" /> + <person id="thehelpfulone" flags="oath" /> + <person id="tomaw" flags="oathd" /> + <person id="troubled" flags="oath" /> + <person id="werdan7" flags="oath" /> + <person id="wildpikachu" flags="oath" /> + <person id="windowshasyou" flags="oath" /> </people> @@ -17,7 +17,9 @@ use Getopt::Long; %::eline=(); $::pass = ''; @::string_blacklist=(); -@::joinrate=(); #I really need to stop doing this shit +$::netsplit = 0; +$::debug = 0; +$::cset = ''; BEGIN { my @modules = qw/Util Xml Inspect Event Services Log Command Classes Mysql/; @@ -26,21 +28,23 @@ require 'modules/' . lc $_ . '.pl' foreach @modules; sub init { my ( $conn, $host ); - my $debug = 0; my $irc = new Net::IRC; - $::cset = ''; - GetOptions( 'debug|d!' => \$debug, + GetOptions( 'debug|d!' => \$::debug, 'pass|p:s' => \$::pass, 'config|c:s' => \$::cset ); - $::debug = $debug; + if ($::cset eq '') { + $::cset = 'config-default'; + } else { + $::cset = "config-$::cset"; + } ASM::XML->readXML(); mkdir($::settings->{log}->{dir}); $::log = ASM::Log->new($::settings->{log}); $::pass = $::settings->{pass} if $::pass eq ''; $host = ${$::settings->{server}}[rand @{$::settings->{server}}]; print "Connecting to $host\n"; - $irc->debug($debug); + $irc->debug($::debug); $::db = ASM::DB->new($::mysql->{db}, $::mysql->{host}, $::mysql->{port}, $::mysql->{user}, $::mysql->{pass}, $::mysql->{table}, $::mysql->{dblog}); $conn = $irc->newconn( Server => $host, Port => $::settings->{port} || '6667', @@ -49,7 +53,7 @@ sub init { Username => $::settings->{username}, Password => $::settings->{pass}, Pacing => 1 ); - $conn->debug($debug); + $conn->debug($::debug); $::inspector = ASM::Inspect->new(); $::services = ASM::Services->new(); $::commander = ASM::Commander->new(); diff --git a/modules/command.pl b/modules/command.pl index 889a3de..ded53a5 100644 --- a/modules/command.pl +++ b/modules/command.pl @@ -20,26 +20,17 @@ sub command my $cmd = $args; my $d1; my $nick = lc $event->{nick}; + my $acct = lc $::sn{$nick}->{account}; # return 0 unless (ASM::Util->speak($event->{to}->[0])); foreach my $command ( @{$::commands->{command}} ) { unless (ASM::Util->speak($event->{to}->[0])) { next unless (defined($command->{nohush}) && ($command->{nohush} eq "nohush")); } - if (defined($command->{flag})) { - next unless defined($::users->{person}->{$nick}); - next unless defined($::users->{person}->{$nick}->{flags}); - next unless (grep {$_ eq $command->{flag}} split('', $::users->{person}->{$nick}->{flags})); - if ($::users->{person}->{$nick}->{host} ne 'IDENTIFY') { - next unless (lc $::users->{person}->{$nick}->{host} eq lc $event->{host}); - } - else { - if ( $cmd =~ /$command->{cmd}/ ){ - push (@{$::idqueue{$nick}}, [$cmd, $command, $event]); - $conn->sl("whois $nick $nick"); - last; - } - } + if (defined($command->{flag})) { #If the command is restricted, + next unless defined($::users->{person}->{$acct}); #make sure the requester has an account + next unless defined($::users->{person}->{$acct}->{flags}); #make sure the requester has flags defined + next unless (grep {$_ eq $command->{flag}} split('', $::users->{person}->{$acct}->{flags})); #make sure the requester has the needed flags } if ($cmd=~/$command->{cmd}/) { print strftime("%F %T ", gmtime) . "$event->{from} told me: $cmd \n"; diff --git a/modules/event.pl b/modules/event.pl index a8a9d99..a659461 100644 --- a/modules/event.pl +++ b/modules/event.pl @@ -59,13 +59,22 @@ sub new $conn->add_handler('318', \&whois_end); $conn->add_handler('311', \&whois_user); $conn->add_handler('352', \&on_whoreply); + $conn->add_handler('354', \&on_whoxreply); + $conn->add_handler('account', \&on_account); bless($self); return $self; } - + +sub on_account +{ + my ($conn, $event) = @_; + $::sn{lc $event->{nick}}{account} = lc $event->{args}->[0]; +} + sub on_connect { my ($conn, $event) = @_; # need to check for no services $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 } sub on_join { @@ -75,20 +84,12 @@ sub on_join { my $nick = lc $event->{nick}; my $chan = lc $event->{to}->[0]; my $rate; - push( @::joinrate, time ); - while ( time >= $::joinrate[0] + 1 ) { - last if ( $#{ @::joinrate } == 0 ); - shift( @::joinrate ); - } - $rate = $#{ @::joinrate}+1; - print "on_join rate = $rate\n" if $::debug; - if ( $rate == 20 ) { - $conn->privmsg('##asb-nexus', "AfterDeath: I think I'm seeing a netjoin!"); - } + print Dumper($event) if $::debug; if ( lc $conn->{_nick} eq lc $nick) { $::sc{$chan} = {}; mkdir($::settings->{log}->{dir} . $chan); - $conn->sl("who $chan"); +# $conn->sl("who $chan"); + $conn->sl('who ' . $chan . ' %tcfnuhra,314'); # I don't know what the hell this was for but I'm disabling it for now # #TODO: make it settable via config. Hardcoded channames ftl. # if ($chan eq '##linux') { @@ -107,20 +108,31 @@ sub on_join { } @mship = (@mship, $chan); $::sn{$nick}->{mship} = \@mship; - $::inspector->inspect( $conn, $event ); - $::db->logg($event); } else { $::sn{$nick} = {}; $::sn{$nick}->{mship} = [ $chan ]; $::sn{$nick}->{dnsbl} = 0; - if (defined($::needgeco{$nick})) { - $::needgeco{$nick} = [ @{$::needgeco{$nick}}, $evcopy ]; - $::db->logg($event); - } else { - $::needgeco{$nick} = [ $evcopy ]; - $conn->sl("whois $nick"); - } + $::sn{$nick}->{netsplit} = 0; + $::sn{$nick}->{gecos} = $event->{args}->[1]; + $::sn{$nick}->{user} = $event->{user}; + $::sn{$nick}->{host} = $event->{host}; + $::sn{$nick}->{account} = lc $event->{args}->[0]; +# if (defined( $::needgeco{$lnick} )) { +# foreach my $event (@{$::needgeco{$lnick}}) { +# $::inspector->inspect($conn, $event); +# $::db->logg( $event ); +# } +# delete $::needgeco{$lnick}; +# if (defined($::needgeco{$nick})) { +# $::needgeco{$nick} = [ @{$::needgeco{$nick}}, $evcopy ]; +# $::db->logg($event); +# } else { +# $::needgeco{$nick} = [ $evcopy ]; +# $conn->sl("whois $nick"); +# } } + $::inspector->inspect( $conn, $event ) unless $::netsplit; + $::db->logg($event); $::log->logg( $event ); } @@ -193,14 +205,20 @@ sub on_quit } $event->{to} = \@channels; $::db->logg( $event ); - delete($::sn{lc $event->{nick}}); - $::inspector->inspect( $conn, $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"); + $::netsplit = 1; + $conn->schedule(60*60, sub { $::netsplit = 0; }); + } + $::inspector->inspect( $conn, $event ) unless $::netsplit; $::log->logg( $event ); + delete($::sn{lc $event->{nick}}); } sub blah { my ($self, $event) = @_; + print Dumper($event) if $::debug; $::inspector->inspect($self, $event); } @@ -403,12 +421,41 @@ sub whois_user { } } +sub on_whoxreply +{ + my ($conn, $event) = @_; + return unless $event->{args}->[1] eq '314'; + my ($tgt, $magic, $chan, $user, $host, $nick, $flags, $account, $gecos) = @{$event->{args}}; + my ($voice, $op) = (0, 0); + print Dumper($event) if $::debug; + $op = 1 if ( $flags =~ /\@/ ); + $voice = 1 if ($flags =~ /\+/); + $nick = lc $nick; $chan = lc $chan; + $::sn{$nick} = {} unless defined $::sn{lc $nick}; + my @mship=(); + if (defined($::sn{$nick}->{mship})) { + @mship = @{$::sn{$nick}->{mship}}; + } + @mship = grep { lc $_ ne $chan } @mship; + @mship = (@mship, $chan); + $::sn{$nick}->{mship} = \@mship; + $::sn{$nick}->{gecos} = $gecos; + $::sn{$nick}->{user} = $user; + $::sn{$nick}->{host} = $host; + $::sn{$nick}->{account} = lc $account; + $::sc{$chan}{users}{$nick} = {}; + $::sc{$chan}{users}{$nick}{op} = $op; + $::sc{$chan}{users}{$nick}{voice} = $voice; + +} + sub on_whoreply { my ($conn, $event) = @_; my ($tgt, $chan, $user, $host, $server, $nick, $flags, $hops_and_gecos) = @{$event->{args}}; my ($voice, $op) = (0, 0); my ($hops, $gecos); + print Dumper($event) if $::debug; $op = 1 if ( $flags =~ /\@/ ); $voice = 1 if ($flags =~ /\+/); if ($hops_and_gecos =~ /^(\d+) (.*)$/) { diff --git a/modules/xml.pl b/modules/xml.pl index ce7712d..30b5f30 100644 --- a/modules/xml.pl +++ b/modules/xml.pl @@ -8,9 +8,7 @@ use IO::All; $::xs1 = XML::Simple->new( KeyAttr => ['id'], Cache => [ qw/storable memcopy/ ]); sub readXML { - my ( $p ) = $::cset; #@_; - $p = 'default' if $p eq ''; - $p = "config-$p"; + my ( $p ) = $::cset; my @fchan = ( 'event', keys %::RISKS ); $::settings = $::xs1->XMLin( "$p/settings.xml", ForceArray => ['host'], 'GroupTags' => { altnicks => 'altnick', server => 'host', autojoins => 'autojoin' }); $::channels = $::xs1->XMLin( "$p/channels.xml", ForceArray => \@fchan ); @@ -21,9 +19,7 @@ sub readXML { } sub writeXML { - my ( $p ) = $::cset; #@_; - $p = 'default' if $p eq ''; - $p = "config-$p"; + my ( $p ) = $::cset; $::xs1->XMLout($::settings, RootName => 'settings', KeyAttr => ['id'], GroupTags => { altnicks => 'altnick', server => 'host', autojoins => 'autojoin' }, ValueAttr => { debug => 'content', nick => 'content', port => 'content', @@ -35,24 +31,15 @@ sub writeXML { } sub writeChannels { - my ( $p ) = $::cset; #@_; - $p = 'default' if $p eq ''; - $p = "config-$p"; - $::xs1->XMLout($::channels, RootName => 'channels', KeyAttr => ['id']) > io("$p/channels.xml"); + $::xs1->XMLout($::channels, RootName => 'channels', KeyAttr => ['id']) > io("$::cset/channels.xml"); } sub writeUsers { - my ( $p ) = $::cset; #@_; - $p = 'default' if $p eq ''; - $p = "config-$p"; - $::xs1->XMLout($::users, RootName => 'people', KeyAttr => ['id']) > io("$p/users.xml"); + $::xs1->XMLout($::users, RootName => 'people', KeyAttr => ['id']) > io("$::cset/users.xml"); } sub writeSettings { - my ( $p ) = $::cset; #@_; - $p = 'default' if $p eq ''; - $p = "config-$p"; - $::xs1->XMLout($::settings, RootName => 'settings', GroupTags => { altnicks => 'altnick', server => 'host', autojoins => 'autojoin' }, NoAttr => 1) > io("$p/settings.xml"); + $::xs1->XMLout($::settings, RootName => 'settings', GroupTags => { altnicks => 'altnick', server => 'host', autojoins => 'autojoin' }, NoAttr => 1) > io("$::cset/settings.xml"); } return 1; |