Commit 9f37c696 authored by Tres Seaver's avatar Tres Seaver

Prevent zlib-based DoS when parsing the cookie containing paste tokens.

Fixes LP #1094049.
parent ba2292bb
...@@ -8,6 +8,8 @@ http://docs.zope.org/zope2/ ...@@ -8,6 +8,8 @@ http://docs.zope.org/zope2/
2.12.28 (unreleased) 2.12.28 (unreleased)
-------------------- --------------------
- LP #1094049: prevent zlib-based DoS when parsing the cookie containing
paste tokens.
2.12.27 (2013-05-01) 2.12.27 (2013-05-01)
-------------------- --------------------
......
...@@ -25,7 +25,7 @@ from urllib import quote ...@@ -25,7 +25,7 @@ from urllib import quote
from urllib import unquote from urllib import unquote
import warnings import warnings
from zlib import compress from zlib import compress
from zlib import decompress from zlib import decompressobj
import transaction import transaction
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
...@@ -649,8 +649,12 @@ def absattr(attr): ...@@ -649,8 +649,12 @@ def absattr(attr):
def _cb_encode(d): def _cb_encode(d):
return quote(compress(dumps(d), 9)) return quote(compress(dumps(d), 9))
def _cb_decode(s): def _cb_decode(s, maxsize=8192):
return loads(decompress(unquote(s))) dec = decompressobj()
data = dec.decompress(unquote(s), maxsize)
if dec.unconsumed_tail:
raise ValueError
return loads(data)
def cookie_path(request): def cookie_path(request):
# Return a "path" value for use in a cookie that refers # Return a "path" value for use in a cookie that refers
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment