Skip to content

Commit

Permalink
Allow uploads up to 16 MB.
Browse files Browse the repository at this point in the history
This fixes a regression due to a low Zope form memory limit of 1MB used since Plone 6.0.7.
You can use ``dos_protection`` settings in ``etc/zope.conf`` to change the limit.
See plone/Products.CMFPlone#3848 and zopefoundation/Zope#1142.
  • Loading branch information
mauritsvanrees committed Nov 2, 2023
1 parent 3b4c810 commit 721833d
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 0 deletions.
5 changes: 5 additions & 0 deletions news/3848.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Allow uploads up to 16 MB.
This fixes a regression due to a low Zope form memory limit of 1MB used since Plone 6.0.7.
You can use ``dos_protection`` settings in ``etc/zope.conf`` to change the limit.
See `CMFPlone issue 3848 <https://github.com/plone/Products.CMFPlone/issues/3848>`_ and `Zope PR 1142 <https://github.com/zopefoundation/Zope/pull/1142>`_.
@maurits
1 change: 1 addition & 0 deletions src/plone/restapi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from . import patches
from AccessControl import allow_module
from AccessControl.Permissions import add_user_folders
from plone.restapi.pas import plugin
Expand Down
3 changes: 3 additions & 0 deletions src/plone/restapi/deserializer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@


def json_body(request):
# TODO We should not read the complete request BODY in memory.
# Once we have fixed this, we can remove the temporary patches.py.
# See there for background information.
try:
data = json.loads(request.get("BODY") or "{}")
except ValueError:
Expand Down
20 changes: 20 additions & 0 deletions src/plone/restapi/patches.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# TEMPORARY patch for low form memory limit introduced in Zope 5.8.4.
# See https://github.com/plone/Products.CMFPlone/issues/3848
# and https://github.com/zopefoundation/Zope/pull/1180
# Should be removed once `plone.restapi.deserializer.json_body` no longer
# reads the complete request BODY in memory.
from ZPublisher import HTTPRequest

import logging


logger = logging.getLogger(__name__)
_attr = "FORM_MEMORY_LIMIT"
_limit = getattr(HTTPRequest, _attr, None)
if _limit and _limit == 2**20:
setattr(HTTPRequest, _attr, 2**24)
logger.info(
"PATCH: ZPublisher.HTTPRequest.%s is at a too low default of 1MB. "
"Increased it to 16MB to enable larger file uploads.",
_attr,
)

0 comments on commit 721833d

Please sign in to comment.