Changeset 1117

Timestamp:

08/03/07 20:16:51 (16 months ago)

Author:

earle

Message:

Add support for IP blacklisting modules.

Location:

trunk

Files:

• Build.PL (modified) (2 diffs)
• Changes (modified) (1 diff)
• MANIFEST (modified) (2 diffs)
• lib/OpenGuides.pm (modified) (2 diffs)
• lib/OpenGuides/Config.pm (modified) (5 diffs)
• t/79_host_blacklist.t (added)
• templates/blacklisted_host.tt (added)

trunk/Build.PL

@@ -106 +106 @@
    licence_name licence_url licence_info_url moderation_requires_password
    enable_node_image enable_common_categories enable_common_locales
-   spam_detector_module static_path static_url send_moderation_notifications
+   spam_detector_module host_checker_module static_path static_url
+   send_moderation_notifications
   ) ) {
     my $q_method = $var . "__qu";
@@ -333 +334 @@
                       "backlink_results.tt",
                       "banner.tt",
+                      "blacklisted_host.tt",
                       "delete_confirm.tt",
                       "delete_done.tt",

trunk/Changes

@@ -2 +2 @@
 
 More detailed changelogs can be found at
-http://dev.openguides.org/log/trunk
+<http://dev.openguides.org/log/trunk>.
 
 0.62    
         Ensure that all modules we ship are versioned.
+        Added experimental support for local IP blacklisting modules; see the
+          display_node method in "perldoc OpenGuides" for details.
 
 0.61    4 July 2007

trunk/MANIFEST

@@ -31 +31 @@
 templates/backlink_results.tt
 templates/banner.tt
+templates/blacklisted_host.tt
 templates/delete_confirm.tt
 templates/delete_done.tt
@@ -143 +144 @@
 t/77_send_email.t
 t/78_about.t
+t/79_host_blacklist.t
 t/templates/15_test.tt
 wiki.cgi

trunk/lib/OpenGuides.pm

@@ -177 +177 @@
 parameter was passed.)
 
+If you have specified the C<host_checker_module> option in your
+C<wiki.conf>, this method will attempt to call the <blacklisted_host>
+method of that module to determine whether the host requesting the node
+has been blacklisted. If this method returns true, then the 
+C<blacklisted_host.tt> template will be used to display an error message.
+
+The C<blacklisted_host> method will be passed a scalar containing the host's
+IP address.
+
 =cut
 
@@ -191 +200 @@
 
     my %tt_vars;
+
+    # If we can, check to see if requesting host is blacklisted.
+    my $host_checker = $config->host_checker_module;
+    my $is_blacklisted;
+    if ( $host_checker ) {
+        eval {
+            eval "require $host_checker";
+            $is_blacklisted = $host_checker->blacklisted_host(CGI->new->remote_host);
+        };
+    }
+
+    if ( $is_blacklisted ) {
+        my $output = OpenGuides::Template->output(
+            wiki     => $self->wiki,
+            config   => $config,
+            template => "blacklisted_host.tt",
+            vars     => {
+                          not_editable => 1,
+                        },
+        );
+        return $output if $return_output;
+        print $output;
+        return;
+    }
 
     $tt_vars{home_name} = $self->config->home_name;

trunk/lib/OpenGuides/Config.pm

@@ -4 +4 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.01';
+$VERSION = '0.02';
 
 use Carp qw( croak );
@@ -25 +25 @@
    licence_name licence_url licence_info_url moderation_requires_password
    enable_node_image enable_common_categories enable_common_locales
-   spam_detector_module static_path static_url send_moderation_notifications
+   spam_detector_module host_checker_module static_path static_url
+   send_moderation_notifications
 );
 my @questions = map { $_ . "__qu" } @variables;
@@ -112 +113 @@
                      licence_info_url => "",
                      spam_detector_module => "",
+                     host_checker_module => "",
                      static_path => "/usr/local/share/openguides/static",
                      send_moderation_notifications => 1
@@ -195 +197 @@
         licence_info_url => "What is the URL to your local page about your licensing policy?",
         spam_detector_module => "What module would you like to use for spam detection? (optional)",
+        host_checker_module => "What module would you like to use to run an IP blacklist? (optional)",
         static_path => "What directory should we install static content (CSS, images, javascript) to?",
         static_url => "What is the URL corresponding to the static content?",
@@ -324 +327 @@
 =item * spam_detector_module
 
+=item * host_checker_module
+
 =item * static_path