Show 404 status code for missing sites

Author: norkans7

ureport/public/tests.py

@@ -146,6 +146,10 @@ def test_index(self, mock_get_global_count, mock_cache_get):
         mock_cache_get.return_value = None
         home_url = reverse("public.index")
 
+        response = self.client.get(home_url, SERVER_NAME="random.ureport.io")
+        self.assertEqual(response.request["PATH_INFO"], "/")
+        self.assertEqual(response.status_code, 404)
+
         response = self.client.get(home_url, SERVER_NAME="nigeria.ureport.io")
         self.assertEqual(response.request["PATH_INFO"], "/")
         self.assertEqual(response.context["org"], self.nigeria)
@@ -320,6 +324,12 @@ def test_additional_menu(self):
     def test_about(self):
         about_url = reverse("public.about")
 
+        response = self.client.get(about_url, SERVER_NAME="random.ureport.io")
+        self.assertEqual(response.request["PATH_INFO"], "/about/")
+        self.assertEqual(response.status_code, 302)
+        response = self.client.get(about_url, SERVER_NAME="random.ureport.io", follow=True)
+        self.assertEqual(response.status_code, 404)
+
         response = self.client.get(about_url, SERVER_NAME="nigeria.ureport.io")
         self.assertEqual(response.request["PATH_INFO"], "/about/")
         self.assertEqual(response.context["org"], self.nigeria)

ureport/public/views.py

@@ -50,6 +50,8 @@
 class RedirectConfigMixin(object):
     def has_permission(self, request, *args, **kwargs):
         org = request.org
+        if org is None:
+            return False
         redirect_site_url = org.get_config("redirect_site_url", "").strip()
         if redirect_site_url:
             return request.user.is_authenticated and (org in request.user.get_user_orgs() or request.user.is_superuser)
@@ -61,6 +63,8 @@ class IndexView(SmartTemplateView):
 
     def pre_process(self, request, *args, **kwargs):
         org = request.org
+        if org is None:
+            raise Http404("Page not found")
         redirect_site_url = org.get_config("redirect_site_url", "").strip()
         if redirect_site_url and not request.user.is_authenticated:
             return HttpResponse(status=302, headers={"Location": redirect_site_url})