aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/meddleware
diff options
context:
space:
mode:
authorNathan Yergler <nathan@yergler.net>2011-11-26 14:34:36 -0800
committerNathan Yergler <nathan@yergler.net>2011-11-26 14:34:36 -0800
commit91cf67385a78a59af7874df327b96f7ea0b4259b (patch)
tree920644612f6279e547648f7e3d65bfb1cf93f591 /mediagoblin/meddleware
parente4113ad5b4226a7398ea0b629c2eae43b2f9c797 (diff)
downloadmediagoblin-91cf67385a78a59af7874df327b96f7ea0b4259b.tar.lz
mediagoblin-91cf67385a78a59af7874df327b96f7ea0b4259b.tar.xz
mediagoblin-91cf67385a78a59af7874df327b96f7ea0b4259b.zip
Issue 680: Dispatch meddleware request processing post-routing
Diffstat (limited to 'mediagoblin/meddleware')
-rw-r--r--mediagoblin/meddleware/__init__.py2
-rw-r--r--mediagoblin/meddleware/csrf.py2
-rw-r--r--mediagoblin/meddleware/noop.py3
3 files changed, 4 insertions, 3 deletions
diff --git a/mediagoblin/meddleware/__init__.py b/mediagoblin/meddleware/__init__.py
index 729a020d..7ba70d87 100644
--- a/mediagoblin/meddleware/__init__.py
+++ b/mediagoblin/meddleware/__init__.py
@@ -25,7 +25,7 @@ class BaseMeddleware(object):
def __init__(self, mg_app):
self.app = mg_app
- def process_request(self, request):
+ def process_request(self, request, controller):
pass
def process_response(self, request, response):
diff --git a/mediagoblin/meddleware/csrf.py b/mediagoblin/meddleware/csrf.py
index ca2eca5f..961fa7a6 100644
--- a/mediagoblin/meddleware/csrf.py
+++ b/mediagoblin/meddleware/csrf.py
@@ -58,7 +58,7 @@ class CsrfMeddleware(BaseMeddleware):
CSRF_KEYLEN = 64
SAFE_HTTP_METHODS = ("GET", "HEAD", "OPTIONS", "TRACE")
- def process_request(self, request):
+ def process_request(self, request, controller):
"""For non-safe requests, confirm that the tokens are present
and match.
"""
diff --git a/mediagoblin/meddleware/noop.py b/mediagoblin/meddleware/noop.py
index b43053de..f5376494 100644
--- a/mediagoblin/meddleware/noop.py
+++ b/mediagoblin/meddleware/noop.py
@@ -19,7 +19,8 @@ from mediagoblin.meddleware import BaseMeddleware
class NoOpMeddleware(BaseMeddleware):
- def process_request(self, request):
+
+ def process_request(self, request, controller):
pass
def process_response(self, request, response):