Fix pathhandling

misago/admin/tests/test_admin_views.py

@@ -12,20 +12,20 @@ from misago.admin.views import get_protected_namespace
 UserModel = get_user_model()
 
 
-class FakeRequest(object):
+class MockRequest(object):
     def __init__(self, path):
         self.path = path
-        self.path_info = path
 
 
 class AdminProtectedNamespaceTests(TestCase):
     def test_valid_cases(self):
         """get_protected_namespace returns true for protected links"""
-        links_prefix = reverse('misago:admin:index')
         TEST_CASES = ('', 'somewhere/', 'ejksajdlksajldjskajdlksajlkdas', )
-
+        
+        links_prefix = reverse('misago:admin:index')
+        
         for case in TEST_CASES:
-            request = FakeRequest(links_prefix + case)
+            request = MockRequest(links_prefix + case)
             self.assertEqual(get_protected_namespace(request), 'misago:admin')
 
     def test_invalid_cases(self):
@@ -33,7 +33,7 @@ class AdminProtectedNamespaceTests(TestCase):
         TEST_CASES = ('/', '/somewhere/', '/ejksajdlksajldjskajdlksajlkdas', )
 
         for case in TEST_CASES:
-            request = FakeRequest(case)
+            request = MockRequest(case)
             self.assertEqual(get_protected_namespace(request), None)
 
 

misago/admin/views/__init__.py

@@ -12,7 +12,7 @@ def get_protected_namespace(request):
     for namespace in settings.MISAGO_ADMIN_NAMESPACES:
         try:
             admin_path = reverse('%s:index' % namespace)
-            if request.path_info.startswith(admin_path):
+            if request.path.startswith(admin_path):
                 return namespace
         except NoReverseMatch:
             pass

misago/admin/views/generic/list.py

@@ -96,7 +96,7 @@ class ListView(AdminView):
                 if response:
                     return response
                 else:
-                    return redirect(request.path_info)
+                    return redirect(request.path)
             except MassActionError as e:
                 messages.error(request, e.args[0])
 
@@ -150,7 +150,7 @@ class ListView(AdminView):
                 return redirect('%s%s' % (reverse(self.root_link), context['querystring']))
 
         if refresh_querystring and not request.GET.get('redirected'):
-            return redirect('%s%s' % (request.path_info, context['querystring']))
+            return redirect('%s%s' % (request.path, context['querystring']))
 
         return self.render(request, context)
 

misago/core/context_processors.py

@@ -17,7 +17,7 @@ def site_address(request):
         'SITE_PROTOCOL': site_protocol,
         'SITE_HOST': host,
         'SITE_ADDRESS': address_template % host,
-        'REQUEST_PATH': request.path_info,
+        'REQUEST_PATH': request.path,
     }
 
 

misago/core/tests/test_context_processors.py

@@ -5,7 +5,7 @@ from misago.core import context_processors
 
 
 class MockRequest(object):
-    path_info = '/'
+    path = '/'
 
     def __init__(self, secure, host):
         self.secure = secure

misago/core/tests/test_utils.py

@@ -12,21 +12,19 @@ from misago.core.utils import (
     parse_iso8601_string, slugify, get_exception_message, clean_ids_list)
 
 
-VALID_PATHS = ("/", "/threads/", )
-
-INVALID_PATHS = ("", "somewhere/", )
-
-
 class IsRequestToMisagoTests(TestCase):
     def test_is_request_to_misago(self):
         """
         is_request_to_misago correctly detects requests directed at Misago
         """
+        VALID_PATHS = ('/', '/threads/', )
+        INVALID_PATHS = ('', 'somewhere/', )
+
         misago_prefix = reverse('misago:index')
 
         for path in VALID_PATHS:
             request = RequestFactory().get('/')
