summaryrefslogtreecommitdiffstats
path: root/keystone
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2013-01-12 22:22:42 -0500
committerDan Prince <dprince@redhat.com>2013-01-21 19:54:29 -0500
commit7691276b869a86c2b75631d5bede9f61e030d9d8 (patch)
tree42da4e3aec16d1473f66a4f6463e3d8248f4207c /keystone
parent8748cfa3a6b7573550e7ec8ced87e6fd2096a628 (diff)
downloadkeystone-7691276b869a86c2b75631d5bede9f61e030d9d8.tar.gz
keystone-7691276b869a86c2b75631d5bede9f61e030d9d8.tar.xz
keystone-7691276b869a86c2b75631d5bede9f61e030d9d8.zip
Limit the size of HTTP requests.
Adds a new RequestBodySizeLimiter middleware to guard against really large HTTP requests. The default max request size is 112k although this limit is configurable via the 'max_request_body_size' config parameter. Fixes LP Bug #1099025. Change-Id: Id51be3d9a0d829d63d55a92dca61a39a17629785
Diffstat (limited to 'keystone')
-rw-r--r--keystone/common/utils.py34
-rw-r--r--keystone/config.py2
-rw-r--r--keystone/exception.py6
-rw-r--r--keystone/middleware/core.py21
4 files changed, 63 insertions, 0 deletions
diff --git a/keystone/common/utils.py b/keystone/common/utils.py
index d74da5b5..2c194db5 100644
--- a/keystone/common/utils.py
+++ b/keystone/common/utils.py
@@ -311,3 +311,37 @@ def setup_remote_pydev_debug():
except:
LOG.exception(_(error_msg))
raise
+
+
+class LimitingReader(object):
+ """Reader to limit the size of an incoming request."""
+ def __init__(self, data, limit):
+ """
+ :param data: Underlying data object
+ :param limit: maximum number of bytes the reader should allow
+ """
+ self.data = data
+ self.limit = limit
+ self.bytes_read = 0
+
+ def __iter__(self):
+ for chunk in self.data:
+ self.bytes_read += len(chunk)
+ if self.bytes_read > self.limit:
+ raise exception.RequestTooLarge()
+ else:
+ yield chunk
+
+ def read(self, i):
+ result = self.data.read(i)
+ self.bytes_read += len(result)
+ if self.bytes_read > self.limit:
+ raise exception.RequestTooLarge()
+ return result
+
+ def read(self):
+ result = self.data.read()
+ self.bytes_read += len(result)
+ if self.bytes_read > self.limit:
+ raise exception.RequestTooLarge()
+ return result
diff --git a/keystone/config.py b/keystone/config.py
index c26a518c..72fd0dcb 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -137,6 +137,8 @@ register_str('onready')
register_str('auth_admin_prefix', default='')
register_str('policy_file', default='policy.json')
register_str('policy_default_rule', default=None)
+#default max request size is 112k
+register_int('max_request_body_size', default=114688)
#ssl options
register_bool('enable', group='ssl', default=False)
diff --git a/keystone/exception.py b/keystone/exception.py
index 26697e0d..2787e064 100644
--- a/keystone/exception.py
+++ b/keystone/exception.py
@@ -173,6 +173,12 @@ class Conflict(Error):
title = 'Conflict'
+class RequestTooLarge(Error):
+ """Request is too large."""
+ code = 413
+ title = 'Request is too large.'
+
+
class UnexpectedError(Error):
"""An unexpected error prevented the server from fulfilling your request.
diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py
index a49f743b..24495c98 100644
--- a/keystone/middleware/core.py
+++ b/keystone/middleware/core.py
@@ -14,7 +14,10 @@
# License for the specific language governing permissions and limitations
# under the License.
+import webob.dec
+
from keystone.common import serializer
+from keystone.common import utils
from keystone.common import wsgi
from keystone import config
from keystone import exception
@@ -164,3 +167,21 @@ class NormalizingFilter(wsgi.Middleware):
# Rewrites path to root if no path is given.
elif not request.environ['PATH_INFO']:
request.environ['PATH_INFO'] = '/'
+
+
+class RequestBodySizeLimiter(wsgi.Middleware):
+ """Limit the size of an incoming request."""
+
+ def __init__(self, *args, **kwargs):
+ super(RequestBodySizeLimiter, self).__init__(*args, **kwargs)
+
+ @webob.dec.wsgify(RequestClass=wsgi.Request)
+ def __call__(self, req):
+
+ if req.content_length > CONF.max_request_body_size:
+ raise exception.RequestTooLarge()
+ if req.content_length is None and req.is_body_readable:
+ limiter = utils.LimitingReader(req.body_file,
+ CONF.max_request_body_size)
+ req.body_file = limiter
+ return self.application