From 7b43a503f31e47b0eae9fe2b12fbea5e7fd280f5 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 12 Dec 2014 15:05:37 +0000
Subject: Consistently url decode and decode as utf 8 the URL parts

---
 synapse/http/server.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'synapse/http/server.py')

diff --git a/synapse/http/server.py b/synapse/http/server.py
index 02277c4998..2d5d71c8aa 100644
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -29,6 +29,7 @@ from twisted.web.util import redirectTo
 
 import collections
 import logging
+import urllib
 
 logger = logging.getLogger(__name__)
 
@@ -122,9 +123,18 @@ class JsonResource(HttpServer, resource.Resource):
                     # We found a match! Trigger callback and then return the
                     # returned response. We pass both the request and any
                     # matched groups from the regex to the callback.
+
+                    logger.debug("url things: %r", m.groups())
+
+                    args = [
+                        urllib.unquote(u).decode("UTF-8") for u in m.groups()
+                    ]
+
+                    logger.debug("url things args: %r", args)
+
                     code, response = yield path_entry.callback(
                         request,
-                        *m.groups()
+                        *args
                     )
 
                     self._send_response(request, code, response)
-- 
cgit 1.4.1


From 1fc2a0e33ef6e88a79dbf4325468d8eb77db0f65 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 12 Dec 2014 15:08:29 +0000
Subject: Fix tests and remove debug logging

---
 synapse/http/server.py | 4 ----
 tests/utils.py         | 9 +++++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'synapse/http/server.py')

diff --git a/synapse/http/server.py b/synapse/http/server.py
index 2d5d71c8aa..f33859cf76 100644
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -124,14 +124,10 @@ class JsonResource(HttpServer, resource.Resource):
                     # returned response. We pass both the request and any
                     # matched groups from the regex to the callback.
 
-                    logger.debug("url things: %r", m.groups())
-
                     args = [
                         urllib.unquote(u).decode("UTF-8") for u in m.groups()
                     ]
 
-                    logger.debug("url things args: %r", args)
-
                     code, response = yield path_entry.callback(
                         request,
                         *args
diff --git a/tests/utils.py b/tests/utils.py
index f9a34748cd..70a221550c 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -29,7 +29,7 @@ from twisted.enterprise.adbapi import ConnectionPool
 
 from collections import namedtuple
 from mock import patch, Mock
-import json
+import urllib
 import urlparse
 
 from inspect import getcallargs
@@ -103,9 +103,14 @@ class MockHttpResource(HttpServer):
             matcher = pattern.match(path)
             if matcher:
                 try:
+                    args = [
+                        urllib.unquote(u).decode("UTF-8")
+                        for u in matcher.groups()
+                    ]
+
                     (code, response) = yield func(
                         mock_request,
-                        *matcher.groups()
+                        *args
                     )
                     defer.returnValue((code, response))
                 except CodeMessageException as e:
-- 
cgit 1.4.1