From 249ae41c24d99f899e2956162d26fda9561fe7da Mon Sep 17 00:00:00 2001
From: Athanasios Voutsadakis
 <athanasios.voutsadakis@digital.cabinet-office.gov.uk>
Date: Thu, 8 Mar 2018 17:49:08 +0000
Subject: [PATCH 1/4] Add error handling

This adds an /error/XXX endpoint that triggers the corresponding XXX
error code and its handling.

Related: https://github.com/alphagov/notifications-aws/pull/331
---
 app/__init__.py              |  4 ++++
 app/main/views/index.py      |  7 ++++++-
 app/templates/error/413.html | 21 +++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 app/templates/error/413.html
diff --git a/app/__init__.py b/app/__init__.py
index c9d2242f6..2314647e4 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -488,6 +488,10 @@ def register_errorhandlers(application):  # noqa (C901 too complex)
     def handle_gone(error):
         return _error_response(410)
 
+    @application.errorhandler(413)
+    def handle_payload_too_large(error):
+        return _error_response(413)
+
     @application.errorhandler(404)
     def handle_not_found(error):
         return _error_response(404)
diff --git a/app/main/views/index.py b/app/main/views/index.py
index a00ab5523..5665d1421 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -1,4 +1,4 @@
-from flask import redirect, render_template, request, url_for
+from flask import redirect, render_template, request, url_for, abort
 from flask_login import current_user, login_required
 from notifications_utils.international_billing_rates import (
     INTERNATIONAL_BILLING_RATES,
@@ -18,6 +18,11 @@ def index():
     return render_template('views/signedout.html')
 
 
+@main.route('/error/<int:status_code>')
+def error(status_code):
+    abort(status_code)
+
+
 @main.route("/verify-mobile")
 @login_required
 def verify_mobile():
diff --git a/app/templates/error/413.html b/app/templates/error/413.html
new file mode 100644
index 000000000..4dfddc603
--- /dev/null
+++ b/app/templates/error/413.html
@@ -0,0 +1,21 @@
+{% extends "withoutnav_template.html" %}
+{% block per_page_title %}File too big{% endblock %}
+{% block maincolumn_content %}
+    <div class="grid-row">
+      <div class="column-two-thirds">
+        <h1 class="heading-large">
+          The file you uploaded was too big
+        </h1>
+        <div class="grid-row">
+          <div class="column-two-thirds">
+            <p>
+              Files must be smaller than 5 MB.
+            </p>
+            <p>
+              <a href="javascript: history.go(-1)">Go back and try again.</a>
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+{% endblock %}

From 440f1bdc7cb103e4535d70187be363a460f036be Mon Sep 17 00:00:00 2001
From: Athanasios Voutsadakis
 <athanasios.voutsadakis@digital.cabinet-office.gov.uk>
Date: Fri, 9 Mar 2018 10:51:32 +0000
Subject: [PATCH 2/4] assets' 413.html is not used anymore

---
 app/assets/error_pages/413.html | 148 --------------------------------
 1 file changed, 148 deletions(-)
 delete mode 100644 app/assets/error_pages/413.html

diff --git a/app/assets/error_pages/413.html b/app/assets/error_pages/413.html
deleted file mode 100644
index 8998ef326..000000000
--- a/app/assets/error_pages/413.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html>
-<html lang="en"><!--<![endif]--><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-    <title>GOV.UK Notify - The file you uploaded was too big</title>
-
-    <!--[if gt IE 8]><!--><link href="/static/stylesheets/govuk-template.css" media="screen" rel="stylesheet"><!--<![endif]-->
-    <!--[if IE 6]><link href="/static/stylesheets/stylesheets/govuk-template-ie6.css?0.18.0" media="screen" rel="stylesheet" /><![endif]-->
-    <!--[if IE 7]><link href="/static/stylesheets/stylesheets/govuk-template-ie7.css?0.18.0" media="screen" rel="stylesheet" /><![endif]-->
-    <!--[if IE 8]><link href="/static/stylesheets/stylesheets/govuk-template-ie8.css?0.18.0" media="screen" rel="stylesheet" /><![endif]-->
-    <link href="/static/stylesheets/govuk-template-print.css" media="print" rel="stylesheet">
-
-    <!--[if IE 8]><link href="/static/stylesheets/stylesheets/fonts-ie8.css?0.18.0" media="all" rel="stylesheet" /><![endif]-->
-    <!--[if gte IE 9]><!--><link href="/static/stylesheets/fonts.css" media="all" rel="stylesheet"><!--<![endif]-->
-    <!--[if lt IE 9]><script src="/static/javascripts/javascripts/ie.js?0.18.0"></script><![endif]-->
-
-    <link rel="shortcut icon" href="/static/images/favicon.ico?0.18.0" type="image/x-icon">
-    <link rel="mask-icon" href="/static/images/gov.uk_logotype_crown.svg?0.18.0" color="#0b0c0c">
-    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="/static/images/apple-touch-icon-152x152.png?0.18.0">
-    <link rel="apple-touch-icon-precomposed" sizes="120x120" href="/static/images/apple-touch-icon-120x120.png?0.18.0">
-    <link rel="apple-touch-icon-precomposed" sizes="76x76" href="/static/images/apple-touch-icon-76x76.png?0.18.0">
-    <link rel="apple-touch-icon-precomposed" href="/static/images/apple-touch-icon-60x60.png?0.18.0">
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!--[if gt IE 8]><!-->
-    <link rel="stylesheet" media="screen" href="/static/stylesheets/main.css">
-    <!--<![endif]-->
-
-    <!--[if IE 6]>
-    <link rel="stylesheet" media="screen" href="/static/stylesheets/stylesheets/main-ie6.css?15c05585e53d8492f7f0b5afc95d54b4" />
-    <![endif]-->
-    <!--[if IE 7]>
-    <link rel="stylesheet" media="screen" href="/static/stylesheets/stylesheets/main-ie7.css?109878a484bb54a79876f3df007881d4" />
-    <![endif]-->
-    <!--[if IE 8]>
-    <link rel="stylesheet" media="screen" href="/static/stylesheets/stylesheets/main-ie8.css?fb4ddf0b7d274e9a08bd53ab9913b406" />
-    <![endif]-->
-
-  <style type="text/css">:root #content > #right > .dose > .dosesingle,
-:root #content > #center > .dose > .dosesingle
-{display:none !important;}</style></head>
-
-  <body class="js-enabled">
-    <script async="" src="http://www.google-analytics.com/analytics.js"></script>
-
-    <div id="skiplink-container">
-      <div>
-        <a href="#content" class="skiplink">Skip to main content</a>
-      </div>
-    </div>
-
-    <header role="banner" id="global-header" class="with-proposition">
-      <div class="header-wrapper">
-        <div class="header-global">
-          <div class="header-logo">
-            <a href="/" title="Go to the GOV.UK homepage" id="logo" class="content">
-              <img src="/static/images/gov.uk_logotype_crown_invert_trans.png" width="35" height="31" alt=""> GOV.UK Notify
-            </a>
-          </div>
-
-
-        </div>
-
-      </div>
-    </header>
-
-
-
-
-    <div id="global-header-bar"></div>
-
-
-  <div id="content">
-
-  <main role="main">
-
-
-
-
-
-    <h1 class="heading-large">
-      The file you uploaded was too big
-    </h1>
-    <div class="grid-row">
-      <div class="column-two-thirds">
-        <p>
-          Files must be smaller than 5 MB.
-        </p>
-        <p>
-          <a href="javascript: history.go(-1)">Go back and try again.</a>
-        </p>
-      </div>
-    </div>
-
-  </main>
-
-  </div>
-
-
-    <footer class="group js-footer" id="footer" role="contentinfo">
-
-      <div class="footer-wrapper">
-
-        <div class="footer-meta">
-          <div class="footer-meta-inner">
-
-  <nav class="footer-nav">
-    Built by the <a href="https://www.gov.uk/government/organisations/government-digital-service">Government Digital Service</a>
-  </nav>
-
-
-            <div class="open-government-licence">
-              <p class="logo"><a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence</a></p>
-
-                <p>All content is available under the <a href="https://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/" rel="license">Open Government Licence v3.0</a>, except where otherwise stated</p>
-
-            </div>
-          </div>
-
-          <div class="copyright">
-            <a href="http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/copyright-and-re-use/crown-copyright/">© Crown copyright</a>
-          </div>
-        </div>
-      </div>
-    </footer>
-
-    <div id="global-app-error" class="app-error hidden"></div>
-
-    <script src="/static/javascripts/govuk-template.js"></script>
-
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-75215134-1', 'auto');
-    ga('set', 'anonymizeIp', true);
-    ga('set', 'displayFeaturesTask', null);
-    ga('set', 'transport', 'beacon');
-    // strip UUIDs
-    page = (window.location.pathname + window.location.search).replace(
-      /[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}/g, '…'
-    )
-    ga('send', 'pageview');
-  </script>
-
-
-</body></html>

From 7828afe0d78aa13667710df7219a91d13eec898b Mon Sep 17 00:00:00 2001
From: Athanasios Voutsadakis
 <athanasios.voutsadakis@digital.cabinet-office.gov.uk>
Date: Fri, 9 Mar 2018 11:56:34 +0000
Subject: [PATCH 3/4] Sort requirements

---
 app/main/views/index.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/main/views/index.py b/app/main/views/index.py
index 5665d1421..f37532273 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -1,4 +1,4 @@
-from flask import redirect, render_template, request, url_for, abort
+from flask import abort, redirect, render_template, request, url_for
 from flask_login import current_user, login_required
 from notifications_utils.international_billing_rates import (
     INTERNATIONAL_BILLING_RATES,

From d49d97745c6c384a447ef5be5980e99686426f7d Mon Sep 17 00:00:00 2001
From: Athanasios Voutsadakis
 <athanasios.voutsadakis@digital.cabinet-office.gov.uk>
Date: Fri, 9 Mar 2018 12:28:55 +0000
Subject: [PATCH 4/4] Don't serve 500s on demand

---
 app/main/views/index.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/main/views/index.py b/app/main/views/index.py
index f37532273..56bdfe03f 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -20,6 +20,8 @@ def index():
 
 @main.route('/error/<int:status_code>')
 def error(status_code):
+    if status_code >= 500:
+        abort(404)
     abort(status_code)
 
 
