Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Watt local #10

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Watt local #10

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f87ef2
watt.com local changes
sewatt Feb 11, 2021
b5e1cac
Update bruteforceblocker.pl
sewatt Feb 11, 2021
a7b6c65
Sigh.
sewatt Feb 11, 2021
1b74a33
Remove extraneous .* at beginning and end of regexes.
sewatt Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions bruteforceblocker.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,25 @@
# the core process

while (<>) {
if (/.*Failed password.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}) port.*/i ||
/.*Failed keyboard.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}) port.*/i ||
/.*Invalid user.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn})$/i ||
/.*Did not receive identification string from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn})$/i ||
/.*Bad protocol version identification .* from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn})$/i ||
/.*User.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}) not allowed because.*/i ||
/.*error: maximum authentication attempts exceeded for.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}).*/i ||
/.*error: PAM: authentication error for.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}).*/i ||
/.*fatal: Unable to negotiate with ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}).*/i) {
if (/Failed password.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}) port/i ||
/Failed keyboard.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}) port/i ||
/Invalid user.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn})$/i ||
/Invalid user.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}) port/i ||
/Did not receive identification string from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn})$/i ||
/Bad protocol version identification .* from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn})$/i ||
/User.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}) not allowed because.*/i ||
/error: maximum authentication attempts exceeded for.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}).*/i ||
/FTP LOGIN FAILED FROM ($work->{ipv4}|$work->{ipv6}|$work->{fqdn}),/i ||
/error: PAM: authentication error for.*from ($work->{ipv4}|$work->{ipv6}|$work->{fqdn})/i ||
/fatal: Unable to negotiate with ($work->{ipv4}|$work->{ipv6}|$work->{fqdn})/i ||
/ruleset=check_relay,.*arg2=($work->{ipv4}|$work->{ipv6}).*Connection rate limit exceeded/i ||
/: [[]?($work->{ipv4}|$work->{ipv6}|$work->{fqdn})[]]? did not issue MAIL.EXPN.VRFY.ETRN during connection to /i ||
/AUTH failure.*authentication failure.*:.* relay=.*[[]($work->{ipv4}|$work->{ipv6})[]]/i ||
/: .* [[]($work->{ipv4}|$work->{ipv6})[]]: REJECT:.*InstaBLOCK.*$/ ||
0 ) {

my $IP = $1;

if ($IP =~ /$work->{fqdn}/i) {
foreach my $type (qw(AAAA A)) {
my $query = $res->search($IP, $type);
Expand Down Expand Up @@ -125,13 +133,18 @@ sub download {

sub block {
my ($IP) = shift or die "Need IP!\n";
my $query = $res->search($IP, "PTR");

while ($query && ($query->answer)[0]->type eq "CNAME") {
$query = $res->search(($query->answer)[0]->cname, "PTR");
}

my $query = $res->search($IP, "PTR");
while ($query && ($query->answer)[0]->type eq "CNAME") {
$query = $res->search(($query->answer)[0]->cname, "PTR");
}

while ($query && ($query->answer)[0]->type eq "CNAME") {
$query = $res->search(($query->answer)[0]->cname, "PTR");
}

my $RDNS = ($query && ($query->answer)[0]->type eq "PTR") ? ($query->answer)[0]->ptrdname : "not resolved";

if ($timea{$IP} && ($timea{$IP} < time - $cfg->{timeout})) {
Expand Down