Merge pull request #1327 from magento-engcom/2.1-develop-prs

Public Pull Requests

#10218

Author: Oleksii Korshenko

app/code/Magento/PageCache/view/frontend/web/js/page-cache.js

@@ -24,6 +24,18 @@ define([
          * @param {jQuery} element - Comment holder
          */
         (function lookup(element) {
+            var iframeHostName;
+
+            // prevent cross origin iframe content reading
+            if ($(element).prop('tagName') === 'IFRAME') {
+                iframeHostName = $('<a>').prop('href', $(element).prop('src'))
+                                             .prop('hostname');
+
+                if (window.location.hostname !== iframeHostName) {
+                    return [];
+                }
+            }
+
             $(element).contents().each(function (index, el) {
                 switch (el.nodeType) {
                     case 1: // ELEMENT_NODE
@@ -35,14 +47,7 @@ define([
                         break;
 
                     case 9: // DOCUMENT_NODE
-                        var hostName = window.location.hostname,
-                            iFrameHostName = $('<a>')
-                                .prop('href', element.prop('src'))
-                                .prop('hostname');
-
-                        if (hostName === iFrameHostName) {
-                            lookup($(el).find('body'));
-                        }
+                        lookup($(el).find('body'));
                         break;
                 }
             });
@@ -159,17 +164,16 @@ define([
          * @protected
          */
         _replacePlaceholder: function (placeholder, html) {
+            var startReplacing = false,
+                prevSibling = null,
+                parent, contents, yy, len, element;
+
             if (!placeholder || !html) {
                 return;
             }
 
-            var parent = $(placeholder.openElement).parent(),
-                contents = parent.contents(),
-                startReplacing = false,
-                prevSibling = null,
-                yy,
-                len,
-                element;
+            parent = $(placeholder.openElement).parent();
+            contents = parent.contents();
 
             for (yy = 0, len = contents.length; yy < len; yy++) {
                 element = contents[yy];

dev/tests/js/jasmine/tests/app/code/Magento/PageCache/frontend/js/page-cache.test.js

@@ -58,7 +58,7 @@ define([
 
         it('on iframe from other host returns empty Array', function () {
             iframe.contents().find('body').html(comment);
-            iframe.attr('src', '//' + host + '.otherHost/');
+            iframe.attr('src', '//' + host + '.otherHost/?origin_url=' + host);
 
             expect(iframe.comments().length).toEqual(0);
         });