Merge "Remove oslo middleware"
This commit is contained in:
commit
fe65c8573f
@ -1,56 +0,0 @@
|
|||||||
# Copyright 2011 OpenStack Foundation.
|
|
||||||
# All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
"""Base class(es) for WSGI Middleware."""
|
|
||||||
|
|
||||||
import webob.dec
|
|
||||||
|
|
||||||
|
|
||||||
class Middleware(object):
|
|
||||||
"""Base WSGI middleware wrapper.
|
|
||||||
|
|
||||||
These classes require an application to be initialized that will be called
|
|
||||||
next. By default the middleware will simply call its wrapped app, or you
|
|
||||||
can override __call__ to customize its behavior.
|
|
||||||
"""
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def factory(cls, global_conf, **local_conf):
|
|
||||||
"""Factory method for paste.deploy."""
|
|
||||||
return cls
|
|
||||||
|
|
||||||
def __init__(self, application):
|
|
||||||
self.application = application
|
|
||||||
|
|
||||||
def process_request(self, req):
|
|
||||||
"""Called on each request.
|
|
||||||
|
|
||||||
If this returns None, the next application down the stack will be
|
|
||||||
executed. If it returns a response then that response will be returned
|
|
||||||
and execution will stop here.
|
|
||||||
"""
|
|
||||||
return None
|
|
||||||
|
|
||||||
def process_response(self, response):
|
|
||||||
"""Do whatever you'd like to the response."""
|
|
||||||
return response
|
|
||||||
|
|
||||||
@webob.dec.wsgify
|
|
||||||
def __call__(self, req):
|
|
||||||
response = self.process_request(req)
|
|
||||||
if response:
|
|
||||||
return response
|
|
||||||
response = req.get_response(self.application)
|
|
||||||
return self.process_response(response)
|
|
@ -1,43 +0,0 @@
|
|||||||
# Copyright (c) 2013 NEC Corporation
|
|
||||||
# All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
"""Middleware that provides high-level error handling.
|
|
||||||
|
|
||||||
It catches all exceptions from subsequent applications in WSGI pipeline
|
|
||||||
to hide internal errors from API response.
|
|
||||||
"""
|
|
||||||
import logging
|
|
||||||
|
|
||||||
import webob.dec
|
|
||||||
import webob.exc
|
|
||||||
|
|
||||||
from ceilometer.openstack.common.gettextutils import _LE
|
|
||||||
from ceilometer.openstack.common.middleware import base
|
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class CatchErrorsMiddleware(base.Middleware):
|
|
||||||
|
|
||||||
@webob.dec.wsgify
|
|
||||||
def __call__(self, req):
|
|
||||||
try:
|
|
||||||
response = req.get_response(self.application)
|
|
||||||
except Exception:
|
|
||||||
LOG.exception(_LE('An error occurred during '
|
|
||||||
'processing the request: %s'))
|
|
||||||
response = webob.exc.HTTPInternalServerError()
|
|
||||||
return response
|
|
@ -1,28 +0,0 @@
|
|||||||
# Copyright (c) 2013 Rackspace Hosting
|
|
||||||
# All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
"""Middleware that attaches a correlation id to WSGI request"""
|
|
||||||
|
|
||||||
import uuid
|
|
||||||
|
|
||||||
from ceilometer.openstack.common.middleware import base
|
|
||||||
|
|
||||||
|
|
||||||
class CorrelationIdMiddleware(base.Middleware):
|
|
||||||
|
|
||||||
def process_request(self, req):
|
|
||||||
correlation_id = (req.headers.get("X_CORRELATION_ID") or
|
|
||||||
str(uuid.uuid4()))
|
|
||||||
req.headers['X_CORRELATION_ID'] = correlation_id
|
|
@ -1,60 +0,0 @@
|
|||||||
# Copyright 2011 OpenStack Foundation.
|
|
||||||
# All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
"""Debug middleware"""
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import sys
|
|
||||||
|
|
||||||
import six
|
|
||||||
import webob.dec
|
|
||||||
|
|
||||||
from ceilometer.openstack.common.middleware import base
|
|
||||||
|
|
||||||
|
|
||||||
class Debug(base.Middleware):
|
|
||||||
"""Helper class that returns debug information.
|
|
||||||
|
|
||||||
Can be inserted into any WSGI application chain to get information about
|
|
||||||
the request and response.
|
|
||||||
"""
|
|
||||||
|
|
||||||
@webob.dec.wsgify
|
|
||||||
def __call__(self, req):
|
|
||||||
print(("*" * 40) + " REQUEST ENVIRON")
|
|
||||||
for key, value in req.environ.items():
|
|
||||||
print(key, "=", value)
|
|
||||||
print()
|
|
||||||
resp = req.get_response(self.application)
|
|
||||||
|
|
||||||
print(("*" * 40) + " RESPONSE HEADERS")
|
|
||||||
for (key, value) in six.iteritems(resp.headers):
|
|
||||||
print(key, "=", value)
|
|
||||||
print()
|
|
||||||
|
|
||||||
resp.app_iter = self.print_generator(resp.app_iter)
|
|
||||||
|
|
||||||
return resp
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def print_generator(app_iter):
|
|
||||||
"""Prints the contents of a wrapper string iterator when iterated."""
|
|
||||||
print(("*" * 40) + " BODY")
|
|
||||||
for part in app_iter:
|
|
||||||
sys.stdout.write(part)
|
|
||||||
sys.stdout.flush()
|
|
||||||
yield part
|
|
||||||
print()
|
|
@ -1,41 +0,0 @@
|
|||||||
# Copyright (c) 2013 NEC Corporation
|
|
||||||
# All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
"""Middleware that ensures request ID.
|
|
||||||
|
|
||||||
It ensures to assign request ID for each API request and set it to
|
|
||||||
request environment. The request ID is also added to API response.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import webob.dec
|
|
||||||
|
|
||||||
from ceilometer.openstack.common import context
|
|
||||||
from ceilometer.openstack.common.middleware import base
|
|
||||||
|
|
||||||
|
|
||||||
ENV_REQUEST_ID = 'openstack.request_id'
|
|
||||||
HTTP_RESP_HEADER_REQUEST_ID = 'x-openstack-request-id'
|
|
||||||
|
|
||||||
|
|
||||||
class RequestIdMiddleware(base.Middleware):
|
|
||||||
|
|
||||||
@webob.dec.wsgify
|
|
||||||
def __call__(self, req):
|
|
||||||
req_id = context.generate_request_id()
|
|
||||||
req.environ[ENV_REQUEST_ID] = req_id
|
|
||||||
response = req.get_response(self.application)
|
|
||||||
if HTTP_RESP_HEADER_REQUEST_ID not in response.headers:
|
|
||||||
response.headers.add(HTTP_RESP_HEADER_REQUEST_ID, req_id)
|
|
||||||
return response
|
|
@ -1,82 +0,0 @@
|
|||||||
# Copyright (c) 2012 Red Hat, Inc.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
"""
|
|
||||||
Request Body limiting middleware.
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
from oslo.config import cfg
|
|
||||||
import webob.dec
|
|
||||||
import webob.exc
|
|
||||||
|
|
||||||
from ceilometer.openstack.common.gettextutils import _
|
|
||||||
from ceilometer.openstack.common.middleware import base
|
|
||||||
|
|
||||||
|
|
||||||
# default request size is 112k
|
|
||||||
max_req_body_size = cfg.IntOpt('max_request_body_size',
|
|
||||||
deprecated_name='osapi_max_request_body_size',
|
|
||||||
default=114688,
|
|
||||||
help='The maximum body size for each '
|
|
||||||
' request, in bytes.')
|
|
||||||
|
|
||||||
CONF = cfg.CONF
|
|
||||||
CONF.register_opt(max_req_body_size)
|
|
||||||
|
|
||||||
|
|
||||||
class LimitingReader(object):
|
|
||||||
"""Reader to limit the size of an incoming request."""
|
|
||||||
def __init__(self, data, limit):
|
|
||||||
"""Initiates LimitingReader object.
|
|
||||||
|
|
||||||
: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:
|
|
||||||
msg = _("Request is too large.")
|
|
||||||
raise webob.exc.HTTPRequestEntityTooLarge(explanation=msg)
|
|
||||||
else:
|
|
||||||
yield chunk
|
|
||||||
|
|
||||||
def read(self, i=None):
|
|
||||||
result = self.data.read(i)
|
|
||||||
self.bytes_read += len(result)
|
|
||||||
if self.bytes_read > self.limit:
|
|
||||||
msg = _("Request is too large.")
|
|
||||||
raise webob.exc.HTTPRequestEntityTooLarge(explanation=msg)
|
|
||||||
return result
|
|
||||||
|
|
||||||
|
|
||||||
class RequestBodySizeLimiter(base.Middleware):
|
|
||||||
"""Limit the size of incoming requests."""
|
|
||||||
|
|
||||||
@webob.dec.wsgify
|
|
||||||
def __call__(self, req):
|
|
||||||
if (req.content_length is not None and
|
|
||||||
req.content_length > CONF.max_request_body_size):
|
|
||||||
msg = _("Request is too large.")
|
|
||||||
raise webob.exc.HTTPRequestEntityTooLarge(explanation=msg)
|
|
||||||
if req.content_length is None and req.is_body_readable:
|
|
||||||
limiter = LimitingReader(req.body_file,
|
|
||||||
CONF.max_request_body_size)
|
|
||||||
req.body_file = limiter
|
|
||||||
return self.application
|
|
@ -10,12 +10,6 @@ module=local
|
|||||||
module=log
|
module=log
|
||||||
module=log_handler
|
module=log_handler
|
||||||
module=loopingcall
|
module=loopingcall
|
||||||
module=middleware.base
|
|
||||||
module=middleware.catch_errors
|
|
||||||
module=middleware.correlation_id
|
|
||||||
module=middleware.debug
|
|
||||||
module=middleware.request_id
|
|
||||||
module=middleware.sizelimit
|
|
||||||
module=policy
|
module=policy
|
||||||
module=service
|
module=service
|
||||||
module=threadgroup
|
module=threadgroup
|
||||||
|
Loading…
Reference in New Issue
Block a user