提交: a47991d4760cb6819bc1d032bc3873c3f495d306 - pukiwiki (git)

Commit MetaInfo

• 修訂: a47991d4760cb6819bc1d032bc3873c3f495d306 (tree)
• 時間: 2007-01-02 16:09:21
• 作者: henoheno <henoheno>
• Commiter: henoheno

Log Message

$Id: spam.php,v 1.87 2007/01/02 05:57:51 henoheno Exp $
* Report badhost detail by mail
* Rename $method: 'non_uniq' => 'non_uniquri'
* Added $method['non_uniqhost'] allows N duped (and normalized) Hosts
NOTE: Not good for editing bookmarks (especially that have many site on _the_same_ host_, e.g. blog hosting service)
* uri_pickup(): FQDN does not have back-slashes and amps
* check_uri_spam(): Simplify

Change Summary

• modified: lib/spam.php
• modified: pukiwiki.ini.php

差異

--- a/lib/spam.php
+++ b/lib/spam.php
@@ -1,5 +1,5 @@
 <?php
-// $Id: spam.php,v 1.11 2006/12/23 04:36:40 henoheno Exp $
+// $Id: spam.php,v 1.12 2007/01/02 07:09:06 henoheno Exp $
 // Copyright (C) 2006 PukiWiki Developers Team
 // License: GPL v2 or (at your option) any later version
 
@@ -33,7 +33,7 @@ function uri_pickup($string = '', $normalize = TRUE,
 			// 3: Host
 			'\[[0-9a-f:.]+\]' . '|' .				// IPv6([colon-hex and dot]): RFC2732
 			'(?:[0-9]{1-3}\.){3}[0-9]{1-3}' . '|' .	// IPv4(dot-decimal): 001.22.3.44
-			'[^\s<>"\'\[\]:/\#?]+' . 				// FQDN: foo.example.org
+			'[^\s<>"\'\[\]:/\#?&\\\]+' . 			// FQDN: foo.example.org
 		')' .
 		'(?::([0-9]*))?' .					// 4: Port
 		'((?:/+[^\s<>"\'\[\]/\#]+)*/+)?' .	// 5: Directory path or path-info
@@ -652,7 +652,7 @@ function is_badhost($hosts = '', $asap = TRUE)
 				array('pressblog.jp', '*.pressblog.jp'),
 			);
 			foreach ($blocklist['badhost'] as $part) {
-				$_part = is_array($part) ? implode(', ', $part) : $part;
+				$_part = is_array($part) ? implode('/', $part) : $part;
 				$regex['badhost'][$_part] = '/^' . generate_glob_regex($part) . '$/i';
 			}
 		}
@@ -662,12 +662,11 @@ function is_badhost($hosts = '', $asap = TRUE)
 			$blocklist = array();
 			require(SPAM_INI_FILE);
 			foreach ($blocklist['badhost'] as $part) {
-				$_part = is_array($part) ? implode(', ', $part) : $part;
+				$_part = is_array($part) ? implode('/', $part) : $part;
 				$regex['badhost'][$_part] = '/^' . generate_glob_regex($part) . '$/i';
 			}
 		}
 	}
-	//var_dump($regex);
 
 	$result = array();
 	if (! is_array($hosts)) $hosts = array($hosts);
@@ -690,7 +689,7 @@ function is_badhost($hosts = '', $asap = TRUE)
 	return $result;
 }
 
