Ignorance of 'quantity'/'non_uniqXXX'/etc checks for 'goodhost' (kindly commented...

[pukiwiki/pukiwiki_sandbox.git] / spam / spam.php

diff --git a/spam/spam.php b/spam/spam.php
index 3cc34ff..6d76ad6 100644 (file)
--- a/spam/spam.php
+++ b/spam/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.201 2007/08/17 14:33:32 henoheno Exp $
+// $Id: spam.php,v 1.202 2007/08/18 09:10:58 henoheno Exp $
 // Copyright (C) 2006-2007 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 //
@@ -367,32 +367,31 @@ function get_blocklist($list = '')
                if (file_exists(SPAM_INI_FILE)) {
                        $blocklist = array();
                        include(SPAM_INI_FILE);
+                       //      $blocklist['list'] = array(
+                       //      //'goodhost' => FALSE;
+                       //      'badhost' => TRUE;
+                       // );
                        //      $blocklist['badhost'] = array(
                        //              '*.blogspot.com',       // Blog services's subdomains (only)
                        //              'IANA-examples' => '#^(?:.*\.)?example\.(?:com|net|org)$#',
                        //      );
-                       if (isset($blocklist['list'])) {
-                               $regexes['list'] = & $blocklist['list'];
-                       } else {
-                               // Default
-                               $blocklist['list'] = array(
-                                       'goodhost' => FALSE,
-                                       'badhost'  => TRUE,
-                               );
-                       }
-                       foreach(array_keys($blocklist['list']) as $_list) {
-                               if (! isset($blocklist[$_list])) continue;
-                               foreach ($blocklist[$_list] as $key => $value) {
-                                       if (is_array($value)) {
-                                               $regexes[$_list][$key] = array();
-                                               foreach($value as $_key => $_value) {
-                                                       get_blocklist_add($regexes[$_list][$key], $_key, $_value);
+                       foreach(array('pre', 'list') as $special) {
+                               if (! isset($blocklist[$special])) continue;
+                               $regexes[$special] = $blocklist[$special];
+                               foreach(array_keys($blocklist[$special]) as $_list) {
+                                       if (! isset($blocklist[$_list])) continue;
+                                       foreach ($blocklist[$_list] as $key => $value) {
+                                               if (is_array($value)) {
+                                                       $regexes[$_list][$key] = array();
+                                                       foreach($value as $_key => $_value) {
+                                                               get_blocklist_add($regexes[$_list][$key], $_key, $_value);
+                                                       }
+                                               } else {
+                                                       get_blocklist_add($regexes[$_list], $key, $value);
                                                }
-                                       } else {
-                                               get_blocklist_add($regexes[$_list], $key, $value);
                                        }
+                                       unset($blocklist[$_list]);
                                }
-                               unset($blocklist[$_list]);
                        }
                }
        }
@@ -527,7 +526,9 @@ function check_uri_spam($target = '', $method = array())
                ),
        );
 
+       // ----------------------------------------
        // Aliases
+
        $sum     = & $progress['sum'];
        $is_spam = & $progress['is_spam'];
        $progress['method'] = & $method;        // Argument
@@ -535,7 +536,9 @@ function check_uri_spam($target = '', $method = array())
        $hosts   = & $progress['hosts'];
        $asap    = isset($method['asap']);
 
+       // ----------------------------------------
        // Init
+
        if (! is_array($method) || empty($method)) {
                $method = check_uri_spam_method();
        }
@@ -544,6 +547,9 @@ function check_uri_spam($target = '', $method = array())
        }
        if (! isset($sum['quantity'])) $sum['quantity'] = 0;
 
+       // ----------------------------------------
+       // Recurse
+
        if (is_array($target)) {
                foreach($target as $str) {
                        if (! is_string($str)) continue;
@@ -583,6 +589,9 @@ function check_uri_spam($target = '', $method = array())
                return $progress;
        }
 
+       // ----------------------------------------
+       // Area measure
+
        // Area: There's HTML anchor tag
        if ((! $asap || ! $is_spam) && isset($method['area_anchor'])) {
                $key = 'area_anchor';
@@ -612,13 +621,44 @@ function check_uri_spam($target = '', $method = array())
        // Return if ...
        if ($asap && $is_spam) return $progress;
 
+       // ----------------------------------------
        // URI: Pickup
+
        $pickups = uri_pickup_normalize(spam_uri_pickup($target, $method));
+       $hosts = array();
+       foreach ($pickups as $key => $pickup) {
+               $hosts[$key] = & $pickup['host'];
+       }
 
        // Return if ...
        if (empty($pickups)) return $progress;
 
+       // ----------------------------------------
+       // URI: Bad host <pre-filter> (Separate good/bad hosts from $hosts)
+
+       if ((! $asap || ! $is_spam) && isset($method['badhost'])) {
+               $list    = get_blocklist('pre');
+               $blocked = blocklist_distiller($hosts, array_keys($list), $asap);
+               foreach($list as $key=>$type){
+                       if (! $type) unset($blocked[$key]); // Ignore goodhost etc
+               }
+               unset($list);
+               if (! empty($blocked)) $is_spam['badhost'] = TRUE;
+       }
+
+       // Return if ...
+       if ($asap && $is_spam) return $progress;
+
+       // Remove blocked from $pickups
+       foreach(array_keys($pickups) as $key) {
+               if (! isset($hosts[$key])) {
+                       unset($pickups[$key]);
+               }
+       }
+
+       // ----------------------------------------
        // URI: Check quantity
+
        $sum['quantity'] += count($pickups);
                // URI quantity
        if ((! $asap || ! $is_spam) && isset($method['quantity']) &&
@@ -626,7 +666,9 @@ function check_uri_spam($target = '', $method = array())
                $is_spam['quantity'] = TRUE;
        }
 
+       // ----------------------------------------
        // URI: used inside HTML anchor tag pair
+
        if ((! $asap || ! $is_spam) && isset($method['uri_anchor'])) {
                $key = 'uri_anchor';
                foreach($pickups as $pickup) {
@@ -642,7 +684,9 @@ function check_uri_spam($target = '', $method = array())
                }
        }
 
+       // ----------------------------------------
        // URI: used inside 'BBCode' pair
+
        if ((! $asap || ! $is_spam) && isset($method['uri_bbcode'])) {
                $key = 'uri_bbcode';
                foreach($pickups as $pickup) {
@@ -658,7 +702,9 @@ function check_uri_spam($target = '', $method = array())
                }
        }
 
+       // ----------------------------------------
        // URI: Uniqueness (and removing non-uniques)
+
        if ((! $asap || ! $is_spam) && isset($method['non_uniquri'])) {
 
                $uris = array();
@@ -683,9 +729,11 @@ function check_uri_spam($target = '', $method = array())
        // Return if ...
        if ($asap && $is_spam) return $progress;
 
+       // ----------------------------------------
        // Host: Uniqueness (uniq / non-uniq)
-       foreach ($pickups as $pickup) $hosts[] = & $pickup['host'];
+
        $hosts = array_unique($hosts);
+
        if (isset($sum['uniqhost'])) $sum['uniqhost'] += count($hosts);
        if ((! $asap || ! $is_spam) && isset($method['non_uniqhost'])) {
                $sum['non_uniqhost'] = $sum['quantity'] - $sum['uniqhost'];
@@ -697,20 +745,29 @@ function check_uri_spam($target = '', $method = array())
        // Return if ...
        if ($asap && $is_spam) return $progress;
 
+       // ----------------------------------------
        // URI: Bad host (Separate good/bad hosts from $hosts)
-       if ((! $asap || ! $is_spam) && isset($method['badhost'])) {
 
-               // is_badhost()
-               $list = get_blocklist('list');
-               $blocked = blocklist_distiller($hosts, array_keys($list), $asap);
+       if ((! $asap || ! $is_spam) && isset($method['badhost'])) {
+               $list    = get_blocklist('list');
+               $blocked = array_merge_leaves(
+                       $blocked,
+                       blocklist_distiller($hosts, array_keys($list), $asap),
+                       FALSE
+               );
                foreach($list as $key=>$type){
                        if (! $type) unset($blocked[$key]); // Ignore goodhost etc
                }
                unset($list);
-
                if (! empty($blocked)) $is_spam['badhost'] = TRUE;
        }
 
+       // Return if ...
+       //if ($asap && $is_spam) return $progress;
+
+       // ----------------------------------------
+       // End
+
        return $progress;
 }