rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Remove old HTTPS redirect kludges

Browse source
This commit is contained in:
Calvin Montgomery 2017-09-19 20:49:33 -07:00
parent 4e1bce6a24
commit c159fa8060
9 changed files with 25 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/web/account.js
View file

@ -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: "",

8
src/web/auth.js
View file

@ -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;

2
src/web/pug.js
View file

@ -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"),

19
src/web/webserver.js
View file

@ -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;