Merge remote-tracking branch 'smcv/ready/map'

[git.ikiwiki.info.git] / IkiWiki / Plugin / blogspam.pm

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index d4b5b36d51e4417f497c234ced17f56482851091..d32c2f169d643a7db9e9fffc292201a4bf93276e 100644 (file)
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -4,11 +4,13 @@ package IkiWiki::Plugin::blogspam;
 use warnings;
 use strict;
 use IkiWiki 3.00;
+use Encode;
 
 my $defaulturl='http://test.blogspam.net:8888/';
 
 sub import {
        hook(type => "getsetup", id => "blogspam",  call => \&getsetup);
+       hook(type => "checkconfig", id => "blogspam", call => \&checkconfig);
        hook(type => "checkcontent", id => "blogspam", call => \&checkcontent);
 }
 
@@ -17,6 +19,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
+                       section => "auth",
                },
                blogspam_pagespec => {
                        type => 'pagespec',
@@ -43,30 +46,40 @@ sub getsetup () {
                },
 }
 
-sub checkcontent (@) {
-       my %params=@_;
-
+sub checkconfig () {
+       # This is done at checkconfig time because printing an error
+       # if the module is missing when a spam is posted would not
+       # let the admin know about the problem.
        eval q{
                use RPC::XML;
                use RPC::XML::Client;
        };
-       if ($@) {
-               warn($@);
-               return undef;
-       }
+       error $@ if $@;
+}
+
+sub checkcontent (@) {
+       my %params=@_;
+       my $session=$params{session};
        
-       if (exists $config{blogspam_pagespec}) {
-               return undef
-                       if ! pagespec_match($params{page}, $config{blogspam_pagespec},
-                               location => $params{page});
+       my $spec='!admin()';
+       if (exists $config{blogspam_pagespec} &&
+           length $config{blogspam_pagespec}) {
+               $spec.=" and (".$config{blogspam_pagespec}.")";
        }
 
+       my $user=$session->param("name");
+       return undef unless pagespec_match($params{page}, $spec,
+               (defined $user ? (user => $user) : ()),
+               (defined $session->remote_addr() ? (ip => $session->remote_addr()) : ()),
+               location => $params{page});
+
        my $url=$defaulturl;
-       $url = $params{blogspam_server} if exists $params{blogspam_server};
+       $url = $config{blogspam_server} if exists $config{blogspam_server};
+
        my $client = RPC::XML::Client->new($url);
 
-       my @options = split(",", $params{blogspam_options})
-               if exists $params{blogspam_options};
+       my @options = split(",", $config{blogspam_options})
+               if exists $config{blogspam_options};
 
        # Allow short comments and whitespace-only edits, unless the user
        # has overridden min-words themselves.
@@ -83,26 +96,29 @@ sub checkcontent (@) {
        # and "buy".
        push @options, "exclude=stopwords";
 
-       my $res = $client->send_request('testComment', {
-               ip => $ENV{REMOTE_ADDR},
-               comment => defined $params{diff} ? $params{diff} : $params{content},
-               subject => defined $params{subject} ? $params{subject} : "",
-               name => defined $params{author} ? $params{author} : "",
-               link => exists $params{url} ? $params{url} : "",
+       my %req=(
+               ip => $session->remote_addr(),
+               comment => encode_utf8(defined $params{diff} ? $params{diff} : $params{content}),
+               subject => encode_utf8(defined $params{subject} ? $params{subject} : ""),
+               name => encode_utf8(defined $params{author} ? $params{author} : ""),
+               link => encode_utf8(exists $params{url} ? $params{url} : ""),
                options => join(",", @options),
-               site => $config{url},
+               site => encode_utf8($config{url}),
                version => "ikiwiki ".$IkiWiki::version,
-       });
+       );
+       my $res = $client->send_request('testComment', \%req);
 
        if (! ref $res || ! defined $res->value) {
                debug("failed to get response from blogspam server ($url)");
                return undef;
        }
        elsif ($res->value =~ /^SPAM:(.*)/) {
+               eval q{use Data::Dumper};
+               debug("blogspam server reports ".$res->value.": ".Dumper(\%req));
                return gettext("Sorry, but that looks like spam to <a href=\"http://blogspam.net/\">blogspam</a>: ").$1;
        }
        elsif ($res->value ne 'OK') {
-               debug(gettext("blogspam server failure: ").$res->value);
+               debug("blogspam server failure: ".$res->value);
                return undef;
        }
        else {