-            request.path_info = path
+            request.path = path
             self.assertTrue(
                 is_request_to_misago(request),
                 '"%s" is not overlapped by "%s"' % (path, misago_prefix)
@@ -34,7 +32,7 @@ class IsRequestToMisagoTests(TestCase):
 
         for path in INVALID_PATHS:
             request = RequestFactory().get('/')
-            request.path_info = path
+            request.path = path
             self.assertFalse(
                 is_request_to_misago(request),
                 '"%s" is overlapped by "%s"' % (path, misago_prefix)

misago/core/utils.py

@@ -115,11 +115,11 @@ def is_request_to_misago(request):
 def _is_request_path_under_misago(request):
     # We are assuming that forum_index link is root of all Misago links
     forum_index = reverse('misago:index')
-    path_info = request.path_info
+    path = request.path
 
-    if len(forum_index) > len(path_info):
+    if len(forum_index) > len(path):
         return False
-    return path_info[:len(forum_index)] == forum_index
+    return path[:len(forum_index)] == forum_index
 
 
 def is_referer_local(request):

misago/threads/tests/test_utils.py

@@ -253,11 +253,16 @@ class GetThreadIdFromUrlTests(MisagoTestCase):
     def test_get_thread_id_from_invalid_urls(self):
         TEST_CASES = [
             {
-                # invalid wsgi alias
+                # lacking wsgi alias
                 'request': MockRequest('https', 'testforum.com'),
                 'url': 'http://testforum.com/discuss/t/test-thread-123/',
             },
             {
+                # invalid wsgi alias
+                'request': MockRequest('https', 'testforum.com', '/discuss/'),
+                'url': 'http://testforum.com/forum/t/test-thread-123/',
+            },
+            {
                 # invalid hostname
                 'request': MockRequest('http', 'misago-project.org', '/discuss/'),
                 'url': 'https://testforum.com/discuss/t/test-thread-432/post/12321/',

misago/threads/utils.py

@@ -55,6 +55,8 @@ def get_thread_id_from_url(request, url):
 
     try:
         wsgi_alias = request.path[:len(request.path_info) * -1]
+        if wsgi_alias and not clean_path.startswith(wsgi_alias):
+            return None
         resolution = resolve(clean_path[len(wsgi_alias):])
     except:
         return None

misago/users/tests/test_bans.py

@@ -185,7 +185,7 @@ class UserBansTests(TestCase):
         self.assertFalse(self.user.ban_cache.is_banned)
 
 
-class FakeRequest(object):
+class MockRequest(object):
     def __init__(self):
         self.user_ip = '127.0.0.1'
         self.session = {}
@@ -194,7 +194,7 @@ class FakeRequest(object):
 class RequestIPBansTests(TestCase):
     def test_no_ban(self):
         """no ban found"""
-        ip_ban = get_request_ip_ban(FakeRequest())
+        ip_ban = get_request_ip_ban(MockRequest())
         self.assertIsNone(ip_ban)
 
     def test_permanent_ban(self):
@@ -205,13 +205,13 @@ class RequestIPBansTests(TestCase):
             user_message='User reason',
         )
 
-        ip_ban = get_request_ip_ban(FakeRequest())
+        ip_ban = get_request_ip_ban(MockRequest())
         self.assertTrue(ip_ban['is_banned'])
         self.assertEqual(ip_ban['ip'], '127.0.0.1')
         self.assertEqual(ip_ban['message'], 'User reason')
 
         # repeated call uses cache
-        get_request_ip_ban(FakeRequest())
+        get_request_ip_ban(MockRequest())
 
     def test_temporary_ban(self):
         """ip is caught by temporary ban"""
@@ -222,13 +222,13 @@ class RequestIPBansTests(TestCase):
             expires_on=timezone.now() + timedelta(days=7),
         )
 
-        ip_ban = get_request_ip_ban(FakeRequest())
+        ip_ban = get_request_ip_ban(MockRequest())
         self.assertTrue(ip_ban['is_banned'])
         self.assertEqual(ip_ban['ip'], '127.0.0.1')
         self.assertEqual(ip_ban['message'], 'User reason')
 
         # repeated call uses cache
-        get_request_ip_ban(FakeRequest())
+        get_request_ip_ban(MockRequest())
 
     def test_expired_ban(self):
         """ip is not caught by expired ban"""
@@ -239,11 +239,11 @@ class RequestIPBansTests(TestCase):
             expires_on=timezone.now() - timedelta(days=7),
         )
 
-        ip_ban = get_request_ip_ban(FakeRequest())
+        ip_ban = get_request_ip_ban(MockRequest())
         self.assertIsNone(ip_ban)
 
         # repeated call uses cache
-        get_request_ip_ban(FakeRequest())
+        get_request_ip_ban(MockRequest())
 
 
 class BanUserTests(TestCase):