ghost 4.23.0 → 4.26.0

package/core/server/services/url/LocalFileCache.js

@@ -0,0 +1,75 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+class LocalFileCache {
+    /**
+     * @param {Object} options
+     * @param {String} options.storagePath - cached storage path
+     * @param {Boolean} options.writeDisabled - controls if cache can write
+     */
+    constructor({storagePath, writeDisabled}) {
+        const urlsStoragePath = path.join(storagePath, 'urls.json');
+        const resourcesCachePath = path.join(storagePath, 'resources.json');
+
+        this.storagePaths = {
+            urls: urlsStoragePath,
+            resources: resourcesCachePath
+        };
+        this.writeDisabled = writeDisabled;
+    }
+
+    /**
+     * Handles reading and parsing JSON from the filesystem.
+     * In case the file is corrupted or does not exist, returns null.
+     * @param {String} filePath path to read from
+     * @returns {Promise<Object>}
+     * @private
+     */
+    async readCacheFile(filePath) {
+        let cacheExists = false;
+        let cacheData = null;
+
+        try {
+            await fs.stat(filePath);
+            cacheExists = true;
+        } catch (e) {
+            cacheExists = false;
+        }
+
+        if (cacheExists) {
+            try {
+                const cacheFile = await fs.readFile(filePath, 'utf8');
+                cacheData = JSON.parse(cacheFile);
+            } catch (e) {
+                //noop as we'd start a long boot process if there are any errors in the file
+            }
+        }
+
+        return cacheData;
+    }
+
+    /**
+     *
+     * @param {'urls'|'resources'} type
+     * @returns {Promise<Object>}
+     */
+    async read(type) {
+        return await this.readCacheFile(this.storagePaths[type]);
+    }
+
+    /**
+     *
+     * @param {'urls'|'resources'} type of data to persist
+     * @param {Object} data - data to be persisted
+     * @returns {Promise<Object>}
+     */
+    async write(type, data) {
+        if (this.writeDisabled) {
+            return null;
+        }
+
+        return fs.writeFile(this.storagePaths[type], JSON.stringify(data, null, 4));
+    }
+}
+
+module.exports = LocalFileCache;

package/core/server/services/url/UrlService.js

@@ -1,4 +1,3 @@
-const fs = require('fs-extra');
 const _debug = require('@tryghost/debug')._base;
 const debug = _debug('ghost:services:url:service');
 const _ = require('lodash');
