Contextualize 404 page

readthedocs/core/views/__init__.py

@@ -48,6 +48,34 @@ def get_context_data(self, **kwargs):
         return context
 
 
+def server_error_404(
+    request, template_name="errors/404/community.html", exception=None
+):
+    """A simple 404 handler."""
+    # This property is set by ProxitoHttp404. We could also have a look at the
+    # subproject_slug
+
+    project_slug = getattr(exception, "project_slug", None)
+    log.debug(exception)
+    project = getattr(exception, "project", None)
+    subproject_slug = getattr(exception, "subproject_slug", None)
+
+    if subproject_slug:
+        template_name = "errors/404/no_subproject.html"
+    elif project:
+        template_name = "errors/404/no_project_page.html"
+    elif project_slug:
+        template_name = "errors/404/no_project.html"
+
+    r = render(
+        request,
+        template_name,
+        context={"project": project, "project_slug": project_slug},
+    )
+    r.status_code = 404
+    return r
+
+
 def server_error_500(request, template_name='500.html'):
     """A simple 500 handler so we get media."""
     r = render(request, template_name)

readthedocs/proxito/exceptions.py

@@ -0,0 +1,56 @@
+"""
+This module contains exceptions that may be raised in El Proxito application
+but are handled elsewhere in the Django project.
+
+--------------
+404 exceptions
+--------------
+
+Because an Http404 can be raised anywhere in the code,
+we want to add more context for targeted error handling and user-facing communication
+"""
+from django.http.response import Http404
+
+
+class ProxitoHttp404(Http404):
+    """
+    General error class for proxity 404s
+    """
+
+    def __init__(self, message):
+        super().__init__(message)
+
+
+class ProxitoProjectHttp404(ProxitoHttp404):
+    """
+    Raised if a project was not found
+    """
+
+    def __init__(self, message, project_slug=None):
+        self.project_slug = project_slug
+        super().__init__(message)
+
+
+class ProxitoSubProjectHttp404(ProxitoProjectHttp404):
+    """
+    Raised if a sub-project was not found
+    """
+    def __init__(self, message, project_slug=None, project=None, subproject_slug=None):
+        self.project_slug = project_slug
+        self.project = project
+        self.subproject_slug = subproject_slug
+        super().__init__(message)
+
+
+class ProxitoProjectPageHttp404(ProxitoHttp404):
+    """
+    Raised if a page inside an existing project was not found
+
+    Note: The containing project can be both a project or a subproject inside another project
+    """
+
+    def __init__(self, message, project_slug=None, project=None, subproject_slug=None):
+        self.project_slug = project_slug
+        self.project = project
+        self.subproject_slug = subproject_slug
+        super().__init__(message)

readthedocs/proxito/views/decorators.py

@@ -1,9 +1,12 @@
-import structlog
 from functools import wraps
 
-from django.http import Http404
+import structlog
 
 from readthedocs.projects.models import Project, ProjectRelationship
+from readthedocs.proxito.exceptions import (
+    ProxitoProjectHttp404,
+    ProxitoSubProjectHttp404,
+)
 
 log = structlog.get_logger(__name__)  # noqa
 
@@ -44,7 +47,9 @@ def inner_view(  # noqa
                         subproject_slug=subproject_slug,
                         project_slug=kwargs['project'].slug,
                     )
-                    raise Http404('Invalid subproject slug')
+                    raise ProxitoSubProjectHttp404(
+                        "Invalid subproject slug", subproject_slug=subproject_slug
+                    )
         return view_func(request, subproject=subproject, *args, **kwargs)
 
     return inner_view
