Changeset 26

Timestamp:

02/13/05 23:47:36

Author:

brad

Message:

Added ping ip, source url ip matching filter for trackback pings.

Files:

• trunk/plugins/dnsbl/dnsbl.pl (modified) (6 diffs)
• trunk/plugins/dnsbl/tmpl/dnsbl.tmpl (modified) (1 diff)
• trunk/readme.txt (modified) (1 diff)

trunk/plugins/dnsbl/dnsbl.pl

@@ -38 +38 @@
-    qw( comment_filter ping_filter
-        allow_auth allow_urlless allow_priorurls
+        pingip_check
-        ipbl_enabled ipbl_moderate ipbl_service
-        domainbl_enabled domainbl_moderate domainbl_service
@@ -82 +83 @@
-    $data->{allow_urlless} = 0 unless exists $data->{allow_urlless};
-    $data->{allow_priorurls} = 0 unless exists $data->{allow_priorurls};
+    $data->{pingip_check} = 1 unless exists $data->{pingip_check};
-
-    $data->{ipbl_enabled} = 1 unless exists $data->{ipbl_enabled};
@@ -170 +172 @@
-    my @tests;
-    push @tests, \&priorurl_check if $data->{allow_priorurls} && $data->{source_url};
+    push @tests, \&pingip_check if $data->{pingip_check} && $data->{pingip_check} && $data->{__type} ne 'comment';
-    push @tests, \&cache_check if $data->{caching_enabled} && $data->{cache_limit};
-    push @tests, \&headers_check if $data->{headers_enabled};
@@ -244 +247 @@
-## Each returns one of three states:  0 to reject, 1 to accept, undef
-## to ignore, allowing the next test to run.
+
+sub pingip_check {
+    my ($eh, $app, $obj, $data) = @_;
+
+    my $pingip = $obj->ip;
+    my $domain = extract_urls($obj->source_url, 1);
+    my $domainip = checkdns($domain);
+    return BLOCK unless $domainip; # domain is not registered yet... do not
+                                   # accept
+
+    return IGNORE if $pingip eq $domainip;
+
+    # test for class C ip match
+    $domainip =~ s/\.\d+$//;
+    $pingip =~ s/\.\d+$//;
+    return IGNORE if $pingip eq $domainip;
+
+    return BLOCK;
+}
-
-sub priorurl_check {
@@ -436 +458 @@
-
-sub extract_urls {
-
+, $single
-
-    # unmunge so we can see encoded urls as well
@@ -456 +478 @@
-            next;
-        }
+        return $domain if $single;
-        my $last = $#parts;
-        my $start = length($parts[$last]) < 3 ? 2 : 1;

trunk/plugins/dnsbl/tmpl/dnsbl.tmpl

@@ -33 +33 @@
-    <input type="checkbox" name="allow_auth" value="1" <TMPL_IF NAME=ALLOW_AUTH>checked="checked"</TMPL_IF> /> Don't filter comments from valid TypeKey identities.<br />
-    <input type="checkbox" name="allow_urlless" value="1" <TMPL_IF NAME=ALLOW_URLLESS>checked="checked"</TMPL_IF> /> Only filter comments with hyperlinks (approves comments with no discernable URL).<br />
-
+
+
-    </p>
-

trunk/readme.txt

@@ -110 +110 @@
-      a previously approved comment's URL (but only if the text of the
-      comment itself contains no additional URLs).
+    * Added option to block pings whose IP does not match the IP address
+      of the source URL.
-
-11/5/2004 - 1.1 release