Merge 3bbed13 into 7ebd9a9

CHANGES.rst

@@ -6,6 +6,9 @@ There's a frood who really knows where his towel is.
 1.1b2 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
+- Implement CSRF protection (closes `#590`_).
+  [rodfersou]
+
 - Handle `AssertionError` on upgrade step to profile 13 to avoid failures when a cover object has duplicated tiles on it.
   Now, an error message will be logged and the object will be skipped;
   you must manually remove the duplicated tiles (closes #619).
@@ -86,4 +89,5 @@ Previous entries can be found in the HISTORY.rst file.
 .. _`#578`: https://github.com/collective/collective.cover/issues/578
 .. _`#581`: https://github.com/collective/collective.cover/issues/581
 .. _`#584`: https://github.com/collective/collective.cover/issues/584
+.. _`#590`: https://github.com/collective/collective.cover/issues/590
 .. _`#608`: https://github.com/collective/collective.cover/issues/608

buildout.cfg

@@ -18,6 +18,9 @@ parts +=
     rebuild_i18n-sh
     robot
 
+test-eggs +=
+    plone4.csrffixes
+
 [checkversions]
 recipe = zc.recipe.egg
 eggs = z3c.checkversions [buildout]

src/collective/cover/browser/templates/compose.pt

@@ -34,6 +34,7 @@
         tal:replace="structure layout/render_compose" />
     <div class="content-contentchooser"
         tal:replace="structure context/@@select-content-contentchooser" />
+    <form id="cover-compose-form" method="POST"></form>
 </metal:main>
 
 </body>

src/collective/cover/browser/templates/layoutedit.pt

@@ -69,7 +69,7 @@
                 <div id="export-layout" class="modal hide" tal:condition="can_export_layout">
                     <h1 class="documentFirstHeading">Export Layout</h1>
                     <p class="discreen">Save a copy of this layout under a new name</p>
-                    <form action="." tal:attributes="action request/URL" method="post"
+                    <form id="cover-layout-form" tal:attributes="action request/URL" method="post"
                           enctype="multipart/form-data">
                         <div class="modal-fields">
                             <label for="layout-name" i18n:translate="">Layout name</label>

src/collective/cover/static/js/compose.js

@@ -26,9 +26,11 @@ function removeObjFromTile() {
     tile.find('.loading-mask').addClass('show remove-tile');
     var tile_type = tile.attr("data-tile-type");
     var tile_id = tile.attr("id");
+    var authenticator = $('#cover-compose-form input[name="_authenticator"]').val();
     $.ajax({
       url: "@@removeitemfromlisttile",
       data: {
+        '_authenticator': authenticator,
         'tile-type': tile_type,
         'tile-id': tile_id,
         'uuid': uuid
@@ -73,9 +75,11 @@ $(document).ready(function() {
       var tile = $(this).closest('.tile');
       var tile_type = tile.attr("data-tile-type");
       var tile_id = tile.attr("id");
+      var authenticator = $('#cover-compose-form input[name="_authenticator"]').val();
       $.ajax({
         url: "@@updatelisttilecontent",
         data: {
+          '_authenticator': authenticator,
           'tile-type': tile_type,
           'tile-id': tile_id,
           'uuids': uuids

src/collective/cover/static/js/contentchooser.js

@@ -226,7 +226,9 @@ var coveractions = {
     var url = $("#contentchooser-content-search-button").attr("data-url");
     var queryVal = $("#contentchooser-content-search-input").val();
     var nextpage = parseInt($ul.attr('data-nextpage'), 10);
+    var authenticator = $('#cover-compose-form input[name="_authenticator"]').val();
     var data = {
+      '_authenticator': authenticator,
       'q': queryVal,
       'page': nextpage
     };
@@ -263,7 +265,9 @@ var coveractions = {
     timeoutIDs = [];
     $('#ajax-spinner').hide();
     var timeoutID = setTimeout(function() {
+      var authenticator = $('#cover-compose-form input[name="_authenticator"]').val();
       var data = {
+        '_authenticator': authenticator,
         'q': queryVal,
         'page': page
       };
@@ -329,8 +333,12 @@ var coveractions = {
 
     $(document).on("click", "#recent .contentchooser-clear", function(e) {
       $(e.currentTarget).prev().children("input").val("");
+      var authenticator = $('#cover-compose-form input[name="_authenticator"]').val();
       ajaxSearchRequest.push($.ajax({
         url: portal_url + "/@@content-search",
+        data: {
+          '_authenticator': authenticator
+        },
         success: function(info) {
           $("#contentchooser-content-search #recent .item-list").html(info);
           $('#recent .filter-count').text("");
@@ -414,6 +422,7 @@ var coveractions = {
         var origin_has_subitem = $origin.attr('data-has-subitem') === 'True';
         var draggable_uuid = $draggable.attr('data-content-uuid');
         var draggable_type = $draggable.attr('data-content-type');
+        var authenticator = $('#cover-compose-form input[name="_authenticator"]').val();
         if (target_id === draggable_id) {
           return false;
         }
@@ -426,6 +435,7 @@ var coveractions = {
               $.ajax({
                 url: "@@removeitemfromlisttile",
                 data: {
+                  '_authenticator': authenticator,
                   'tile-type': origin_type,
                   'tile-id': draggable_id,
                   'uuid': draggable_uuid
@@ -452,6 +462,7 @@ var coveractions = {
           $.ajax({
             url: '@@movetilecontent',
             data: {
+              '_authenticator': authenticator,
               'origin-type': origin_type,
               'origin-id': draggable_id,
               'target-type': target_type,
@@ -468,6 +479,7 @@ var coveractions = {
               $.ajax({
                 url: '@@updatetile',
                 data: {
+                  '_authenticator': authenticator,
                   'tile-type': origin_type,
                   'tile-id': draggable_id,
                 },
@@ -499,6 +511,7 @@ var coveractions = {
           $.ajax({
             url: '@@updatetilecontent',
             data: {
+              '_authenticator': authenticator,
               'tile-type': target_type,
               'tile-id': target_id,
               'uuid': draggable_uuid

src/collective/cover/static/js/galleria.cover_theme.js

@@ -93,9 +93,11 @@ var rm_button = function(data) {
             tile.find('.loading-mask').addClass('show remove-tile');
             var tile_type = "collective.cover.carousel";
             var tile_id = tile.attr("id");
+            var authenticator = $('#cover-compose-form input[name="_authenticator"]').val();
             $.ajax({
               url: "@@removeitemfromlisttile",
               data: {
+                '_authenticator': authenticator,
                 'tile-type': tile_type,
                 'tile-id': tile_id,
                 'uuid': uuid

src/collective/cover/static/js/layout_base.js

@@ -8,13 +8,15 @@ $(document).ready(function() {
       event.preventDefault();
       json = layout.layoutmanager().html2json(layout);
       var $this = $(this);
+      var authenticator = $('#cover-layout-form input[name="_authenticator"]').val();
       $this.removeClass(function(index, css) {
         return (css.match(/\bbtn-\S+/g) || []).join(' ');
       });
       $this.find('span').text('Saving...');
       $.ajax({
         'url': '@@save_layout',
         'data': {
+          '_authenticator': authenticator,
           'cover_layout': JSON.stringify(json)
         },
         'type': 'POST',

src/collective/cover/static/js/layout_edit.js

@@ -306,10 +306,12 @@
           //XXX are you sure
           tiles_to_delete.each(function() {
             var $this = $(this);
+            var authenticator = $('#cover-compose-form input[name="_authenticator"]').val();
 
             $.ajax({
               url: 'deletetile',
               data: {
+                '_authenticator': authenticator,
                 'tile-type': $this.data('tileType'),
                 'tile-id': $(this).attr('id')
               },
@@ -502,7 +504,9 @@
           e.preventDefault();
           var url = $("#configure_tile").attr("action");
           var data = $("#configure_tile").serialize();
-          data = data + '&buttons.save=Save&ajax_load=true';
+          var authenticator = $('#cover-compose-form input[name="_authenticator"]').val();
+          data += '&buttons.save=Save&ajax_load=true';
+          data += '&_authenticator=' + authenticator;
           $.ajax({
             type: 'POST',
             url: url,
@@ -525,11 +529,13 @@
         $(document).on("click", ".config-tile-link", function(e) {
           e.preventDefault();
           var url = $(this).attr("href");
+          var authenticator = $('#cover-compose-form input[name="_authenticator"]').val();
           $('#tile-configure').modal();
           $.ajax({
             type: 'GET',
             url: url,
             data: {
+              '_authenticator': authenticator,
               'ajax_load': true
             },
             success: function(data) {

src/collective/cover/testing.py

@@ -136,6 +136,9 @@ def setUpZope(self, app, configurationContext):
                 self.loadZCML(package=Products.PloneFormGen)
                 z2.installProduct(app, 'Products.PloneFormGen')
 
+            import plone4.csrffixes
+            self.loadZCML(package=plone4.csrffixes)
+
         import collective.cover
         self.loadZCML(package=collective.cover)
 

src/collective/cover/tests/cover.robot

@@ -22,6 +22,7 @@ ${column_drop_area_selector} =  div.cover-row
 ${tile_drop_area_selector} =  div.cover-column
 ${tile_cancel_area_selector} =  div.modal-backdrop
 ${delete_tile_selector} =  button.close
+${confirm_action_selector} =  input.standalone
 ${CONTENT_CHOOSER_SELECTOR} =  div#contentchooser-content-search
 
 *** Keywords ***
@@ -37,9 +38,25 @@ Start Browser and Log In as Site Owner
     Log In As Site Owner
     Click Link  link=Home
 
+# BBB: This needs to be customized to handle both Plone 4.2 and 4.3.
+# In Plone 4.2, we still have the confirm action button that it's gone in 4.3.
+# Customized from
+# https://github.com/plone/plone.app.robotframework/blob/9ab289c5b93c2aa1acb6078b955694ad458d9c3b/src/plone/app/robotframework/keywords.robot#L53
+Go to homepage
+
+    # Both.
+    Go to  ${PLONE_URL}
+
+    # Plone 4.2.
+    Run keyword if  '${CMFPLONE_VERSION}' < '4.3'  Wait Until Page Contains Element  css=${confirm_action_selector}
+    Run keyword if  '${CMFPLONE_VERSION}' < '4.3'  Click Element  css=${confirm_action_selector}
+    Run keyword if  '${CMFPLONE_VERSION}' < '4.3'  Page Should Contain  Plone site
+
+    # Plone >= 4.3.
+    Run keyword if  '${CMFPLONE_VERSION}' >= '4.3'  Wait until location is  ${PLONE_URL}
+
 Setup Cover Test Case
     Start Browser and Log In as Site Owner
-    Go to Homepage
 
 Click Add Cover
     Open Add New Menu

src/collective/cover/tests/test_banner_tile.robot

@@ -27,6 +27,7 @@ Test Banner Tile
     # XXX: test is randomly failing under Plone 4.2 only
     Run keyword if  '${CMFPLONE_VERSION}' >= '4.3'  Remove Tags  Mandelbug
 
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage
     Create Cover  Title  Description

src/collective/cover/tests/test_basic_tile.robot

@@ -31,6 +31,7 @@ Test Basic Tile
     # XXX: test is randomly failing under Plone 4.2 only
     Run keyword if  '${CMFPLONE_VERSION}' >= '4.3'  Remove Tags  Mandelbug
 
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage
     Create Cover  Title  Description

src/collective/cover/tests/test_carousel_tile.robot

@@ -30,6 +30,7 @@ Get Total Carousel Images
 *** Test cases ***
 
 Test Carousel Tile
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage
     Create Cover  Title  Description

src/collective/cover/tests/test_collection_tile.robot

@@ -29,6 +29,7 @@ Test Collection Tile
     # XXX: test is randomly failing under Plone 4.2 only
     Run keyword if  '${CMFPLONE_VERSION}' >= '4.3'  Remove Tags  Mandelbug
 
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage
     Create Cover  My Cover  Description

src/collective/cover/tests/test_contentbody_tile.robot

@@ -19,6 +19,9 @@ ${document_body}  body.portaltype-document
 *** Test cases ***
 
 Test Content Body Tile
+    [Tags]  issue_580
+
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage
     Create Cover  My Cover  Description

src/collective/cover/tests/test_contentchooser.robot

@@ -18,6 +18,7 @@ ${tile_selector}  div.tile-container div.tile
 *** Test cases ***
 
 Test Content Chooser
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage
     Create Cover  Title  Description
@@ -38,13 +39,16 @@ Test Content Chooser
 
     # make a search on Recent items
     Click Element  link=Recent items
+    Wait Until Element Is Visible  css=#contentchooser-content-search-input
     Input Text  css=#recent input  folder
     # FIXME: we have no result counter in here
     #Wait Until Page Contains  1 Results
     Click Element  css=#recent ${contentchooser_search_clear}
+    Sleep  4s  Wait for complete ajax call @@content-search for cleaning
 
     Click Element  link=Content tree
-    Wait Until Page Contains  Plone site
+    Sleep  2s  Wait for content tree to load
+    Wait Until Element Is Visible  css=#contentchooser-content-trees
 
     # make a search on Content tree
     Input Text  css=#content-trees input  file
@@ -53,6 +57,7 @@ Test Content Chooser
     # navigate the tree
     Click Element  css=#content-trees ${contentchooser_search_clear}
     Input Text  css=#content-trees input  file
+    Sleep  2s  Wait for content tree to load
     Wait Until Page Contains  1 Results
     Page Should Contain Element  css=${file_selector}
     # TODO: Refactor this test before https://github.com/collective/collective.cover/issues/508

src/collective/cover/tests/test_cover.robot

@@ -9,6 +9,7 @@ Test Teardown  Close all browsers
 *** Test cases ***
 
 Test CRUD
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage
 
@@ -17,6 +18,7 @@ Test CRUD
     Delete
 
 Test renderBase
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Goto Homepage
 

src/collective/cover/tests/test_css_class.robot

@@ -18,6 +18,7 @@ ${tile_class}  div.cover-tile
 *** Test cases ***
 
 Test CSS Class
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage
 

src/collective/cover/tests/test_drag_and_drop_among_tiles.robot

@@ -22,6 +22,7 @@ ${list_tile_selector}  [data-tile-type=collective\\.cover\\.list]
 Test Drag And Drop Among Tiles
     [Tags]  Expected Failure
 
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage
     Create Cover  Title  Description

src/collective/cover/tests/test_embed_tile.robot

@@ -24,6 +24,7 @@ Test Embed Tile
     # XXX: test is randomly failing under Plone 4.2 only
     Run keyword if  '${CMFPLONE_VERSION}' >= '4.3'  Remove Tags  Mandelbug
 
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage
     Create Cover  Title  Description

src/collective/cover/tests/test_file_tile.robot

@@ -24,6 +24,7 @@ Test File Tile
     # XXX: test is randomly failing under Plone 4.2 only
     Run keyword if  '${CMFPLONE_VERSION}' >= '4.3'  Remove Tags  Mandelbug
 
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage
     Create Cover  Title  Description

src/collective/cover/tests/test_layout.robot

@@ -14,6 +14,7 @@ ${tile_class} =  div.cover-tile
 *** Test cases ***
 
 Test Basic Layout Operations
+    Set Library Search Order  cover
     Enable Autologin as  Site Administrator
     Go to Homepage