From 643f389c72181d9c1fc1ac53256111f60cd46115 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 9 Aug 2013 18:25:05 +0000
Subject: [PATCH] %20 was to much here

---
 libs/lib_detector.php | 48 +++++++++++++++++++++----------------------
 libs/lib_general.php  |  6 +++---
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/libs/lib_detector.php b/libs/lib_detector.php
index e07fa7b..e08a497 100644
--- a/libs/lib_detector.php
+++ b/libs/lib_detector.php
@@ -44,8 +44,8 @@ function initCrackerTrackerArrays () {
 	// Attacks we should detect and block
 	$GLOBALS['ctracker_get_blacklist'] = array(
 		// SQL injections
-		'union%20', '%20union', 'insert%20',
-		'select%20', '%20like', 'like%20', 'drop%20', 'update%20',
+		'union ', ' union', 'insert ',
+		'select ', ' like', 'like ', 'drop ', 'update ',
 		'union(', 'union=',
 
 		// $GLOBAL/$_SERVER array elements
@@ -59,14 +59,14 @@ function initCrackerTrackerArrays () {
 		'bashrc',
 
 		// Other Linux/FreeBSD/??? programs (sometimes with space)
-		'traceroute%20', 'ping%20', 'bin/xterm', 'bin/./xterm', 'lsof%20',
-		'telnet%20', 'wget%20', 'bin/id', 'uname\x20', 'uname%20', 'killall',
-		'diff%20', 'kill%20', 'locate%20', 'grep%20', 'vi%20', 'mv%20',
-		'rmdir%20', 'mcd%20', 'mrd%20', 'rm%20', '%20mcd', '%20mrd', '%20rm',
-		'passwd%20', '%20passwd', 'mdir%20', '%20mdir', 'cp%20', '%20cp',
-		'esystem%20', 'chr%20', '%20chr', 'wget%20', '%20wget', '%20cmd',
-		'cmd%20', '%20rush', 'rush%20', '%20echr', 'echr%20', '%20getenv',
-		'getenv', 'reboot%20', 'halt%20', 'powerdown%20',
+		'traceroute ', 'ping ', 'bin/xterm', 'bin/./xterm', 'lsof ',
+		'telnet ', 'wget ', 'bin/id', 'uname\x20', 'uname ', 'killall',
+		'diff ', 'kill ', 'locate ', 'grep ', 'vi ', 'mv ',
+		'rmdir ', 'mcd ', 'mrd ', 'rm ', ' mcd', ' mrd', ' rm',
+		'passwd ', ' passwd', 'mdir ', ' mdir', 'cp ', ' cp',
+		'esystem ', 'chr ', ' chr', 'wget ', ' wget', ' cmd',
+		'cmd ', ' rush', 'rush ', ' echr', 'echr ', ' getenv',
+		'getenv', 'reboot ', 'halt ', 'powerdown ',
 
 		// Other Linux programs (+ brace)
 		'locate(', 'grep(', 'kill(', 'mcd(', 'mrd(', 'rm(', 'mv(', 'rmdir(',
@@ -82,11 +82,11 @@ function initCrackerTrackerArrays () {
 		'/www/./virtual/',
 
 		// Uni* commands:
-		'/chgrp', '/chown', '/chmod', 'chown%20', 'chmod%20', 'chgrp%20',
+		'/chgrp', '/chown', '/chmod', 'chown ', 'chmod ', 'chgrp ',
 
 		// Compiler/interpreter
-		'g++%20', 'c++%20', 'cc%20', 'bin/./python', 'bin/python', 'bin/tclsh',
-		'bin/./tclsh', 'bin/nasm', 'bin/./nasm', '/perl', 'perl%20', 'cmd.exe',
+		'g++ ', 'c++ ', 'cc ', 'bin/./python', 'bin/python', 'bin/tclsh',
+		'bin/./tclsh', 'bin/nasm', 'bin/./nasm', '/perl', 'perl ', 'cmd.exe',
 		'nc.exe', 'ftp.exe',
 
 		// PHP commands/scripts
@@ -106,16 +106,16 @@ function initCrackerTrackerArrays () {
 		'data://', 'tcp://', 'udp://', 'raw://', 'javascript://', 'file://', 'ftp://',
 
 		// Blocked "users"
-		'nigga(', '%20nigga', 'nigga%20', 'starhack', 'busca',
+		'nigga(', ' nigga', 'nigga ', 'starhack', 'busca',
 
 		// Hidden HTML stuff
-		'%20style=', 'style%20=',
-		'overflow:auto', 'overflow:%20auto',
-		'overflow%20:auto', 'overflow%20:%20auto',
-		'display:hidden', 'display:%20hidden',
-		'display%20:hidden', 'display%20:%20hidden',
-		'height:0px', 'height:%200px','height:1px', 'height:%201px',
-		'width:0px', 'width:%200px','width:1px', 'width:%201px',
+		' style=', 'style =',
+		'overflow:auto', 'overflow: auto',
+		'overflow :auto', 'overflow : auto',
+		'display:hidden', 'display: hidden',
+		'display :hidden', 'display : hidden',
+		'height:0px', 'height: 0px','height:1px', 'height: 1px',
+		'width:0px', 'width: 0px','width:1px', 'width: 1px',
 
 		// Uncommon user websites
 		'~root', '~ftp', '~nobody',
@@ -125,8 +125,8 @@ function initCrackerTrackerArrays () {
 
 		// @TODO Misc/unsorted
 		'cgi-', '.eml', '$_request', '$_get', '$request', '$get', '.system',
-		'&aim', 'new_password', '&icq', '.conf', 'motd%20', 'HTTP/1.',
-		'window.open', 'img src', 'img%20src', '.jsp', 'servlet',
+		'&aim', 'new_password', '&icq', '.conf', 'motd ', 'HTTP/1.',
+		'window.open', 'img src', 'img src', '.jsp', 'servlet',
 		'wwwacl', '.js', '.jsp', 'server-info', 'server-status',
 		'secure_site, ok', 'chunked', 'org.apache', '/servlet/con',
 		'<script', 'mod_gzip_status', '.system', 'http_',
@@ -136,7 +136,7 @@ function initCrackerTrackerArrays () {
 	// Block these words found in POST requests
 	$GLOBALS['ctracker_post_blacklist'] = array(
 		// This line is for detecting hidden link spam in wikis, forums, guestbooks, etc.
-		'%20style=', 'overflow:auto', 'height:1px', 'width:1px', 'display:hidden', 'style.display',
+		' style=', 'overflow:auto', 'height:1px', 'width:1px', 'display:hidden', 'style.display',
 
 		// "Common" login names from VHCS exploiters ;-)
 		'starhack', 'DeLiMehmet', 'hisset', 'Hisset', 'delimert', 'MecTruy'
diff --git a/libs/lib_general.php b/libs/lib_general.php
index 5799d08..84dd1bf 100644
--- a/libs/lib_general.php
+++ b/libs/lib_general.php
@@ -174,7 +174,7 @@ function crackerTrackerReferer () {
 	// Is it there?
 	if (isset($_SERVER['HTTP_REFERER'])) {
 		// Then use it securely
-		$referer = crackerTrackerSecureString($_SERVER['HTTP_REFERER']);
+		$referer = crackerTrackerSecureString(urldecode($_SERVER['HTTP_REFERER']));
 	} // END - if
 
 	// Return it
@@ -220,7 +220,7 @@ function isCrackerTrackerFileFound ($FQFN) {
 // Loads a given "template" (this is more an include file)
 function crackerTrackerLoadTemplate ($template) {
 	// Create the full-qualified filename (FQFN)
-	$FQFN = sprintf("%s/templates/%s.tpl.php",
+	$FQFN = sprintf('%s/templates/%s.tpl.php',
 		dirname(__FILE__),
 		$template
 	);
@@ -241,7 +241,7 @@ function crackerTrackerLoadTemplate ($template) {
 // Loads a given "template" (this is more an include file)
 function crackerTrackerLoadLocalizedTemplate ($template) {
 	// Create the full-qualified filename (FQFN)
-	$FQFN = sprintf("%s/templates/%s/%s.tpl.php",
+	$FQFN = sprintf('%s/templates/%s/%s.tpl.php',
 		dirname(__FILE__),
 		getCrackerTrackerLanguage(),
 		$template
-- 
2.39.5