Доравботки маршрутизации

server/config/base.js

@@ -25,7 +25,7 @@ module.exports = {
         },
         {
             name: '2',
-            mode: 'omnireader', //none, normal, site, reader, omnireader
+            mode: 'omnireader',
             ip: '0.0.0.0',
             port: '33081',
         },

server/index.js

@@ -6,7 +6,6 @@ const log = getLog();
 
 const express = require('express');
 const compression = require('compression');
-const app = express();
 
 const SqliteConnectionPool = require('./core/SqliteConnectionPool');
 
@@ -16,33 +15,36 @@ async function main() {
     log('Opening database');
     await connPool.init();
 
-    let devModule = undefined;
-    if (config.branch == 'development') {
-        const devFileName = './dev.js'; //ignored by pkg -50Mb executable size
-        devModule = require(devFileName);
-        devModule.webpackDevMiddleware(app);
-    }
-
-    app.use(compression({ level: 1 }));
-    app.use(express.json());
-    if (devModule)
-        devModule.logQueries(app);
-    app.use(express.static(config.publicDir, { maxAge: '30d' }));
-
-    require('./routes').initRoutes(app, connPool, config);
-
-    if (devModule) {
-        devModule.logErrors(app);
-    } else {
-        app.use(function(err, req, res, next) {// eslint-disable-line no-unused-vars
-            log(LM_ERR, err.stack);
-            res.sendStatus(500);
-        });
-    }
-
     //servers
     for (let server of config.servers) {
         if (server.mode !== 'none') {
+            const app = express();
+            app.serverConfig = server;
+
+            let devModule = undefined;
+            if (config.branch == 'development') {
+                const devFileName = './dev.js'; //ignored by pkg -50Mb executable size
+                devModule = require(devFileName);
+                devModule.webpackDevMiddleware(app);
+            }
+
+            app.use(compression({ level: 1 }));
+            app.use(express.json());
+            if (devModule)
+                devModule.logQueries(app);
+            app.use(express.static(config.publicDir, { maxAge: '30d' }));
+
+            require('./routes').initRoutes(app, connPool, config);
+
+            if (devModule) {
+                devModule.logErrors(app);
+            } else {
+                app.use(function(err, req, res, next) {// eslint-disable-line no-unused-vars
+                    log(LM_ERR, err.stack);
+                    res.sendStatus(500);
+                });
+            }
+
             app.listen(server.port, server.ip, function() {
                 log(`Server-${server.name} is ready on ${server.ip}:${server.port}, mode: ${server.mode}`);
             });

server/routes.js

@@ -3,23 +3,38 @@ const c = require('./controllers');
 function initRoutes(app, connPool, config) {
     const misc = new c.MiscController(connPool, config);
 
+    //access
+    const serverMode = app.serverConfig.mode;
+    const [all, normal, site, reader, omnireader] = // eslint-disable-line no-unused-vars
+        [serverMode, 'normal', 'site', 'reader', 'omnireader'];
+
+    //routes
     const routes = [
-        ['POST', '/api/config', misc, 'getConfig', {}],
+        ['POST', '/api/config', misc.getConfig.bind(misc), [all], {}],
     ];
 
+    //to app
     for (let route of routes) {
-        const [httpMethod, path, controller, handler, options] = route;
+        let [httpMethod, path, controller, access, options] = route;
+        access = new Set(access);
 
-        const callback = async function(req, res) {
+        let callback = () => {};
-            try {
+        if (access.has(serverMode)) {//allowed
-                const result = await controller[handler](req, res, options);
+            callback = async function(req, res) {
+                try {
+                    const result = await controller(req, res, options);
 
-                if (result !== false)
+                    if (result !== false)
-                    res.send(result);
+                        res.send(result);
-            } catch (e) {
+                } catch (e) {
-                res.status(500).send({error: e.message});
+                    res.status(500).send({error: e.message});
-            }
+                }
-        };
+            };
+        } else {//forbidden
+            callback = async function(req, res) {
+                res.status(403);
+            };
+        }
 
         switch (httpMethod) {
             case 'GET' :