0001-on_request-allow-hook-to-return-a-reponse.patch

Jérôme Schneider, 09 décembre 2014 18:05

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/5] on_request: allow hook to return a reponse

Closes #6130

 mandaye/dispatcher.py      | 20 ++++++++++++--------
 mandaye/filters/default.py |  1 -
 mandaye/server.py          |  8 +++-----
 3 files changed, 15 insertions(+), 14 deletions(-)

     from importlib import import_module
     from mandaye import config
     from mandaye.http import HTTPRequest, HTTPResponse
     from mandaye.log import logger
     from mandaye.mappers import default
     from mandaye.response import _500, _302
-...
             target_url: the full url of your destination
             mepper: python module with the mapper
             """
             self.target = urlparse(target_url)
             self.env = env
             self.target = urlparse(target_url)
             self.env['target'] = self.target
             self.mapper_name = mapper_name
             self.mapper = import_mapping(mapper_name)
-...
             for hook in self.req_mapping['on_request']:
                 if not self._is_cond_respected(hook, request, None):
                     continue
                 new_request = self._call_hook(hook, request)
                 if new_request:
                     request = new_request
                 else:
                     logger.warning("%s On_request hook %s failed (empty request)" % \
                             (self.env['PATH_INFO'], hook['filter']))
             return request
                 response = self._call_hook(hook, request)
                 if response and isinstance(response, HTTPResponse):
                     return response
                 elif response and isinstance(response, HTTPRequest):
                     logger.warning('DEPRECATED hook %s: a request hook must return None or an HTTPResponse nothing else',
                             hook['filter'])
                 elif response:
                     logger.warning("%s on_request hook (%s) must return None or an HTTPResponse nothing else",
                             self.env['PATH_INFO'], hook['filter'])
             return
         def mod_response(self, request, response):
             """ Modify the response. This will load on_response filters.

mandaye/filters/default.py
25	25	# Add forwarded header like Apache
26	26	request.headers.addheader('X-Forwarded-For', env['REMOTE_ADDR'])
27	27	request.headers.addheader('X-Forwarded-Host', env['HTTP_HOST'])
28		return request
29	28
30	29	@staticmethod
31	30	def on_response(env, values, request, response):

                                     (conf_file, conf['mapper'])
                             logger.error(err)
                             raise ImproperlyConfigured, err
                         self.env['mandaye.auth_type'] = conf['mapper']
                         if not config.authentifications.has_key(conf['auth_type']):
                             err = '%s: authentification %s not found' % \
                                     (conf_file, conf['auth_type'])
-...
         def on_request(self, start_response):
             request = self._get_request()
             # Calling the dispatcher hook for the request
             request = self.dispatcher.mod_request(request)
             if not request:
                 return self.on_response(start_response,
                         _500(self.env["PATH_INFO"], "Empty request"))
             response = self.dispatcher.mod_request(request)
             if response:
                 return response
             if not request.target:
                 response = self.dispatcher.get_response(request)
             elif not "://" in request.target:
+    -

Projet

Général

Profil

Produits Entr'ouvert » Mandaye

0001-on_request-allow-hook-to-return-a-reponse.patch