Rewrote new extension detection:

[mailer.git] / inc / libs / security_functions.php

diff --git a/inc/libs/security_functions.php b/inc/libs/security_functions.php
index b1cce1c5b323b30827b90b452d01bf66ae9f226e..bcb381a7f403bff03d52c7f99b412b5fac0edb0f 100644 (file)
--- a/inc/libs/security_functions.php
+++ b/inc/libs/security_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,33 +41,39 @@ if (defined('__SECURITY')) {
 } // END - if
 
 // Some security stuff...
-if (strpos($_SERVER['PHP_SELF'], basename(__FILE__)) !== false) {
+if (strpos($_SERVER['PHP_SELF'], basename(__FILE__)) !== FALSE) {
        die();
 } // END - if
 
 // Include ctracker, recommended place!
 //require_once('ctracker.php');
+//require_once('ipfilter.php');
 
 /**
  * Function to secure input strings
  *
- * @param      $str    The unsecured string
- * @param      $strip  Strip tags
- * @return     $str    A (hopefully) secured string against XSS and other bad things
+ * @param      $str            The unsecured string
+ * @param      $stripTags      Strip tags
+ * @return     $str            A (hopefully) secured string against XSS and other bad things
  */
-function secureString ($str, $strip = true, $encode = false) {
+function secureString ($str, $stripTags = TRUE, $encode = FALSE) {
        // Shall we strip HTML code?
-       if ($strip === true) $str = strip_tags($str);
+       if ($stripTags === TRUE) {
+               $str = strip_tags($str);
+       } // END - if
 
        // Trim string
        $str = trim($str);
 
        // Encode in entities if requested
-       if ($encode === true) {
+       if ($encode === TRUE) {
                // Encode in entities (this breakes UTF-8!)
                $str = htmlentities($str, ENT_QUOTES);
        } // END - if
 
+       // Replace {,} with entities
+       $str = str_replace(array('{', '}'), array('{', '}'), $str);
+
        // Return result
        return $str;
 }
@@ -92,7 +98,7 @@ function securePhpSelf () {
        $phpSelfFile      = basename($_SERVER['PHP_SELF']);
 
        // Check for a .php inside the $phpSelfDirectory...
-       while (strpos($phpSelfDirectory, '.php') !== false) {
+       while (strpos($phpSelfDirectory, '.php') !== FALSE) {
                // Correct the dirname
                $phpSelfDirectory = substr($phpSelfDirectory, 0, (strpos($phpSelfDirectory, '.php') + 4));
                // Rewrite filename...
@@ -105,13 +111,23 @@ function securePhpSelf () {
        $_SERVER['PHP_SELF'] = $phpSelfDirectory . '/' . $phpSelfFile;
 
        // Did run...
-       $GLOBALS['php_self_secured'] = true;
+       $GLOBALS['php_self_secured'] = TRUE;
 
        // Remove uneccessary variables
        unset($phpSelfDirectory);
        unset($phpSelfFile);
 }
 
+/**
+ * Checks if PHP_VERSION is newer or equal to given version string
+ *
+ * @param      $versionString  A PHP'ized version string which shall be compared with PHP_VERSION
+ * @return     $isEqualNewer   Wether the given version string is equal or newer to PHP_VERSION
+ */
+function isPhpVersionEqualNewer ($versionString) {
+       return (version_compare(PHP_VERSION, $versionString, '>='));
+}
+
 /**
  * Detects caching in PHP
  *
@@ -119,7 +135,7 @@ function securePhpSelf () {
  */
 function detectPhpCaching () {
        // Activate caching or transparent compressing when it is not already done
-       if (phpversion() >= '4.0.4pl1' && (strstr(getenv('HTTP_USER_AGENT'),'compatible') || (strstr(getenv('HTTP_USER_AGENT'), 'Mozilla')))) {
+       if ((isPhpVersionEqualNewer('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
                        $GLOBALS['php_caching'] = 'on';
@@ -135,12 +151,14 @@ function detectPhpCaching () {
 }
 
 // Runtime/GPC quoting is off now...
-ini_set('magic_quotes_runtime', false);
-ini_set('magic_quotes_gpc', false); // This may not work on some systems
+ini_set('magic_quotes_runtime', FALSE);
+ini_set('magic_quotes_gpc', FALSE); // This may not work on some systems
 
-// No compatibility with Zend Engine 1, else an error like 'Implicit cloning'
-// will be produced.
-if (phpversion() >= '5.0') {
+/*
+ * No compatibility with Zend Engine 1, else an error like 'Implicit cloning'
+ * will be produced.
+ */
+if (isPhpVersionEqualNewer('5.0')) {
        ini_set('zend.ze1_compatibility_mode', 'Off');
 } // END - if
 
@@ -163,7 +181,7 @@ if (!isset($_POST)) {
 // Generate arrays which holds the relevante chars to replace
 $GLOBALS['security_chars'] = array(
        // The chars we are looking for...
-       'from' => array('/', '.', "'", '$', '(', ')', '{--', '--}', '{?', '?}', '%', ';', '[', ']', ':', '--', "\\"),
+       'from' => array('/', '.', chr(39), '$', '(', ')', '{--', '--}', '{%', '%}', '{?', '?}', '%', ';', '[', ']', ':', '--', chr(92), chr(39), '<', '>'),
        // ... and we will replace to.
        'to'   => array(
                '{SLASH}',
@@ -172,6 +190,8 @@ $GLOBALS['security_chars'] = array(
                '{DOLLAR}',
                '{OPEN_ANCHOR}',
                '{CLOSE_ANCHOR}',
+               '{OPEN_LANGUAGE}',
+               '{CLOSE_LANGUAGE}',
                '{OPEN_TEMPLATE}',
                '{CLOSE_TEMPLATE}',
                '{OPEN_CONFIG}',
@@ -182,14 +202,19 @@ $GLOBALS['security_chars'] = array(
                '{CLOSE_INDEX}',
                '{DBL_DOT}',
                '{COMMENT}',
-               '{BACKSLASH}'
+               '{BACKSLASH}',
+               '{SQUOTE}',
+               '{OPEN_TAG}',
+               '{CLOSE_TAG}'
        ),
 );
 
-// Characters allowed in URLs
-//
-// 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.
+/*
+ * Characters allowed in booked URLs
+ *
+ * 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.
+ */
 $GLOBALS['url_chars'] = array(
        // Search for these secured characters
        'to'   => array('{SLASH}', '{DOT}', '{PER}', '{DBL_DOT}', '{COMMENT}'),