@@ -74,7 +79,13 @@ def inner_view(  # noqa
             try:
                 project = Project.objects.get(slug=project_slug)
             except Project.DoesNotExist:
-                raise Http404('Project does not exist.')
+                log.debug(
+                    "Project not found.",
+                    project_slug=project_slug,
+                )
+                raise ProxitoProjectHttp404(
+                    "Project does not exist.", project_slug=project_slug
+                )
         return view_func(request, project=project, *args, **kwargs)
 
     return inner_view

readthedocs/proxito/views/serve.py

@@ -4,7 +4,7 @@
 
 import structlog
 from django.conf import settings
-from django.http import Http404, HttpResponse, HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render
 from django.urls import resolve as url_resolve
 from django.utils.decorators import method_decorator
@@ -22,6 +22,7 @@
 from readthedocs.projects.constants import SPHINX_HTMLDIR
 from readthedocs.projects.models import Feature
 from readthedocs.projects.templatetags.projects_tags import sort_version_aware
+from readthedocs.proxito.exceptions import ProxitoHttp404, ProxitoProjectPageHttp404
 from readthedocs.redirects.exceptions import InfiniteRedirectException
 from readthedocs.storage import build_media_storage, staticfiles_storage
 
@@ -109,7 +110,7 @@ def get(self,
         # version on the database we want to return 404.
         if (version and not version.active) or (version_slug and not version):
             log.warning("Version does not exist or is not active.")
-            raise Http404("Version does not exist or is not active.")
+            raise ProxitoHttp404("Version does not exist or is not active.")
 
         if self._is_cache_enabled(final_project) and version and not version.is_private:
             # All public versions can be cached.
@@ -174,7 +175,7 @@ def get(self,
                 'Invalid URL for project with versions.',
                 filename=filename,
             )
-            raise Http404('Invalid URL for project with versions')
+            raise ProxitoHttp404("Invalid URL for project with versions")
 
         redirect_path, http_status = self.get_redirect(
             project=final_project,
@@ -261,17 +262,25 @@ def get(self, request, proxito_path, template_name='404.html'):
             proxito_path,
             urlconf='readthedocs.proxito.urls',
         )
+        log.debug("Resolved a URL.")
 
         version_slug = kwargs.get('version_slug')
         version_slug = self.get_version_from_host(request, version_slug)
-        final_project, lang_slug, version_slug, filename = _get_project_data_from_request(  # noqa
+        log.debug("Getting _get_project_data_from_request.")
+        (
+            final_project,
+            lang_slug,
+            version_slug,
+            filename,
+        ) = _get_project_data_from_request(  # noqa
             request,
             project_slug=kwargs.get('project_slug'),
             subproject_slug=kwargs.get('subproject_slug'),
             lang_slug=kwargs.get('lang_slug'),
             version_slug=version_slug,
             filename=kwargs.get('filename', ''),
         )
+        log.debug("Finished _get_project_data_from_request.")
 
         log.bind(
             project_slug=final_project.slug,
@@ -390,7 +399,13 @@ def get(self, request, proxito_path, template_name='404.html'):
             path=filename,
             full_path=proxito_path,
         )
-        raise Http404('No custom 404 page found.')
+        log.debug("Raising ProxitoHttp404")
+        raise ProxitoProjectPageHttp404(
+            "No custom 404 page found.",
+            project=final_project,
+            project_slug=kwargs.get("project_slug"),
+            subproject_slug=kwargs.get("subproject_slug"),
+        )
 
     def _register_broken_link(self, project, version, path, full_path):
         try:
@@ -472,7 +487,7 @@ def get(self, request, project):
 
         if no_serve_robots_txt:
             # ... we do return a 404
-            raise Http404()
+            raise ProxitoHttp404()
 
         storage_path = project.get_storage_path(
             type_='html',
@@ -595,7 +610,7 @@ def changefreqs_generator():
             only_active=True,
         )
         if not public_versions.exists():
-            raise Http404
+            raise ProxitoHttp404()
 
         sorted_versions = sort_version_aware(public_versions)
 

readthedocs/proxito/views/utils.py

@@ -2,7 +2,10 @@
 
 import structlog
 from django.http import HttpResponse
-from django.shortcuts import get_object_or_404, render
+from django.shortcuts import render
+
+from readthedocs.projects.models import Project
+from readthedocs.proxito.exceptions import ProxitoHttp404
 
 from .decorators import map_project_slug, map_subproject_slug
 
@@ -30,11 +33,23 @@ def proxito_404_page_handler(request, exception=None, template_name='404.html'):
     """
 
     if request.resolver_match and request.resolver_match.url_name != 'proxito_404_handler':
+        log.debug("Displaying a 'fast 404'")
         return fast_404(request, exception, template_name)
 
-    resp = render(request, template_name)
-    resp.status_code = 404
-    return resp
+    project_slug = getattr(exception, "project_slug", None)
+    log.debug(exception)
+    project = getattr(exception, "project", None)
+    log.debug(
+        "404 page detected a project slug in request.",
+        project_slug=project_slug,
+    )
+    r = render(
+        request,
+        template_name,
+        context={"project": project, "project_slug": project_slug},
+    )
+    r.status_code = 404
+    return r
 
 
 @map_project_slug
@@ -70,9 +85,20 @@ def _get_project_data_from_request(
     if not lang_slug or lang_slug == current_project.language:
         final_project = current_project
     else:
-        final_project = get_object_or_404(
-            current_project.translations.all(), language=lang_slug
-        )
+        try:
+            final_project = current_project.translations.get(language=lang_slug)
+        except Project.DoesNotExist:
+            log.debug(
+                "Raising 404 for language slug",
+                lang_slug=lang_slug,
+                project_slug=current_project.slug,
+            )
+            raise ProxitoHttp404(
+                "Did not find translation",
+                project=current_project,
+                project_slug=current_project.slug,
+                subproject_slug=lang_slug,
+            )
 
     # Handle single version by grabbing the default version
     # We might have version_slug when we're serving a PR

readthedocs/settings/base.py

@@ -44,7 +44,7 @@ class CommunityBaseSettings(Settings):
     DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 
     # Debug settings
-    DEBUG = True
+    DEBUG = False
     RTD_FORCE_SHOW_DEBUG_TOOLBAR = False
 
     @property
@@ -73,7 +73,7 @@ def SHOW_DEBUG_TOOLBAR(self):
     PRODUCTION_DOMAIN = 'readthedocs.org'
     PUBLIC_DOMAIN = None
     PUBLIC_DOMAIN_USES_HTTPS = False
-    USE_SUBDOMAIN = False
+    USE_SUBDOMAIN = True
     PUBLIC_API_URL = 'https://{}'.format(PRODUCTION_DOMAIN)
     RTD_INTERSPHINX_URL = 'https://{}'.format(PRODUCTION_DOMAIN)
     RTD_EXTERNAL_VERSION_DOMAIN = 'external-builds.readthedocs.io'

readthedocs/templates/401.html

@@ -1,20 +1,11 @@
-{% extends "base.html" %}
+{% extends "errors/base.html" %}
 {% load core_tags %}
 {% load i18n %}
 
 {% block title %}
   {% trans "Maze Found" %}
 {% endblock %}
 
-{% block header-wrapper %}
-  {% include "error_header.html" %}
-{% endblock %}
-
-{% block notify %}{% endblock %}
-
-{# Hide the language select form so we don't set a CSRF cookie #}
-{% block language-select-form %}{% endblock %}
-
 {% block content %}
 <h3>Permission Denied</h3>
 <p>

readthedocs/templates/404.html

@@ -1,44 +1,2 @@
-{% extends "base.html" %}
-{% load core_tags %}
-{% load i18n %}
-
-{% block title %}
-  {% trans "Maze Found" %}
-{% endblock %}
-
-{% block header-wrapper %}
-  {% include "error_header.html" %}
-{% endblock %}
-
-{% block notify %}{% endblock %}
-
-{# Hide the language select form so we don't set a CSRF cookie #}
-{% block language-select-form %}{% endblock %}
-
-{% block content %}
-<pre style="line-height: 1.25; white-space: pre;">
-
-        \          SORRY            /
-         \                         /
-          \    This page does     /
-           ]   not exist yet.    [    ,'|
-           ]                     [   /  |
-           ]___               ___[ ,'   |
-           ]  ]\             /[  [ |:   |
-           ]  ] \           / [  [ |:   |
-           ]  ]  ]         [  [  [ |:   |
-           ]  ]  ]__     __[  [  [ |:   |
-           ]  ]  ] ]\ _ /[ [  [  [ |:   |
-           ]  ]  ] ] (#) [ [  [  [ :===='
-           ]  ]  ]_].nHn.[_[  [  [
-           ]  ]  ]  HHHHH. [  [  [
-           ]  ] /   `HH("N  \ [  [
-           ]__]/     HHH  "  \[__[
-           ]         NNN         [
-           ]         N/"         [
-           ]         N H         [
-          /          N            \
-         /           q,            \
-        /                           \
-</pre>
-{% endblock %}
+{% extends "errors/404/base.html" %}
+{# this is a deprecated template, will be removed. Please use one of the targeted 404s in templates/404/ #}

readthedocs/templates/429.html

@@ -1,20 +1,11 @@
-{% extends "base.html" %}
+{% extends "errors/base.html" %}
 {% load core_tags %}
 {% load i18n %}
 
 {% block title %}
   {% trans "Too many requests" %}
 {% endblock %}
 
-{% block header-wrapper %}
-  {% include "error_header.html" %}
-{% endblock %}
-
-{% block notify %}{% endblock %}
-
-{# Hide the language select form so we don't set a CSRF cookie #}
-{% block language-select-form %}{% endblock %}
-
 {% block content %}
 <pre style="line-height: 1.25; white-space: pre;">
               .--~~,__