From db5b04d263036f53c2cbd429d2da019baafc2a12 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 1 Mar 2015 06:08:04 +0400 Subject: modules/event.pl: Narrow down a regex (at a glance I have no idea wtf that regex does and I'm normally not too bad at deciphering horrible Cthulhu regex so please forgive me for the horribly useless commit message; it's 3 AM. --bcode) --- modules/event.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/event.pl b/modules/event.pl index 06e366c..05003eb 100644 --- a/modules/event.pl +++ b/modules/event.pl @@ -727,7 +727,8 @@ sub on_banlist my ($conn, $event) = @_; my ($me, $chan, $ban, $banner, $bantime) = @{$event->{args}}; $::sc{lc $chan}{bans}{$ban} = { bannedBy => $banner, bannedOn => $bantime }; - if ($ban =~ /^\*\!\*\@(.*)$/) { + if ($ban =~ /^\*\!\*\@((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]))$/) { + # ASM::Util->dprint("banlist hostname $ban $1", 'sync'); my $ip = ASM::Util->getHostIP($1); $::sc{lc $chan}{ipbans}{$ip} = { bannedBy => $banner, bannedOn => $bantime } if defined($ip); } @@ -738,7 +739,8 @@ sub on_quietlist my ($conn, $event) = @_; my ($me, $chan, $mode, $ban, $banner, $bantime) = @{$event->{args}}; $::sc{lc $chan}{quiets}{$ban} = { bannedBy => $banner, bannedOn => $bantime }; - if ($ban =~ /^\*\!\*\@(.*)$/) { + if ($ban =~ /^\*\!\*\@((([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]))$/) { + # ASM::Util->dprint("quietlist hostname $ban $1", 'sync'); my $ip = ASM::Util->getHostIP($1); $::sc{lc $chan}{ipquiets}{$ip} = { bannedBy => $banner, bannedOn => $bantime } if defined($ip); } -- cgit v1.2.3