X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fsecurity_functions.php;h=4b6cd6d46cd71c2a80ddd3bc30c695fe50747c1e;hb=f03cb5d87e69bb2efc885b5c5f5f3026b24c06f6;hp=79599e4558dd6ace5280466af69a3b894f3ac18d;hpb=b5912168d72ae511eb623c3d92540c82d31b93c5;p=mailer.git

diff --git a/inc/libs/security_functions.php b/inc/libs/security_functions.php
index 79599e4558..4b6cd6d46c 100644
--- a/inc/libs/security_functions.php
+++ b/inc/libs/security_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Alle GET, POST und COOKIE-Daten sichern          *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,8 +37,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
@@ -42,10 +46,17 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
  * Function to secure input strings
  *
  * @param	$str	The unsecured string
- * @return	$str	A (hopefully) secured string against HTML and other things
+ * @param	$strip	Strip tags
+ * @return	$str	A (hopefully) secured string against XSS and other bad things
  */
-function secureString ($str) {
-	$str = trim(strip_tags($str));
+function secureString ($str, $strip=true) {
+	// Shall we strip HTML code?
+	if ($strip) $str = strip_tags($str);
+
+	// Trim string
+	$str = trim($str);
+
+	// Encode in entities
 	$str = htmlentities($str, ENT_QUOTES);
 	return $str;
 }
@@ -53,49 +64,33 @@ function secureString ($str) {
 // Run only once this security check/exchange
 if (defined('__SECURITY')) return;
 
-// Fatal messages goes here
-global $FATAL;
-$FATAL = array();
-
-// Runtime quoting is off now...
-set_magic_quotes_runtime(false);
-
-// Unregister all global variables because of vultures and surpress failed attemps
-@import_request_variables('');
-
-// Error reporting level
-@error_reporting(E_ALL | E_STRICT);
+// Runtime/GPC quoting is off now...
+@set_magic_quotes_runtime(false);
+@ini_set('magic_quotes_gpc', false); // This may not work on some systems
 
 // Check if important arrays are found and define them if missing
-if (!isset($_SERVER))
-{
+if (!isset($_SERVER)) {
 	global $_SERVER;
 	$_SERVER = $GLOBALS['_SERVER'];
 }
-if (!isset($_GET))
-{
+
+if (!isset($_GET)) {
 	global $_GET;
 	$_GET = $GLOBALS['_GET'];
 }
-if (!isset($_POST))
-{
+
+if (!isset($_POST)) {
 	global $_POST;
 	$_POST = $GLOBALS['_POST'];
 }
-if (!isset($_SESSION))
-{
-	global $_SESSION;
-	$_SESSION = $GLOBALS['_COOKIE'];
-}
 
 // Include IP-Filter here
 //require("/usr/share/php/ipfilter.php");
 
 // Generate arrays which holds the relevante chars to replace
-global $SEC_CHARS, $URL_CHARS;
-$SEC_CHARS = array(
+$GLOBALS['security_chars'] = array(
 	// The chars we are looking for...
-	'from' => array("{", "}", "/", ".", "'", "$", "(", ")", "{--", "--}", "%", ";", "[", "]", ":", "--"),
+	'from' => array("{", "}", "/", ".", "'", "$", "(", ")", '{--', '--}', "%", ";", "[", "]", ":", "--"),
 	// ... and we will replace to.
 	'to'   => array(
 		"{OPEN_ANCHOR2}",
@@ -121,7 +116,7 @@ $SEC_CHARS = array(
 //
 // Note: Do not replace 'to' with 'from' and vise-versa! When you do this all booked URLs will be
 //       rejected because of the {SLASH}, {DOT} and all below listed items inside the URL.
-$URL_CHARS = array(
+$GLOBALS['url_chars'] = array(
 	// Search for these secured characters
 	'to'   => array("{SLASH}", "{DOT}", "{PER}", "{DBL_DOT}", "{COMMENT}"),
 	// Replace with these characters
@@ -130,20 +125,15 @@ $URL_CHARS = array(
 
 // Overworked security part:
 if (is_array($_GET)) {
-	foreach ($_GET as $seckey=>$secvalue)
-	{
-		if (is_array($secvalue))
-		{
+	foreach ($_GET as $seckey => $secvalue) {
+		if (is_array($secvalue)) {
 			// Throw arrays away...
 			unset($_GET[$seckey]);
-		}
-		 else
-		{
+		} else {
 			// Only variables are allowed (non-array) but we secure them all!
-			foreach ($SEC_CHARS['from'] as $key=>$char)
-			{
+			foreach ($GLOBALS['security_chars']['from'] as $key => $char) {
 				// Pass all through
-				$_GET[$seckey] = str_replace($char  , $SEC_CHARS['to'][$key], $_GET[$seckey]);
+				$_GET[$seckey] = str_replace($char  , $GLOBALS['security_chars']['to'][$key], $_GET[$seckey]);
 			}
 
 			// Strip all other out
@@ -152,67 +142,34 @@ if (is_array($_GET)) {
 	}
 }
 
-if (basename($_SERVER['PHP_SELF']) != "install.php")
-{
+if (basename($_SERVER['PHP_SELF']) != "install.php") {
 	// And POST data
-	foreach ($_POST as $seckey=>$secvalue)
-	{
-		if (!is_array($secvalue))
-		{
+	foreach ($_POST as $seckey => $secvalue) {
+		if (!is_array($secvalue)) {
 			// Only variables are allowed (non-array) to be secured...
-			foreach ($SEC_CHARS['from'] as $key=>$char)
-			{
+			foreach ($GLOBALS['security_chars']['from'] as $key => $char) {
 				// Pass all through
-				$_POST[$seckey] = str_replace($char  , $SEC_CHARS['to'][$key], $_POST[$seckey]);
+				$_POST[$seckey] = str_replace($char  , $GLOBALS['security_chars']['to'][$key], $_POST[$seckey]);
 			}
 
 			// Strip all other out
 			$_POST[$seckey] = strip_tags($_POST[$seckey]);
 		}
 	}
-
-	// ... and finally cookies
-	foreach ($_SESSION as $seckey=>$secvalue)
-	{
-		if (is_array($secvalue))
-		{
-			// Throw arrays away...
-			unset($_SESSION[$seckey]);
-		}
-		 else
-		{
-			// Only variables are allowed (non-array) but we secure them all!
-			foreach ($SEC_CHARS['from'] as $key=>$char)
-			{
-				// Pass all through
-				$_SESSION[$seckey] = str_replace($char  , $SEC_CHARS['to'][$key], $_SESSION[$seckey]);
-			}
-
-			// Strip all other out
-			$_SESSION[$seckey] = strip_tags($_SESSION[$seckey]);
-		}
-	}
 }
 
 // Activate caching or transparent compressing when it is not already done
-if (!defined('_OB_CACHING'))
-{
-	if (phpversion() >= '4.0.4pl1' && (strstr(getenv('HTTP_USER_AGENT'),'compatible') || (strstr(getenv('HTTP_USER_AGENT'), "Mozilla"))))
-	{
-		if ((extension_loaded('zlib')) && (function_exists('ob_start')))
-		{
+if (!defined('_OB_CACHING')) {
+	if (phpversion() >= '4.0.4pl1' && (strstr(getenv('HTTP_USER_AGENT'),'compatible') || (strstr(getenv('HTTP_USER_AGENT'), "Mozilla")))) {
+		if ((extension_loaded('zlib')) && (function_exists('ob_start'))) {
 			// Start caching
 			define('_OB_CACHING', "on");
 			ob_start();
-		}
-		 else
-		{
+		} else {
 			// Extension not loaded or required function is missing
 			define('_OB_CACHING', "404");
 		}
-	}
-	 else
-	{
+	} else {
 		// Old PHP version
 		define('_OB_CACHING', "old");
 	}
@@ -226,8 +183,7 @@ $SELF_DIR  = dirname($_SERVER['PHP_SELF']);
 $SELF_FILE = basename($_SERVER['PHP_SELF']);
 
 // Check for a .php inside the $SELF_DIR...
-while (ereg(".php", $SELF_DIR))
-{
+while (ereg(".php", $SELF_DIR)) {
 	// Correct the dirname
 	$SELF_DIR = substr($SELF_DIR, 0, (strpos($SELF_DIR, ".php") + 4));
 	// Rewrite filename...