Magento Enterprise Security – Fix SUPEE-9767 Hunk #1 FAILED Error

ee-1.13magento-enterprisepatchesSecuritysupee-9767

Trying to install the security patch SUPEE-9767 onto M1 EE v1.13.1.0 and i'm receiving the following error:

Hunk #1 FAILED at 225. 1 out of 1 hunk FAILED — saving rejects to
file
app/design/frontend/enterprise/default/template/persistent/checkout/onepage/billing.phtml.rej

I've checked the line in file indicated in the error and here is the related block of code:

<div class="input-box">   <!--(this is line 255)-->
<input type="password" name="billing[confirm_password]" title="<?php echo 
$this->__('Confirm Password') ?>" id="billing:confirm_password" 
class="input-text required-entry validate-cpassword" />
</div>

Any help would be appreciated.

Best Answer

Another reason could be that you modified this file and thus it is different than the original version of it.

To fix that:

Backup this file
Download the original file of your Magento version
Apply the patch
Compare your backup with the new file
Copy the new file into your custom theme and apply the changes from your backup file into it

Checkout form keys

As said in the other post, this patch adds form keys to the following forms:

Shipping cart form:

app/design/frontend/<package>/<theme>/template/checkout/cart/shipping.phtml

Multishipping billing checkout form:

app/design/frontend/<package>/<theme>/template/checkout/multishipping/billing.phtml

Multishipping shipping checkout form:

app/design/frontend/<package>/<theme>/template/checkout/multishipping/shipping.phtml

Multishipping addresses checkout form:

app/design/frontend/<package>/<theme>/template/checkout/multishipping/addresses.phtml

Billing checkout form:

app/design/frontend/<package>/<theme>/template/checkout/onepage/billing.phtml

Shipping checkout form:

app/design/frontend/<package>/<theme>/template/checkout/onepage/shipping.phtml

Payment checkout form:

app/design/frontend/<package>/<theme>/template/checkout/onepage/payment.phtml

Shipping method checkout form:

app/design/frontend/<package>/<theme>/template/checkout/onepage/shipping_method.phtml

Persistent Billing checkout form:

app/design/frontend/<package>/<theme>/template/persistent/checkout/onepage/billing.phtml

On top of that the following JS files have been updated to be compatible with that change:

js/varien/payment.js
skin/frontend/base/default/js/opcheckout.js

What to do:

If you're using with custom versions of those templates you'll have to update them by adding the following code into them:

<?php echo $this->getBlockHtml('formkey') ?>

If you're using a 3rd party checkout module, you'll have to get in touch with them so they can provide an updated version of their module.

Also if you have custom versions of the previously listed JS files, you'll have to update them too.

SAVE YOUR TIME:

Fabian Schmengler wrote a nice little script to update all those things for you, you can find it here:

https://gist.github.com/schmengler/c42acc607901a887ef86b4daa7a0445b

IMPORTANT NOTE : the checkout formkey validation can be changed in the backend via a new config field under System > Configuration > Admin > Security > Enable Form Key Validation On Checkout . THIS IS NOT ENABLED BY DEFAULT so you'll have to enable it to benefit from this security feature!!! Note that you'll get a notice in the backend if it's not enabled.

Image Upload callback

The image gallery controller has been updated to add a validation callback.

What to do

If you're using a custom module that does image upload with code that looks like this:

        $uploader = new Mage_Core_Model_File_Uploader('image');
        $uploader->setAllowedExtensions(array('jpg','jpeg','gif','png'));
        $uploader->addValidateCallback('catalog_product_image',
            Mage::helper('catalog/image'), 'validateUploadFile');
        $uploader->setAllowRenameFiles(true);
        $uploader->setFilesDispersion(true);

I strongly suggest you update that code by adding the following piece after it:

        $uploader->addValidateCallback(
            Mage_Core_Model_File_Validator_Image::NAME,
            Mage::getModel('core/file_validator_image'),
            'validate'
        );

Symlinks

This patch removes the system configuration field that allows you to allow template symlinks in the backend. It used to be under System > Configuration > Developer > Template > Allow Symlinks . Now the entire Template section is gone.

On top of that, that field is now disabled by default via the app/etc/config.xml

The funny thing here is that you'll get a notice in the backend if you have that configuration field enabled prior to the patch but you won't be able to disable it as the field is gone.

Only way of doing it is by running the following SQL query

UPDATE core_config_data SET value = 0 WHERE path = "dev/template/allow_symlink";

Clarification

First I strongly suggest you check those two posts that will help you understand the purpose of that Symlink modification:

From Peter O'Collaghan: https://peterocallaghan.co.uk/2017/06/appsec-1281-dangerous-symlinks/
From Max Chadwick: https://maxchadwick.xyz/blog/what-allow-symlinks-actually-does

This modification is really about calling uploadable content (like images) via template directives.

Please note that they are some protections against known way to exploit it in addition to the setting itself.

What to do: if like me, you're using modman or composer with template symlinks, you're gonna face some issues. I'm still trying to find out what's the best thing to do here apart from dealing with SQL queries.

Main post regarding this issue: SUPEE-9767, modman and symlinks

List of possible issues

V2 was released since that original post. Don't forget to upgrade

Bugs

The word 'confirmed' is used for confirmed bugs. If it's not there, that means it could be a bug but hasn't been confirmed yet.

Customer registration fails at checkout CONFIRMED & FIXED IN V2
PHP7 and EE bug CONFIRMED
Bug with EE, FPC and Design Exceptions CONFIRMED
Add to cart and cookie bug in EE CONFIRMED
Multishipping broken after patch CONFIRMED
Missing bug fix in head-simple.phtml CONFIRMED & FIXED IN V2
Admin Symlink warning is not displayed on 1.9.2 CONFIRMED & FIXED IN V2
Watermark get black background when transparent CONFIRMED & FIXED IN V2
Unable to upgrade via Magento Connect
Infinite redirect loop on 1.6.0.0

Hunk Failed Issues

Note that all those issues could be simply because you modified the original file, to double check that this is not the case:

Backup the file where you get the Hunk Failed error
Download the original file from your Magento version
Compare both files

If files are different you'll have to apply the patch with the original file then reapply your custom changes the clean way such as:

custom template in a custom theme folder
local.xml
app/code/local file

If files are not different then this is either a permission issue or a "bug" in the patch.

Magento 2.2.4 – Composer Patch Failed: ‘1 out of 1 hunk ignored’

In the case of this issue vs my install. Problem was composer based install of the site so the answer was to modify patch for me:

Problem

diff --git a/vendor/magento/module-email/Model/AbstractTemplate.php b/vendor/magento/module-email/Model/AbstractTemplate.php
index fa9d28074bf8..81e993fad76d 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -534,10 +534,9 @@ protected function cancelDesignConfig()
     */
    public function setForcedArea($templateId)
    {
-        if ($this->area) {
-            throw new \LogicException(__('Area is already set'));
+        if (!isset($this->area)) {
+            $this->area = $this->emailConfig->getTemplateArea($templateId);
        }
-        $this->area = $this->emailConfig->getTemplateArea($templateId);
        return $this;
    }

Solution

Replace:

app/code/Magento/Email/Model/AbstractTemplate.php

With the correct path to composer install

vendor/magento/module-email/Model/AbstractTemplate.php

Then, remove the “git --diff” and “index” lines:

diff --git a/vendor/magento/module-email/Model/AbstractTemplate.php b/vendor/magento/module-email/Model/AbstractTemplate.php
index fa9d28074bf8..81e993fad76d 100644