-// Default (enabled) methods and thresholds
+// Default (enabled) methods and thresholds (for content insertion)
 function check_uri_spam_method($times = 1, $t_area = 0, $rule = TRUE)
 {
 	$times  = intval($times);
@@ -698,21 +697,22 @@ function check_uri_spam_method($times = 1, $t_area = 0, $rule = TRUE)
 
 	$positive = array(
 		// Thresholds
-		'quantity'    => 8 * $times,	// Allow N URIs
-		'non_uniq'    => 3 * $times,	// Allow N duped (and normalized) URIs
+		'quantity'     =>  8 * $times,	// Allow N URIs
+		'non_uniqhost' =>  7 * $times,	// Allow N duped (and normalized) Hosts
+		'non_uniquri'  =>  3 * $times,	// Allow N duped (and normalized) URIs
 
 		// Areas
-		'area_anchor' => $t_area,	// Using <a href> HTML tag
-		'area_bbcode' => $t_area,	// Using [url] or [link] BBCode
-		//'uri_anchor'  => $t_area,	// URI inside <a href> HTML tag
-		//'uri_bbcode'  => $t_area,	// URI inside [url] or [link] BBCode
+		'area_anchor'  => $t_area,	// Using <a href> HTML tag
+		'area_bbcode'  => $t_area,	// Using [url] or [link] BBCode
+		//'uri_anchor' => $t_area,	// URI inside <a href> HTML tag
+		//'uri_bbcode' => $t_area,	// URI inside [url] or [link] BBCode
 	);
 	if ($rule) {
 		$bool = array(
 			// Rules
-			//'asap'      => TRUE,	// Quit or return As Soon As Possible
-			'uniqhost'    => TRUE,	// Show uniq host (at block notification mail)
-			'badhost'     => TRUE,	// Check badhost
+			//'asap'   => TRUE,	// Quit or return As Soon As Possible
+			'uniqhost' => TRUE,	// Show uniq host (at block notification mail)
+			'badhost'  => TRUE,	// Check badhost
 		);
 	} else {
 		$bool = array();
@@ -736,7 +736,8 @@ function check_uri_spam($target = '', $method = array())
 		'sum' => array(
 			'quantity'    => 0,
 			'uniqhost'    => 0,
-			'non_uniq'    => 0,
+			'non_uniqhost'=> 0,
+			'non_uniquri' => 0,
 			'badhost'     => 0,
 			'area_anchor' => 0,
 			'area_bbcode' => 0,
@@ -755,11 +756,24 @@ function check_uri_spam($target = '', $method = array())
 		foreach($target as $str) {
 			// Recurse
 			$_progress = check_uri_spam($str, $method);
-			foreach (array_keys($_progress['sum']) as $key) {
-				$sum[$key] += $_progress['sum'][$key];
+			$_sum      = & $_progress['sum'];
+			$_is_spam  = & $_progress['is_spam'];
+			foreach (array_keys($_sum) as $key) {
+				$sum[$key] += $_sum[$key];
 			}
-			foreach(array_keys($_progress['is_spam']) as $key) {
-				$is_spam[$key] = TRUE;
+			foreach(array_keys($_is_spam) as $key) {
+				if (is_array($_is_spam[$key])) {
+					// Marge keys (badhost)
+					foreach(array_keys($_is_spam[$key]) as $_key) {
+						if (! isset($is_spam[$key][$_key])) {
+							$is_spam[$key][$_key] =  $_is_spam[$key][$_key];
+						} else {
+							$is_spam[$key][$_key] += $_is_spam[$key][$_key];
+						}
+					}
+				} else {
+					$is_spam[$key] = TRUE;
+				}
 			}
 			if ($asap && $is_spam) break;
 		}
@@ -843,7 +857,7 @@ function check_uri_spam($target = '', $method = array())
 	}
 
 	// URI: Uniqueness (and removing non-uniques)
-	if ((! $asap || ! $is_spam) && isset($method['non_uniq'])) {
+	if ((! $asap || ! $is_spam) && isset($method['non_uniquri'])) {
 
 		// Destructive normalize of URIs
 		uri_array_normalize($pickups);
@@ -854,9 +868,9 @@ function check_uri_spam($target = '', $method = array())
 		}
 		$count = count($uris);
 		$uris  = array_unique($uris);
-		$sum['non_uniq'] += $count - count($uris);
-		if ($sum['non_uniq'] > $method['non_uniq']) {
-			$is_spam['non_uniq'] = TRUE;
+		$sum['non_uniquri'] += $count - count($uris);
+		if ($sum['non_uniquri'] > $method['non_uniquri']) {
+			$is_spam['non_uniquri'] = TRUE;
 		}
 		if (! $asap || ! $is_spam) {
 			foreach (array_diff(array_keys($pickups),
@@ -872,17 +886,34 @@ function check_uri_spam($target = '', $method = array())
 		return $progress;
 	}
 
-	// URI: Unique host
+	// Host: Uniqueness (uniq / non-uniq)
 	$hosts = array();
 	foreach ($pickups as $pickup) $hosts[] = & $pickup['host'];
 	$hosts = array_unique($hosts);
 	$sum['uniqhost'] += count($hosts);
+	if ((! $asap || ! $is_spam) && isset($method['non_uniqhost'])) {
+		$sum['non_uniqhost'] = $sum['quantity'] - $sum['uniqhost'];
+		if ($sum['non_uniqhost'] > $method['non_uniqhost']) {
+			$is_spam['non_uniqhost'] = TRUE;
+		}
+	}
+
+	// Return if ...
+	if ($asap && $is_spam) {
+		return $progress;
+	}
 
 	// URI: Bad host
 	if ((! $asap || ! $is_spam) && isset($method['badhost'])) {
-		$count = array_count_leaves(is_badhost($hosts, $asap));
-		$sum['badhost'] += $count;
-		if ($count != 0) $is_spam['badhost'] = TRUE;
+		$badhost = is_badhost($hosts, $asap);
+		if (! empty($badhost)) {
+			$sum['badhost'] += array_count_leaves($badhost);
+			foreach(array_keys($badhost) as $keys) {
+				$is_spam['badhost'][$keys] =
+					array_count_leaves($badhost[$keys]);
+			}
+			unset($badhost);
+		}
 	}
 
 	return $progress;
@@ -981,6 +1012,13 @@ function pkwk_spamnotify($action, $page, $target = array('title' => ''), $progre
 	if (! $asap) {
 		$summary['METRICS'] = summarize_spam_progress($progress);
 	}
+	if (isset($progress['is_spam']['badhost'])) {
+		$badhost = array();
+		foreach($progress['is_spam']['badhost'] as $glob=>$number) {
+			$badhost[] = $glob . '(' . $number . ')';
+		}
+		$summary['BADHOST'] = implode(', ', $badhost);
+	}
 	$summary['COMMENT'] = $action;
 	$summary['PAGE']    = '[blocked] ' . (is_pagename($page) ? $page : '');
 	$summary['URI']     = get_script_uri() . '?' . rawurlencode($page);

--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -1,6 +1,6 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone
-// $Id: pukiwiki.ini.php,v 1.146 2006/12/19 14:34:54 henoheno Exp $
+// $Id: pukiwiki.ini.php,v 1.147 2007/01/02 07:09:21 henoheno Exp $
 // Copyright (C)
 //   2002-2006 PukiWiki Developers Team
 //   2001-2002 Originally written by yu-ji
@@ -165,14 +165,15 @@ if ($spam) {
 
 	// Threshold and rules for insertion (default)
 	$spam['method']['_default'] = array(
-		'_comment'    => '_default',
-		'quantity'    => 8,
-		'non_uniq'    => 3,
-		'area_anchor' => 0,
-		'area_bbcode' => 0,
-		'uniqhost'    => TRUE,
-		'badhost'     => TRUE,
-		'asap'        => TRUE, // Stop as soon as possible (quick)
+		'_comment'     => '_default',
+		'quantity'     =>  8,
+		//'non_uniquri'  =>  3,
+		'non_uniqhost' =>  3,
+		'area_anchor'  =>  0,
+		'area_bbcode'  =>  0,
+		'uniqhost'     => TRUE,
+		'badhost'      => TRUE,
+		'asap'         => TRUE, // Stop as soon as possible (quick but less-info)
 	);
 
 	// For editing
@@ -182,14 +183,15 @@ if ($spam) {
 	// Any rules will lock contents that have NG things already.
 	$spam['method']['edit'] = array(
 		// Supposed_by_you(n) * Edit_form_spec(2) * Margin(1.5)
-		'_comment'    => 'edit',
-		//'quantity'    => 60 * 3,
-		//'non_uniq'    =>  5 * 3,
-		//'area_anchor' => 30 * 3,
-		//'area_bbcode' => 15 * 3,
-		'uniqhost'    => TRUE,
-		'badhost'     => TRUE,
-		'asap'        => TRUE,
+		'_comment'     => 'edit',
+		//'quantity'     => 60 * 3,
+		//'non_uniquri'  =>  5 * 3,
+		//'non_uniqhost' => 50 * 3,
+		//'area_anchor'  => 30 * 3,
+		//'area_bbcode'  => 15 * 3,
+		'uniqhost'     => TRUE,
+		'badhost'      => TRUE,
+		'asap'         => TRUE,
 	);
 
 	//$spam['exitmode'] = 'dump'; // Dump progress