[pLog-svn] r6871 - plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2009-04-27 07:52:56 -0400 (Mon, 27 Apr 2009)
New Revision: 6871

Modified:
   plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/blackhole.inc.php
   plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/msie.inc.php
   plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/version.inc.php
Log:
upgraded badbehavior to 2.0.26, except for post.inc, which has our changes.

Modified: plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/blackhole.inc.php
===================================================================
--- plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/blackhole.inc.php	2009-04-18 22:04:32 UTC (rev 6870)
+++ plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/blackhole.inc.php	2009-04-27 11:52:56 UTC (rev 6871)
@@ -1,8 +1,16 @@
 <?php if (!defined('BB2_CORE')) die('I said no cheating!');
 
+// Quick and dirty check for an IPv6 address
+function is_ipv6($address) {
+	return (strpos($address, ":")) ? TRUE : FALSE;
+}
+
 // Look up address on various blackhole lists.
 // These cannot be used for GET requests under any circumstances!
 function bb2_blackhole($package) {
+	// Can't use IPv6 addresses yet
+	if (is_ipv6($package['REMOTE_ADDR'])) return;
+
 	// Only conservative lists
 	$bb2_blackhole_lists = array(
 		"sbl-xbl.spamhaus.org",	// All around nasties
@@ -36,6 +44,9 @@
 }
 
 function bb2_httpbl($settings, $package) {
+	// Can't use IPv6 addresses yet
+	if (is_ipv6($package['REMOTE_ADDR'])) return;
+
 	if (!$settings['httpbl_key']) return false;
 
 	$find = implode('.', array_reverse(explode('.', $package['ip'])));

Modified: plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/msie.inc.php
===================================================================
--- plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/msie.inc.php	2009-04-18 22:04:32 UTC (rev 6870)
+++ plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/msie.inc.php	2009-04-27 11:52:56 UTC (rev 6871)
@@ -15,7 +15,8 @@
 
 	// MSIE does NOT send Connection: TE but Akamai does
 	// Bypass this test when Akamai detected
-	if (!array_key_exists('Akamai-Origin-Hop', $package['headers_mixed']) && @preg_match('/\bTE\b/i', $package['headers_mixed']['Connection'])) {
+	// The latest version of IE for Windows CE also uses Connection: TE
+	if (!array_key_exists('Akamai-Origin-Hop', $package['headers_mixed']) && strpos($package['headers_mixed']['User-Agent'], "IEMobile") === FALSE && @preg_match('/\bTE\b/i', $package['headers_mixed']['Connection'])) {
 		return "2b90f772";
 	}
 

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	2009-04-18 22:04:32 UTC (rev 6870)
+++ plog/branches/lifetype-1.2/plugins/badbehavior/bad-behavior/version.inc.php	2009-04-27 11:52:56 UTC (rev 6871)
@@ -1,3 +1,3 @@
 <?php if (!defined('BB2_CWD')) die("I said no cheating!");
-define('BB2_VERSION', "2.0.25");
+define('BB2_VERSION', "2.0.26");
 ?>