Updated private-sites to not redirect to full urls

no-issue

- Parse redirects as URL with blog as base
- Redirect to the pathname property of parsed URL

Credits: @j3ssie

core/server/apps/private-blogging/lib/middleware.js

@@ -1,16 +1,15 @@
-const fs = require('fs-extra'),
+const fs = require('fs-extra');
-    session = require('cookie-session'),
+const url = require('url');
-    crypto = require('crypto'),
+const session = require('cookie-session');
-    path = require('path'),
+const crypto = require('crypto');
-    config = require('../../../config'),
+const path = require('path');
-    urlService = require('../../../services/url'),
+const config = require('../../../config');
-    constants = require('../../../lib/constants'),
+const urlService = require('../../../services/url');
-    common = require('../../../lib/common'),
+const constants = require('../../../lib/constants');
-    settingsCache = require('../../../services/settings/cache'),
+const common = require('../../../lib/common');
-    // routeKeywords.private: 'private'
+const settingsCache = require('../../../services/settings/cache');
-    privateRoute = '/private/';
+// routeKeywords.private: 'private'
-
+const privateRoute = '/private/';
-let privateBlogging = null;
 
 function verifySessionHash(salt, hash) {
     if (!salt || !hash) {
@@ -22,7 +21,16 @@ function verifySessionHash(salt, hash) {
     return hasher.digest('hex') === hash;
 }
 
-privateBlogging = {
+function getRedirectUrl(query) {
+    const redirect = decodeURIComponent(query ? query.r : '/');
+    try {
+        return new url.URL(redirect, urlService.utils.urlFor('home', true)).pathname;
+    } catch (e) {
+        return '/';
+    }
+}
+
+const privateBlogging = {
     checkIsPrivate: function checkIsPrivate(req, res, next) {
         let isPrivateBlog = settingsCache.get('is_private');
 
@@ -120,18 +128,18 @@ privateBlogging = {
             return next();
         }
 
-        let bodyPass = req.body.password,
+        const bodyPass = req.body.password;
-            pass = settingsCache.get('password'),
+        const pass = settingsCache.get('password');
-            hasher = crypto.createHash('sha256'),
+        const hasher = crypto.createHash('sha256');
-            salt = Date.now().toString(),
+        const salt = Date.now().toString();
-            forward = req.query && req.query.r ? req.query.r : '/';
+        const forward = getRedirectUrl(req.query);
 
         if (pass === bodyPass) {
             hasher.update(bodyPass + salt, 'utf8');
             req.session.token = hasher.digest('hex');
             req.session.salt = salt;
 
-            return res.redirect(urlService.utils.urlFor({relativeUrl: decodeURIComponent(forward)}));
+            return res.redirect(urlService.utils.urlFor({relativeUrl: forward}));
         } else {
             res.error = {
                 message: common.i18n.t('errors.middleware.privateblogging.wrongPassword')

core/test/unit/apps/private-blogging/middleware_spec.js

@@ -219,6 +219,19 @@ describe('Private Blogging', function () {
                     res.redirect.called.should.be.true();
                 });
 
+                it('authenticateProtection should redirect to "/" if r param is a full url', function () {
+                    req.body = {password: 'rightpassword'};
+                    req.session = {};
+                    req.query = {
+                        r: encodeURIComponent('http://britney.com')
+                    };
+                    res.redirect = sandbox.spy();
+
+                    privateBlogging.authenticateProtection(req, res, next);
+                    res.redirect.called.should.be.true();
+                    res.redirect.args[0][0].should.be.equal('/');
+                });
+
                 it('filterPrivateRoutes should 404 for /rss/ requests', function () {
                     var salt = Date.now().toString();
                     req.url = req.path = '/rss/';