@@ -22,13 +21,13 @@ class UrlService {
     /**
      *
      * @param {Object} options
-     * @param {String} [options.urlsCachePath] - cached URLs storage path
-     * @param {String} [options.resourcesCachePath] - cached resources storage path
+     * @param {Object} [options.cache] - cache handler instance
+     * @param {Function} [options.cache.read] - read cache by type
+     * @param {Function} [options.cache.write] - write into cache by type
      */
-    constructor({urlsCachePath, resourcesCachePath} = {}) {
+    constructor({cache} = {}) {
         this.utils = urlUtils;
-        this.urlsCachePath = urlsCachePath;
-        this.resourcesCachePath = resourcesCachePath;
+        this.cache = cache;
         this.onFinished = null;
         this.finished = false;
         this.urlGenerators = [];
@@ -319,26 +318,22 @@ class UrlService {
      * @description Initializes components needed for the URL Service to function
      * @param {Object} options
      * @param {Function} [options.onFinished] - callback when url generation is finished
+     * @param {Boolean} [options.urlCache] - whether to init using url cache or not
      */
-    async init(options = {}) {
-        this.onFinished = options.onFinished;
+    async init({onFinished, urlCache} = {}) {
+        this.onFinished = onFinished;
 
         let persistedUrls;
         let persistedResources;
 
-        if (labs.isSet('urlCache')) {
-            persistedUrls = await this.readCacheFile(this.urlsCachePath);
-            persistedResources = await this.readCacheFile(this.resourcesCachePath);
+        if (this.cache && (labs.isSet('urlCache') || urlCache)) {
+            persistedUrls = await this.cache.read('urls');
+            persistedResources = await this.cache.read('resources');
         }
 
         if (persistedUrls && persistedResources) {
-            this.urls = new Urls({
-                urls: persistedUrls
-            });
-            this.resources = new Resources({
-                queue: this.queue,
-                resources: persistedResources
-            });
+            this.urls.urls = persistedUrls;
+            this.resources.data = persistedResources;
             this.resources.initResourceConfig();
             this.resources.initEvenListeners();
 
@@ -361,35 +356,8 @@ class UrlService {
             return null;
         }
 
-        await this.persistToCacheFile(this.urlsCachePath, this.urls.urls);
-        await this.persistToCacheFile(this.resourcesCachePath, this.resources.getAll());
-    }
-
-    async persistToCacheFile(filePath, data) {
-        return fs.writeFile(filePath, JSON.stringify(data, null, 4));
-    }
-
-    async readCacheFile(filePath) {
-        let cacheExists = false;
-        let cacheData;
-
-        try {
-            await fs.stat(filePath);
-            cacheExists = true;
-        } catch (e) {
-            cacheExists = false;
-        }
-
-        if (cacheExists) {
-            try {
-                const cacheFile = await fs.readFile(filePath, 'utf8');
-                cacheData = JSON.parse(cacheFile);
-            } catch (e) {
-                //noop as we'd start a long boot process if there are any errors in the file
-            }
-        }
-
-        return cacheData;
+        await this.cache.write('urls', this.urls.urls);
+        await this.cache.write('resources', this.resources.getAll());
     }
 
     /**

package/core/server/services/url/index.js

@@ -1,13 +1,26 @@
-const path = require('path');
 const config = require('../../../shared/config');
+const LocalFileCache = require('./LocalFileCache');
 const UrlService = require('./UrlService');
 
 // NOTE: instead of a path we could give UrlService a "data-resolver" of some sort
 //       so it doesn't have to contain the logic to read data at all. This would be
 //       a possible improvement in the future
-const urlsCachePath = path.join(config.getContentPath('data'), 'urls.json');
-const resourcesCachePath = path.join(config.getContentPath('data'), 'resources.json');
-const urlService = new UrlService({urlsCachePath, resourcesCachePath});
+let writeDisabled = false;
+let storagePath = config.getContentPath('data');
+
+// TODO: remove this hack in favor of loading from the content path when it's possible to do so
+//       by mocking content folders in pre-boot phase
+if (process.env.NODE_ENV.startsWith('test')){
+    storagePath = config.get('paths').urlCache;
+
+    // NOTE: prevents test suites from overwriting cache fixtures.
+    //       A better solution would be injecting a different implementation of the
+    //       cache based on the environment, this approach should do the trick for now
+    writeDisabled = true;
+}
+
+const cache = new LocalFileCache({storagePath, writeDisabled});
+const urlService = new UrlService({cache});
 
 // Singleton
 module.exports = urlService;

package/core/server/services/xmlrpc.js

@@ -87,7 +87,7 @@ function ping(post) {
                 if (!goodResponse.test(res.body)) {
                     const matches = res.body.match(errorMessage);
                     const message = matches ? matches[1] : res.body;
-                    throw new errors.GhostError({message});
+                    throw new errors.InternalServerError({message});
                 }
             })
             .catch(function (err) {
@@ -100,7 +100,7 @@ function ping(post) {
                         help: tpl(messages.requestFailedHelp, {url: 'https://ghost.org/docs/'})
                     });
                 } else {
-                    error = new errors.GhostError({
+                    error = new errors.InternalServerError({
                         err: err,
                         message: err.message,
                         context: tpl(messages.requestFailedError, {service: 'xmlrpc'}),

package/core/server/web/admin/app.js

@@ -5,7 +5,7 @@ const config = require('../../../shared/config');
 const constants = require('@tryghost/constants');
 const urlUtils = require('../../../shared/url-utils');
 const shared = require('../shared');
-const adminMiddleware = require('./middleware');
+const redirectAdminUrls = require('./middleware/redirect-admin-urls');
 
 module.exports = function setupAdminApp() {
     debug('Admin setup start');
@@ -26,9 +26,6 @@ module.exports = function setupAdminApp() {
         });
     }
 
-    // Render error page in case of maintenance
-    adminApp.use(shared.middleware.maintenance);
-
     // Force SSL if required
     // must happen AFTER asset loading and BEFORE routing
     adminApp.use(shared.middleware.urlRedirects.adminSSLAndHostRedirect);
@@ -42,7 +39,7 @@ module.exports = function setupAdminApp() {
     adminApp.use(shared.middleware.cacheControl('private'));
 
     // Special redirects for the admin (these should have their own cache-control headers)
-    adminApp.use(adminMiddleware);
+    adminApp.use(redirectAdminUrls);
 
     // Finally, routing
     adminApp.get('*', require('./controller'));

package/core/server/web/admin/controller.js

@@ -1,10 +1,20 @@
 const debug = require('@tryghost/debug')('web:admin:controller');
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
 const path = require('path');
 const fs = require('fs');
 const crypto = require('crypto');
 const config = require('../../../shared/config');
 const updateCheck = require('../../update-check');
 
+const messages = {
+    templateError: {
+        message: 'Unable to find admin template file {templatePath}',
+        context: 'These template files are generated as part of the build process',
+        help: 'Please see {link}'
+    }
+};
+
 /**
  * @description Admin controller to handle /ghost/ requests.
  *
@@ -23,18 +33,31 @@ module.exports = function adminController(req, res) {
     const templatePath = path.resolve(config.get('paths').adminViews, defaultTemplate);
     const headers = {};
 
-    // Generate our own ETag header
-    //   `sendFile` by default uses filesize+lastmod date to generate an etag.
-    //   That doesn't work for admin templates because the filesize doesn't change between versions
-    //   and `npm pack` sets a fixed lastmod date for every file meaning the default etag never changes
-    const fileBuffer = fs.readFileSync(templatePath);
-    const hashSum = crypto.createHash('md5');
-    hashSum.update(fileBuffer);
-    headers.ETag = hashSum.digest('hex');
+    try {
+        // Generate our own ETag header
+        //   `sendFile` by default uses filesize+lastmod date to generate an etag.
+        //   That doesn't work for admin templates because the filesize doesn't change between versions
+        //   and `npm pack` sets a fixed lastmod date for every file meaning the default etag never changes
+        const fileBuffer = fs.readFileSync(templatePath);
+        const hashSum = crypto.createHash('md5');
+        hashSum.update(fileBuffer);
+        headers.ETag = hashSum.digest('hex');
 
-    if (config.get('adminFrameProtection')) {
-        headers['X-Frame-Options'] = 'sameorigin';
-    }
+        if (config.get('adminFrameProtection')) {
+            headers['X-Frame-Options'] = 'sameorigin';
+        }
 
-    res.sendFile(templatePath, {headers});
+        res.sendFile(templatePath, {headers});
+    } catch (error) {
+        if (error.code === 'ENOENT') {
+            throw new errors.IncorrectUsageError({
+                message: tpl(messages.templateError.message, {templatePath}),
+                context: tpl(messages.templateError.context),
+                help: tpl(messages.templateError.help, {link: 'https://ghost.org/docs/install/source/'}),
+                error: error
+            });
+        } else {
+            throw error;
+        }
+    }
 };

package/core/server/web/admin/middleware/redirect-admin-urls.js

@@ -0,0 +1,15 @@
+const urlUtils = require('../../../../shared/url-utils');
+
+function redirectAdminUrls(req, res, next) {
+    const subdir = urlUtils.getSubdir();
+    const ghostPathRegex = new RegExp(`^${subdir}/ghost/(.+)`);
+    const ghostPathMatch = req.originalUrl.match(ghostPathRegex);
+
+    if (ghostPathMatch) {
+        return res.redirect(urlUtils.urlJoin(urlUtils.urlFor('admin'), '#', ghostPathMatch[1]));
+    }
+
+    next();
+}
+
+module.exports = redirectAdminUrls;

package/core/server/web/admin/views/default-prod.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.23%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.26%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -41,7 +41,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-987af30228885bce50f05c4723fe6f53.css">
-                <link rel="stylesheet" href="assets/ghost.min-fcf6a0738421f86c47c55f20d00c5ba9.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-57c1e677f42d596942d317ce93e8a62c.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-c9002845b6c30ac978abdadde9f33d7c.js"></script>
-                <script src="assets/ghost.min-cccc107e881b74c7aaf1a73e1e5e0dee.js"></script>
+                <script src="assets/vendor.min-b6b8d2a31d61830c2d8f65c5ba54236a.js"></script>
+                <script src="assets/ghost.min-f3c6886e191d34450e9ffca0c8fa056e.js"></script>
             
 </body>
 </html>

package/core/server/web/admin/views/default.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.23%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%224.26%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%22%3Atrue%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -41,7 +41,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-987af30228885bce50f05c4723fe6f53.css">
-                <link rel="stylesheet" href="assets/ghost.min-fcf6a0738421f86c47c55f20d00c5ba9.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-57c1e677f42d596942d317ce93e8a62c.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-c9002845b6c30ac978abdadde9f33d7c.js"></script>
-                <script src="assets/ghost.min-cccc107e881b74c7aaf1a73e1e5e0dee.js"></script>
+                <script src="assets/vendor.min-b6b8d2a31d61830c2d8f65c5ba54236a.js"></script>
+                <script src="assets/ghost.min-f3c6886e191d34450e9ffca0c8fa056e.js"></script>
             
 </body>
 </html>

package/core/server/web/api/canary/admin/app.js

@@ -19,9 +19,6 @@ module.exports = function setupApiApp() {
     // Query parsing
     apiApp.use(boolParser());
 
-    // send 503 json response in case of maintenance
-    apiApp.use(shared.middleware.maintenance);
-
     // Check version matches for API requests, depends on res.locals.safeVersion being set
     // Therefore must come after themeHandler.ghostLocals, for now
     apiApp.use(apiMw.versionMatch);

package/core/server/web/api/canary/admin/middleware.js

@@ -44,7 +44,7 @@ const notImplemented = function (req, res, next) {
         }
     }
 
-    next(new errors.GhostError({
+    next(new errors.InternalServerError({
         errorType: 'NotImplementedError',
         message: tpl(messages.notImplemented),
         statusCode: '501'

package/core/server/web/api/canary/content/app.js

@@ -17,9 +17,6 @@ module.exports = function setupApiApp() {
     // Query parsing
     apiApp.use(boolParser());
 
-    // send 503 json response in case of maintenance
-    apiApp.use(shared.middleware.maintenance);
-
     // API shouldn't be cached
     apiApp.use(shared.middleware.cacheControl('private'));
 

package/core/server/web/api/v2/admin/app.js

@@ -19,9 +19,6 @@ module.exports = function setupApiApp() {
     // Query parsing
     apiApp.use(boolParser());
 
-    // send 503 json response in case of maintenance
-    apiApp.use(shared.middleware.maintenance);
-
     // Check version matches for API requests, depends on res.locals.safeVersion being set
     // Therefore must come after themeHandler.ghostLocals, for now
     apiApp.use(apiMw.versionMatch);

package/core/server/web/api/v2/admin/middleware.js

@@ -40,7 +40,7 @@ const notImplemented = function (req, res, next) {
         }
     }
 
-    next(new errors.GhostError({
+    next(new errors.InternalServerError({
         errorType: 'NotImplementedError',
         message: tpl(messages.notImplemented),
         statusCode: '501'

package/core/server/web/api/v2/content/app.js

@@ -17,9 +17,6 @@ module.exports = function setupApiApp() {
     // Query parsing
     apiApp.use(boolParser());
 
-    // send 503 json response in case of maintenance
-    apiApp.use(shared.middleware.maintenance);
-
     // API shouldn't be cached
     apiApp.use(shared.middleware.cacheControl('private'));
 

package/core/server/web/api/v3/admin/app.js

@@ -19,9 +19,6 @@ module.exports = function setupApiApp() {
     // Query parsing
     apiApp.use(boolParser());
 
-    // send 503 json response in case of maintenance
-    apiApp.use(shared.middleware.maintenance);
-
     // Check version matches for API requests, depends on res.locals.safeVersion being set
     // Therefore must come after themeHandler.ghostLocals, for now
     apiApp.use(apiMw.versionMatch);

package/core/server/web/api/v3/admin/middleware.js

@@ -44,7 +44,7 @@ const notImplemented = function (req, res, next) {
         }
     }
 
-    next(new errors.GhostError({
+    next(new errors.InternalServerError({
         errorType: 'NotImplementedError',
         message: tpl(messages.notImplemented),
         statusCode: '501'

package/core/server/web/api/v3/content/app.js

@@ -17,9 +17,6 @@ module.exports = function setupApiApp() {
     // Query parsing
     apiApp.use(boolParser());
 
-    // send 503 json response in case of maintenance
-    apiApp.use(shared.middleware.maintenance);
-
     // API shouldn't be cached
     apiApp.use(shared.middleware.cacheControl('private'));
 

package/core/server/web/members/app.js

@@ -13,9 +13,6 @@ module.exports = function setupMembersApp() {
     debug('Members App setup start');
     const membersApp = express('members');
 
-    // send 503 json response in case of maintenance
-    membersApp.use(shared.middleware.maintenance);
-
     // Members API shouldn't be cached
     membersApp.use(shared.middleware.cacheControl('private'));
 

package/core/server/web/oauth/app.js

@@ -2,7 +2,6 @@ const debug = require('@tryghost/debug')('web:oauth:app');
 const {URL} = require('url');
 const express = require('../../../shared/express');
 const urlUtils = require('../../../shared/url-utils');
-const shared = require('../shared');
 const settingsCache = require('../../../shared/settings-cache');
 const models = require('../../models');
 const auth = require('../../services/auth');
@@ -24,9 +23,6 @@ module.exports = function setupOAuthApp() {
     }
     oauthApp.use(labsMiddleware);
 
-    // send 503 json response in case of maintenance
-    oauthApp.use(shared.middleware.maintenance);
-
     /**
      * Configure the passport.authenticate middleware
      * We need to configure it on each request because clientId and secret

package/core/server/web/parent/app.js

@@ -3,16 +3,15 @@ const config = require('../../../shared/config');
 const express = require('../../../shared/express');
 const compress = require('compression');
 const mw = require('./middleware');
-const vhost = require('@tryghost/vhost-middleware');
 
-module.exports = function setupParentApp(options = {}) {
+module.exports = function setupParentApp() {
     debug('ParentApp setup start');
     const parentApp = express('parent');
 
     parentApp.use(mw.requestId);
     parentApp.use(mw.logRequest);
 
-    // Register event emmiter on req/res to trigger cache invalidation webhook event
+    // Register event emitter on req/res to trigger cache invalidation webhook event
     parentApp.use(mw.emitEvents);
 
     // enabled gzip compression by default
@@ -24,16 +23,6 @@ module.exports = function setupParentApp(options = {}) {
     // @TODO: figure out if this is really needed everywhere? Is it not frontend only...
     parentApp.use(mw.ghostLocals);
 
-    // Mount the express apps on the parentApp
-
-    // ADMIN + API
-    const backendApp = require('./backend')();
-    parentApp.use(vhost(config.getBackendMountPath(), backendApp));
-
-    // SITE + MEMBERS
-    const frontendApp = require('./frontend')(options);
-    parentApp.use(vhost(config.getFrontendMountPath(), frontendApp));
-
     debug('ParentApp setup end');
 
     return parentApp;

package/core/server/web/parent/backend.js

@@ -10,9 +10,11 @@ module.exports = () => {
     // BACKEND
     // Wrap the admin and API apps into a single express app for use with vhost
     const backendApp = express('backend');
+
     backendApp.lazyUse('/ghost/api', require('../api'));
     backendApp.lazyUse('/ghost/oauth', require('../oauth'));
     backendApp.lazyUse('/ghost/.well-known', require('../well-known'));
+
     backendApp.use('/ghost', require('../../services/auth/session').createSessionFromToken, require('../admin')());
 
     return backendApp;