Changeset 95

Timestamp:

04/13/05 12:27:08

Author:

brad

Message:

Updated logging to be more consistent and more informative.

Files:

• trunk/plugins/spamlookup/spamlookup.pl (modified) (19 diffs)

trunk/plugins/spamlookup/spamlookup.pl

@@ -212 +212 @@
-    $data->{__blog} = MT::Blog->load($obj->blog_id);
-    return 0 unless $data->{__blog};
-    $data->{__blogname} = qq{"}.$data->{__blog}->name.qq{" (id }.$obj->blog_id.qq{)};
-
-    my $pdata;
@@ -260 +259 @@
-    my ($result, @errors);
-    foreach (@tests) {
+        delete $data->{__reason};
-        $result = $_->[0]->($eh, $app, $obj, $data);
-
-
-
+
+
+
+
-        }
-        if (defined $result && ($result == ACCEPT)) {
@@ -340 +341 @@
-}
-
+sub log_message {
+    # arguments to this function:
+    # Reason: textual reason for block/moderate action
+    # Object: the object being acted upon
+    # Test: the name of the test that caused the action
+    # Result: BLOCK or MODERATE constant
+    # BlogID: the blog id for this object
+    # Blog: the blog name for this object
+
+    my %args = @_;
+
+    my $obj = $args{Object};
+
+    $args{Result} = $args{Result} == BLOCK ? "Blocking" : "Moderating";
+    $args{Type} = ref $obj eq 'MT::Comment' ? 'Comment' : 'TrackBack Ping';
+    if (ref $obj eq 'MT::Comment') {
+        $args{EntryID} = $obj->entry_id;
+    } elsif ($obj->tb_id) {
+        my $tb = MT::Trackback->load($obj->tb_id);
+        if ($tb->entry_id) {
+            $args{EntryID} = $tb->entry_id;
+        } else {
+            $args{CategoryID} = $tb->category_id;
+            if (my $cat = MT::Category->load($args{CategoryID})) {
+                $args{Category} = $cat->label;
+                $args{Title} = $args{Category};
+            }
+        }
+    }
+    if ($args{EntryID}) {
+        if (my $entry = MT::Entry->load($args{EntryID})) {
+            $args{Entry} = $entry->title;
+            $args{Title} = $args{Entry};
+        }
+    }
+    $args{ObjType} = $args{EntryID} ? "entry" : "category";
+    $args{ObjID} = $args{EntryID} || $args{CategoryID};
+
+    # Blocking Comment for blog "My Blog", entry "Once upon a time": URL count test reported "REASON"
+    return sprintf(qq{%s %s for blog "%s" (%d), %s "%s" (%d): %s reported %s},
+        $args{Result}, $args{Type}, $args{Blog}, $args{BlogID},
+        $args{ObjType}, $args{Title}, $args{ObjID},
+        $args{Test}, $args{Reason});
+}
+
-## "Check" routines... one for each type of test we perform...
-## Each returns one of three states:  0 to reject, 1 to accept, undef
@@ -358 +404 @@
-        my $entry = MT::Entry->load($tb->entry_id);
-        if ($entry && !$entry->allow_pings) {
-eh->error("Blocking ".$data->{__type}." on blog id ".$obj->blog_id." for entry id ".$tb->entry_id." since it no longer allows pings.")
+data->{__reason} = "Entry no longer accepts TrackBack pings."
-            return BLOCK;
-        }
@@ -364 +410 @@
-        my $cat = MT::Category->load($tb->category_id);
-        if ($cat && !$cat->allow_pings) {
-eh->error("Blocking ".$data->{__type}." on blog id ".$obj->blog_id." for category id ".$tb->category_id." since it no longer allows pings.")
+data->{__reason} = "Category no longer accepts TrackBack pings."
-            return BLOCK;
-        }
@@ -396 +442 @@
-        $match ||= wordlist_match($decodedtext, $data->{wordlist_block});
-        if ($match) {
-eh->error("Blocking ".$data->{__type}." on blog ".$data->{__blogname}." based on wordlist match: ".$match)
+data->{__reason} = "Wordlist match: $match"
-            return BLOCK;
-        }
@@ -405 +451 @@
-        $match ||= wordlist_match($decodedtext, $data->{wordlist_moderate});
-        if ($match) {
-eh->error("Moderating ".$data->{__type}." on blog ".$data->{__blogname}." based on wordlist match: ".$match)
+data->{__reason} = "Wordlist match: $match"
-            return MODERATE;
-        }
@@ -448 +494 @@
-
-    if (!defined $inpass) {
-eh->error("Blocking TrackBack ping for blog " . $obj->blog_id . " because passphrase was not supplied at all.")
+data->{__reason} = "Passphrase was not supplied."
-        return BLOCK;
-    }
@@ -460 +506 @@
-    return IGNORE if lc($text) eq lc($inpass);
-
-
-
+
-    return $data->{tbpass_moderate} ? MODERATE : BLOCK;
-}
@@ -475 +520 @@
-    my $inpass = $app->{query}->param($formfield);
-    if (!defined $inpass) {
-eh->error("Blocking comment for blog " . $obj->blog_id . " because passphrase was not supplied at all.")
+data->{__reason} = "Passphrase was not supplied."
-        return BLOCK;
-    }
@@ -487 +532 @@
-    return IGNORE if lc($text) eq lc($inpass);
-
-
-
+
-    return $data->{commentpass_moderate} ? MODERATE : BLOCK;
-}
@@ -499 +543 @@
-    my $domainip = checkdns($domain);
-    if (!$domainip) {
-
-
-
+
-        return BLOCK;
-    }
@@ -525 +567 @@
-
-    my $action = ($result == MODERATE ? "Moderating" : "Blocking");
-
-
-
+
+
-
-    return $result;
@@ -611 +652 @@
-        }
-        # yep - this is a good proxy
-
-
-
+
-        $data->{is_proxy} = 1;
-        return $data->{proxycheck_moderate} ? MODERATE : BLOCK;
@@ -650 +689 @@
-        # added by the system that sent the request
-        $data->{__proxy} = $obj->ip;
-
-
-
+
-        return $data->{headers_moderate} ? MODERATE : BLOCK;
-    }
@@ -664 +701 @@
-    my $nurls = $data->{__nurls} || 0;
-    if ($nurls >= $data->{urlcount_block_limit}) {
-
-
+
-        return BLOCK;
-    } elsif ($nurls >= $data->{urlcount_moderate_limit}) {
-        # what should we do for trackbacks?
-        if($type eq 'comment') {
-
-
+
-            return MODERATE;
-        }
@@ -690 +725 @@
-        my $result = $cache->{$obj->ip}->{result};
-        if ($result != ACCEPT) {
-
-
-
-
+
-            return $result;
-        }
@@ -715 +747 @@
-            if (checkdns("$url.$service.")) {
-                $data->{__service} = $service;
-
-
-
+
-                return $data->{domainbl_moderate} ? MODERATE : BLOCK;
-            }
@@ -736 +766 @@
-        if (checkdns("$d.$c.$b.$a.$service.")) {
-            $data->{__service} = $service;
-
-
-
+
-            return $data->{ipbl_moderate} ? MODERATE : BLOCK;
-        }