check every regex, not just first #246

msimerson · 2015-12-17T18:26:03Z

This corrects an issue raised by Chris Dallimore on the email list.

To: qpsmtpd@perl.org
From: Chris Dallimore <snip>
Subject: helo plugin fails to match badhelo

The helo plugin fails to match any entries in badhelo, as the is_regex_match sub returns after the first (usually unsuccessful) test.

This works for me:

--- a/plugins/helo
+++ b/plugins/helo
@@ -301,40 +301,27 @@

sub is_in_badhelo {
    my ($self, $host) = @_;
-
-    my $error = "I do not believe you are $host.";
+    my $error = "Your HELO hostname is not allowed";

    $host = lc $host;
    foreach my $bad ($self->qp->config('badhelo')) {
        if ($bad =~ /[\{\}\[\]\(\)\^\$\|\*\+\?\\\!]/) {    # it's a regexp
-            return $self->is_regex_match($host, $bad);
+            #$self->log( LOGDEBUG, "is regex ($bad)");
+            if (substr($bad, 0, 1) eq '!') {
+                $bad = substr $bad, 1;
+                if ($host !~ /$bad/) {
+                    #$self->log( LOGDEBUG, "matched negative pattern (\!$bad)");
+                    return $error, "badhelo negative pattern match (\!$bad)";
        }
-        if ($host eq lc $bad) {
-            return $error, "in badhelo";
        }
+            elsif ($host =~ /$bad/) {
+                #$self->log( LOGDEBUG, "matched ($bad)");
+                return $error, "badhelo pattern match ($bad)";
    }
-    return;
}
-
-sub is_regex_match {
-    my ($self, $host, $pattern) = @_;
-
-    my $error = "Your HELO hostname is not allowed";
-
-    #$self->log( LOGDEBUG, "is regex ($pattern)");
-    if (substr($pattern, 0, 1) eq '!') {
-        $pattern = substr $pattern, 1;
-        if ($host !~ /$pattern/) {
-
-            #$self->log( LOGDEBUG, "matched ($pattern)");
-            return $error, "badhelo pattern match ($pattern)";
+        elsif ($host eq lc $bad) {
+            return $error, "($bad) in badhelo";
        }
-        return;
-    }
-    if ($host =~ /$pattern/) {
-
-        #$self->log( LOGDEBUG, "matched ($pattern)");
-        return $error, "badhelo pattern match ($pattern)";
    }
    return;
}

check *every* regex, not just first

msimerson added bug fix in progress labels Dec 17, 2015

msimerson force-pushed the master branch from 6e38afb to efdaacd Compare December 17, 2015 18:42

check *every* regex, not just first

965f4fc

msimerson force-pushed the master branch from efdaacd to 965f4fc Compare December 17, 2015 18:47

msimerson added a commit that referenced this pull request Dec 20, 2015

Merge pull request #246 from msimerson/master

66e76f5

check *every* regex, not just first

msimerson merged commit 66e76f5 into smtpd:master Dec 20, 2015

msimerson removed the in progress label Dec 20, 2015

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

check every regex, not just first #246

check every regex, not just first #246

check *every* regex, not just first #246

check *every* regex, not just first #246

Conversation

check every regex, not just first #246

check every regex, not just first #246