From 96d875b4d15b01e1a48c2de8bae08ffacb802c0e Mon Sep 17 00:00:00 2001
From: Ray Bellis <ray@isc.org>
Date: Wed, 23 Jan 2019 16:36:28 +0000
Subject: [PATCH] padurlsanitize.js: rewritten to consume promises

---
 src/node/hooks/express/padurlsanitize.js | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/node/hooks/express/padurlsanitize.js b/src/node/hooks/express/padurlsanitize.js
index b5ce926a..ad8d3c43 100644
--- a/src/node/hooks/express/padurlsanitize.js
+++ b/src/node/hooks/express/padurlsanitize.js
@@ -4,26 +4,26 @@ var url = require('url');
 exports.expressCreateServer = function (hook_name, args, cb) {
 
   // redirects browser to the pad's sanitized url if needed. otherwise, renders the html
-  args.app.param('pad', function (req, res, next, padId) {
+  args.app.param('pad', async function (req, res, next, padId) {
     // ensure the padname is valid and the url doesn't end with a /
     if (!padManager.isValidPadId(padId) || /\/$/.test(req.url)) {
       res.status(404).send('Such a padname is forbidden');
       return;
     }
 
-    padManager.sanitizePadId(padId, function(sanitizedPadId) {
-      if (sanitizedPadId === padId) {
-        // the pad id was fine, so just render it
-        next();
-      } else {
-        // the pad id was sanitized, so we redirect to the sanitized version
-        var real_url = sanitizedPadId;
-        real_url = encodeURIComponent(real_url);
-        var query = url.parse(req.url).query;
-        if ( query ) real_url += '?' + query;
-        res.header('Location', real_url);
-        res.status(302).send('You should be redirected to <a href="' + real_url + '">' + real_url + '</a>');
-      }
-    });
+    let sanitizedPadId = await padManager.sanitizePadId(padId);
+
+    if (sanitizedPadId === padId) {
+      // the pad id was fine, so just render it
+      next();
+    } else {
+      // the pad id was sanitized, so we redirect to the sanitized version
+      var real_url = sanitizedPadId;
+      real_url = encodeURIComponent(real_url);
+      var query = url.parse(req.url).query;
+      if ( query ) real_url += '?' + query;
+      res.header('Location', real_url);
+      res.status(302).send('You should be redirected to <a href="' + real_url + '">' + real_url + '</a>');
+    }
   });
 }