[pLog-svn] r6104 - in plog/branches/lifetype-1.2/plugins/badbehavior: . bad-behavior

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2007-12-05 23:19:29 -0500 (Wed, 05 Dec 2007)
New Revision: 6104

Modified:
   plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/blacklist.inc.php
   plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/core.inc.php
   plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/post.inc.php
   plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/version.inc.php
   plog/branches/lifetype-1.2/plugins/badbehavior/pluginbadbehavior.class.php
Log:
upgraded bad behavior to 2.0.11

Modified: plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/blacklist.inc.php
===================================================================
--- plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/blacklist.inc.php	2007-12-06 04:19:09 UTC (rev 6103)
+++ plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/blacklist.inc.php	2007-12-06 04:19:29 UTC (rev 6104)
@@ -26,20 +26,24 @@
 		"LWP",			// spambot scripts
 		"Microsoft URL",	// spam harvester
 		"Missigua",		// spam harvester
+		"MJ12bot",		// crawls MUCH too fast
 		"Movable Type",		// customised spambots
 		"Mozilla ",		// malicious software
 		"Mozilla/4.0(",		// from honeypot
 		"Mozilla/4.0+(",	// suspicious harvester
 		"MSIE",			// malicious software
 		"NutchCVS",		// unidentified robots
+		"Nutscrape/",		// misc comment spam
 		"OmniExplorer",		// spam harvester
 		"psycheclone",		// spam harvester
 		"PussyCat ",		// misc comment spam
 		"PycURL",		// misc comment spam
 		"Shockwave Flash",	// spam harvester
+		"TrackBack/",		// trackback spam
+		"user",			// suspicious harvester
 		"User Agent: ",		// spam harvester
 		"User-Agent: ",		// spam harvester
-		"Wordpress Hash Grabber",// malicious software
+		"Wordpress",		// malicious software
 		"\"",			// malicious software
 	);
 

Modified: plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/core.inc.php
===================================================================
--- plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/core.inc.php	2007-12-06 04:19:09 UTC (rev 6103)
+++ plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/core.inc.php	2007-12-06 04:19:29 UTC (rev 6104)
@@ -179,7 +179,7 @@
 		} elseif (stripos($ua, "Googlebot") !== FALSE || stripos($ua, "Mediapartners-Google") !== FALSE) {
 			require_once(BB2_CORE . "/google.inc.php");
 			bb2_test($settings, $package, bb2_google($package));
-		} elseif (stripos($ua, "Mozilla") !== FALSE && stripos($ua, "Mozilla" == 0)) {
+		} elseif (stripos($ua, "Mozilla") !== FALSE && stripos($ua, "Mozilla") == 0) {
 			$package['is_browser'] = true;
 			require_once(BB2_CORE . "/mozilla.inc.php");
 			bb2_test($settings, $package, bb2_mozilla($package));

Modified: plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/post.inc.php
===================================================================
--- plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/post.inc.php	2007-12-06 04:19:09 UTC (rev 6103)
+++ plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/post.inc.php	2007-12-06 04:19:29 UTC (rev 6104)
@@ -58,6 +58,9 @@
 //		if ($ip && $ip_screener && abs($ip_screener - $ip) > 256)
 //			return "c1fa729b";
 
+		if ($package['headers_mixed']['X-Forwarded-For']) {
+			$ip = $package['headers_mixed']['X-Forwarded-For'];
+		}
 		// Screen for user agent changes
 		// User connected previously with blank user agent
 //		$q = bb2_db_query("SELECT `ip` FROM " . $settings['log_table'] . " WHERE (`ip` = '" . $package['ip'] . "' OR `ip` = '" . $screener[1] . "') AND `user_agent` != '" . $package['user_agent'] . "' AND `date` > DATE_SUB('" . bb2_db_date() . "', INTERVAL 5 MINUTE)");

Modified: plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/version.inc.php
===================================================================
--- plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/version.inc.php	2007-12-06 04:19:09 UTC (rev 6103)
+++ plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/version.inc.php	2007-12-06 04:19:29 UTC (rev 6104)
@@ -1,3 +1,3 @@
 <?php if (!defined('BB2_CWD')) die("I said no cheating!");
-define('BB2_VERSION', "2.0.10");
+define('BB2_VERSION', "2.0.11");
 ?>

Modified: plog/branches/lifetype-1.2/plugins/badbehavior/pluginbadbehavior.class.php
===================================================================
--- plog/branches/lifetype-1.2/plugins/badbehavior/pluginbadbehavior.class.php	2007-12-06 04:19:09 UTC (rev 6103)
+++ plog/branches/lifetype-1.2/plugins/badbehavior/pluginbadbehavior.class.php	2007-12-06 04:19:29 UTC (rev 6104)
@@ -20,7 +20,7 @@
 			$this->desc = "Bad Behavior for LifeType";
 			$this->author = "The Lifetype Project";
 			$this->db =& Db::getDb();
-            $this->version = "1.2";
+            $this->version = "20071205";
 		
 			$config =& Config::getConfig();
 			$prefix = Db::getPrefix();