Send complete HTML document in redirect response

dougwilson · dougwilson · commit fb2f3130704d · 2017-02-24T22:10:06.000-05:00
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,7 @@
 unreleased
 ==========
 
+  * Send complete HTML document in redirect response
   * Set default CSP header in redirect response
 
 1.11.2 / 2017-01-23
diff --git a/index.js b/index.js
@@ -142,6 +142,26 @@ function collapseLeadingSlashes (str) {
     : str
 }
 
+ /**
+ * Create a minimal HTML document.
+ *
+ * @param {string} title
+ * @param {string} body
+ * @private
+ */
+
+function createHtmlDocument (title, body) {
+  return '<!DOCTYPE html>\n' +
+    '<html lang="en">\n' +
+    '<head>\n' +
+    '<meta charset="utf-8">\n' +
+    '<title>' + title + '</title>\n' +
+    '</head>\n' +
+    '<body>\n' +
+    '<pre>' + body + '</pre>\n' +
+    '</body>\n'
+}
+
 /**
  * Create a directory listener that just 404s.
  * @private
@@ -174,16 +194,17 @@ function createRedirectDirectoryListener () {
 
     // reformat the URL
     var loc = encodeUrl(url.format(originalUrl))
-    var msg = 'Redirecting to <a href="' + escapeHtml(loc) + '">' + escapeHtml(loc) + '</a>\n'
+    var doc = createHtmlDocument('Redirecting', 'Redirecting to <a href="' + escapeHtml(loc) + '">' +
+      escapeHtml(loc) + '</a>')
     var res = this.res
 
     // send redirect response
     res.statusCode = 301
     res.setHeader('Content-Type', 'text/html; charset=UTF-8')
-    res.setHeader('Content-Length', Buffer.byteLength(msg))
+    res.setHeader('Content-Length', Buffer.byteLength(doc))
     res.setHeader('Content-Security-Policy', "default-src 'self'")
     res.setHeader('X-Content-Type-Options', 'nosniff')
     res.setHeader('Location', loc)
-    res.end(msg)
+    res.end(doc)
   }
 }
diff --git a/test/test.js b/test/test.js
@@ -473,7 +473,7 @@ describe('serveStatic()', function () {
       .get('/snow')
       .expect('Location', '/snow%20%E2%98%83/')
       .expect('Content-Type', /html/)
-      .expect(301, 'Redirecting to <a href="/snow%20%E2%98%83/">/snow%20%E2%98%83/</a>\n', done)
+      .expect(301, />Redirecting to <a href="\/snow%20%E2%98%83\/">\/snow%20%E2%98%83\/<\/a></, done)
     })
 
     it('should respond with default Content-Security-Policy', function (done) {
