Remove old HTTPS redirect kludges

src/config.js

@@ -56,8 +56,7 @@ var defaults = {
         passphrase: "",
         certfile: "localhost.cert",
         cafile: "",
-        ciphers: "HIGH:!DSS:!aNULL@STRENGTH",
-        redirect: true
+        ciphers: "HIGH:!DSS:!aNULL@STRENGTH"
     },
     io: {
         domain: "http://localhost",

src/web/account.js

@@ -23,10 +23,6 @@ let globalMessageBus;
  * Handles a GET request for /account/edit
  */
 function handleAccountEditPage(req, res) {
-    if (webserver.redirectHttps(req, res)) {
-        return;
-    }
-
     sendPug(res, "account-edit", {});
 }
 
@@ -178,10 +174,6 @@ function handleChangeEmail(req, res) {
  * Handles a GET request for /account/channels
  */
 async function handleAccountChannelPage(req, res) {
-    if (webserver.redirectHttps(req, res)) {
-        return;
-    }
-
     const user = await webserver.authorize(req);
     // TODO: error message
     if (!user) {
@@ -349,10 +341,6 @@ async function handleDeleteChannel(req, res) {
  * Handles a GET request for /account/profile
  */
 async function handleAccountProfilePage(req, res) {
-    if (webserver.redirectHttps(req, res)) {
-        return;
-    }
-
     const user = await webserver.authorize(req);
     // TODO: error message
     if (!user) {
@@ -462,10 +450,6 @@ async function handleAccountProfile(req, res) {
  * Handles a GET request for /account/passwordreset
  */
 function handlePasswordResetPage(req, res) {
-    if (webserver.redirectHttps(req, res)) {
-        return;
-    }
-
     sendPug(res, "account-passwordreset", {
         reset: false,
         resetEmail: "",

src/web/auth.js

@@ -111,10 +111,6 @@ function handleLogin(req, res) {
  * Handles a GET request for /login
  */
 function handleLoginPage(req, res) {
-    if (webserver.redirectHttps(req, res)) {
-        return;
-    }
-
     if (res.locals.loggedIn) {
         return sendPug(res, "login", {
             wasAlreadyLoggedIn: true
@@ -158,10 +154,6 @@ function handleLogout(req, res) {
  * Handles a GET request for /register
  */
 function handleRegisterPage(req, res) {
-    if (webserver.redirectHttps(req, res)) {
-        return;
-    }
-
     if (res.locals.loggedIn) {
         sendPug(res, "register", {});
         return;

src/web/pug.js

@@ -13,8 +13,6 @@ function merge(locals, res) {
         siteTitle: Config.get("html-template.title"),
         siteDescription: Config.get("html-template.description"),
         siteAuthor: "Calvin 'calzoneman' 'cyzon' Montgomery",
-        loginDomain: Config.get("https.enabled") ? Config.get("https.full-address")
-                                                 : Config.get("http.full-address"),
         csrfToken: typeof res.req.csrfToken === 'function' ? res.req.csrfToken() : '',
         baseUrl: getBaseUrl(res),
         channelPath: Config.get("channel-path"),

src/web/webserver.js

@@ -60,23 +60,6 @@ function initPrometheus(app) {
     });
 }
 
-/**
- * Redirects a request to HTTPS if the server supports it
- */
-function redirectHttps(req, res) {
-    if (req.realProtocol !== 'https' && Config.get('https.enabled') &&
-            Config.get('https.redirect')) {
-        var ssldomain = Config.get('https.full-address');
-        if (ssldomain.indexOf(req.hostname) < 0) {
-            return false;
-        }
-
-        res.redirect(ssldomain + req.path);
-        return true;
-    }
-    return false;
-}
-
 /**
  * Legacy socket.io configuration endpoint.  This is being migrated to
  * /socketconfig/<channel name>.json (see ./routes/socketconfig.js)
@@ -280,8 +263,6 @@ module.exports = {
         initializeErrorHandlers(app);
     },
 
-    redirectHttps: redirectHttps,
-
     authorize: async function authorize(req) {
         if (!req.signedCookies || !req.signedCookies.auth) {
             return false;