Add patch APPSEC-212 files

Author: akai-z

patches/APPSEC-212/1.6.0.0-1.7.0.2/PATCH_SUPEE-2677_EE_1.13.0.2_v2-2015-02-12-04-35-26.sh

@@ -0,0 +1,231 @@
+#!/bin/bash
+# Patch apllying tool template
+# v0.1.2
+# (c) Copyright 2013. Magento Inc.
+#
+# DO NOT CHANGE ANY LINE IN THIS FILE.
+
+# 1. Check required system tools
+_check_installed_tools() {
+    local missed=""
+
+    until [ -z "$1" ]; do
+        type -t $1 >/dev/null 2>/dev/null
+        if (( $? != 0 )); then
+            missed="$missed $1"
+        fi
+        shift
+    done
+
+    echo $missed
+}
+
+REQUIRED_UTILS='sed patch'
+MISSED_REQUIRED_TOOLS=`_check_installed_tools $REQUIRED_UTILS`
+if (( `echo $MISSED_REQUIRED_TOOLS | wc -w` > 0 ));
+then
+    echo -e "Error! Some required system tools, that are utilized in this sh script, are not installed:\nTool(s) \"$MISSED_REQUIRED_TOOLS\" is(are) missed, please install it(them)."
+    exit 1
+fi
+
+# 2. Determine bin path for system tools
+CAT_BIN=`which cat`
+PATCH_BIN=`which patch`
+SED_BIN=`which sed`
+PWD_BIN=`which pwd`
+BASENAME_BIN=`which basename`
+
+BASE_NAME=`$BASENAME_BIN "$0"`
+
+# 3. Help menu
+if [ "$1" = "-?" -o "$1" = "-h" -o "$1" = "--help" ]
+then
+    $CAT_BIN << EOFH
+Usage: sh $BASE_NAME [--help] [-R|--revert] [--list]
+Apply embedded patch.
+
+-R, --revert    Revert previously applied embedded patch
+--list          Show list of applied patches
+--help          Show this help message
+EOFH
+    exit 0
+fi
+
+# 4. Get "revert" flag and "list applied patches" flag
+REVERT_FLAG=
+SHOW_APPLIED_LIST=0
+if [ "$1" = "-R" -o "$1" = "--revert" ]
+then
+    REVERT_FLAG=-R
+fi
+if [ "$1" = "--list" ]
+then
+    SHOW_APPLIED_LIST=1
+fi
+
+# 5. File pathes
+CURRENT_DIR=`$PWD_BIN`/
+APP_ETC_DIR=`echo "$CURRENT_DIR""app/etc/"`
+APPLIED_PATCHES_LIST_FILE=`echo "$APP_ETC_DIR""applied.patches.list"`
+
+# 6. Show applied patches list if requested
+if [ "$SHOW_APPLIED_LIST" -eq 1 ] ; then
+    echo -e "Applied/reverted patches list:"
+    if [ -e "$APPLIED_PATCHES_LIST_FILE" ]
+    then
+        if [ ! -r "$APPLIED_PATCHES_LIST_FILE" ]
+        then
+            echo "ERROR: \"$APPLIED_PATCHES_LIST_FILE\" must be readable so applied patches list can be shown."
+            exit 1
+        else
+            $SED_BIN -n "/SUP-\|SUPEE-/p" $APPLIED_PATCHES_LIST_FILE
+        fi
+    else
+        echo "<empty>"
+    fi
+    exit 0
+fi
+
+# 7. Check applied patches track file and its directory
+_check_files() {
+    if [ ! -e "$APP_ETC_DIR" ]
+    then
+        echo "ERROR: \"$APP_ETC_DIR\" must exist for proper tool work."
+        exit 1
+    fi
+
+    if [ ! -w "$APP_ETC_DIR" ]
+    then
+        echo "ERROR: \"$APP_ETC_DIR\" must be writeable for proper tool work."
+        exit 1
+    fi
+
+    if [ -e "$APPLIED_PATCHES_LIST_FILE" ]
+    then
+        if [ ! -w "$APPLIED_PATCHES_LIST_FILE" ]
+        then
+            echo "ERROR: \"$APPLIED_PATCHES_LIST_FILE\" must be writeable for proper tool work."
+            exit 1
+        fi
+    fi
+}
+
+_check_files
+
+# 8. Apply/revert patch
+# Note: there is no need to check files permissions for files to be patched.
+# "patch" tool will not modify any file if there is not enough permissions for all files to be modified.
+# Get start points for additional information and patch data
+SKIP_LINES=$((`$SED_BIN -n "/^__PATCHFILE_FOLLOWS__$/=" "$CURRENT_DIR""$BASE_NAME"` + 1))
+ADDITIONAL_INFO_LINE=$(($SKIP_LINES - 3))p
+
+_apply_revert_patch() {
+    DRY_RUN_FLAG=
+    if [ "$1" = "dry-run" ]
+    then
+        DRY_RUN_FLAG=" --dry-run"
+        echo "Checking if patch can be applied/reverted successfully..."
+    fi
+    PATCH_APPLY_REVERT_RESULT=`$SED_BIN -e '1,/^__PATCHFILE_FOLLOWS__$/d' "$CURRENT_DIR""$BASE_NAME" | $PATCH_BIN $DRY_RUN_FLAG $REVERT_FLAG -p0`
+    PATCH_APPLY_REVERT_STATUS=$?
+    if [ $PATCH_APPLY_REVERT_STATUS -eq 1 ] ; then
+        echo -e "ERROR: Patch can't be applied/reverted successfully.\n\n$PATCH_APPLY_REVERT_RESULT"
+        exit 1
+    fi
+    if [ $PATCH_APPLY_REVERT_STATUS -eq 2 ] ; then
+        echo -e "ERROR: Patch can't be applied/reverted successfully."
+        exit 2
+    fi
+}
+
+REVERTED_PATCH_MARK=
+if [ -n "$REVERT_FLAG" ]
+then
+    REVERTED_PATCH_MARK=" | REVERTED"
+fi
+
+_apply_revert_patch dry-run
+_apply_revert_patch
+
+# 9. Track patch applying result
+echo "Patch was applied/reverted successfully."
+ADDITIONAL_INFO=`$SED_BIN -n ""$ADDITIONAL_INFO_LINE"" "$CURRENT_DIR""$BASE_NAME"`
+APPLIED_REVERTED_ON_DATE=`date -u +"%F %T UTC"`
+APPLIED_REVERTED_PATCH_INFO=`echo -n "$APPLIED_REVERTED_ON_DATE"" | ""$ADDITIONAL_INFO""$REVERTED_PATCH_MARK"`
+echo -e "$APPLIED_REVERTED_PATCH_INFO\n$PATCH_APPLY_REVERT_RESULT\n\n" >> "$APPLIED_PATCHES_LIST_FILE"
+
+exit 0
+
+
+SUPEE-2677 | EE_1.13.0.2 | v2 | d20e6763cd0df70c4ac6e418c9775a1ff0f2618f | Tue Jan 14 17:49:25 2014 +0200 | v1.13.0.2..HEAD
+
+__PATCHFILE_FOLLOWS__
+diff --git app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
+index 9e8d6be..0ac6a11 100644
+--- app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
++++ app/code/core/Mage/Cms/Helper/Wysiwyg/Images.php
+@@ -49,6 +49,11 @@ class Mage_Cms_Helper_Wysiwyg_Images extends Mage_Core_Helper_Abstract
+      */
+     protected $_storeId = null;
+ 
++    /**
++     * Images Storage root directory
++     * @var string
++     */
++    protected $_storageRoot;
+ 
+     /**
+      * Set a specified store ID value
+@@ -68,8 +73,13 @@ class Mage_Cms_Helper_Wysiwyg_Images extends Mage_Core_Helper_Abstract
+      */
+     public function getStorageRoot()
+     {
+-        return Mage::getConfig()->getOptions()->getMediaDir() . DS . Mage_Cms_Model_Wysiwyg_Config::IMAGE_DIRECTORY
+-            . DS;
++        if (!$this->_storageRoot) {
++            $this->_storageRoot = realpath(
++                    Mage::getConfig()->getOptions()->getMediaDir()
++                    . DS . Mage_Cms_Model_Wysiwyg_Config::IMAGE_DIRECTORY
++                ) . DS;
++        }
++        return $this->_storageRoot;
+     }
+ 
+     /**
+@@ -198,10 +208,10 @@ class Mage_Cms_Helper_Wysiwyg_Images extends Mage_Core_Helper_Abstract
+     {
+         if (!$this->_currentPath) {
+             $currentPath = $this->getStorageRoot();
+-            $path = $this->_getRequest()->getParam($this->getTreeNodeName());
+-            if ($path) {
+-                $path = $this->convertIdToPath($path);
+-                if (is_dir($path)) {
++            $node = $this->_getRequest()->getParam($this->getTreeNodeName());
++            if ($node) {
++                $path = realpath($this->convertIdToPath($node));
++                if (is_dir($path) && false !== stripos($path, $currentPath)) {
+                     $currentPath = $path;
+                 }
+             }
+@@ -223,7 +233,7 @@ class Mage_Cms_Helper_Wysiwyg_Images extends Mage_Core_Helper_Abstract
+     public function getCurrentUrl()
+     {
+         if (!$this->_currentUrl) {
+-            $path = str_replace(Mage::getConfig()->getOptions()->getMediaDir(), '', $this->getCurrentPath());
++            $path = str_replace(realpath(Mage::getConfig()->getOptions()->getMediaDir()), '', $this->getCurrentPath());
+             $path = trim($path, DS);
+             $this->_currentUrl = Mage::app()->getStore($this->_storeId)->getBaseUrl('media') .
+                                  $this->convertPathToUrl($path) . '/';
+diff --git app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
+index 19b3f45..af58ce3 100644
+--- app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
++++ app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
+@@ -89,7 +89,7 @@ class Mage_Cms_Model_Wysiwyg_Images_Storage extends Varien_Object
+         foreach ($collection as $key => $value) {
+             $rootChildParts = explode(DIRECTORY_SEPARATOR, substr($value->getFilename(), $storageRootLength));
+ 
+-            if (array_key_exists($rootChildParts[0], $conditions['plain'])
++            if (array_key_exists(end($rootChildParts), $conditions['plain'])
+                 || ($regExp && preg_match($regExp, $value->getFilename()))) {
+                 $collection->removeItemByKey($key);
+             }