From 8de06a0a8aa59e77c5da8725c57b88b8d57daae1 Mon Sep 17 00:00:00 2001 From: baldo Date: Sat, 6 May 2017 18:40:59 +0200 Subject: [PATCH] Allow serving everything beneath a baseUrl with a path. See: https://github.com/freifunkhamburg/ffffng/issues/44 --- README.md | 2 +- admin/index.html | 2 +- admin/js/main.js | 10 +++-- admin/js/views/dashboardStats.js | 6 ++- admin/js/views/mailActionButton.js | 6 ++- admin/js/views/taskActionButton.js | 6 ++- admin/js/views/version.js | 6 ++- app/scripts/directives/footer.js | 6 ++- app/scripts/services/monitoringService.js | 8 ++-- app/scripts/services/nodeService.js | 12 +++--- server/app.js | 17 +++++--- server/config.js | 4 ++ server/logger.js | 3 +- server/router.js | 52 +++++++++++++---------- 14 files changed, 85 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 4d36909..4e2b8b3 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ cp $FFFFNG_HOME/node_modules/ffffng/config.json.example $FFFFNG_HOME/config.json Dann die `config.json` anpassen nach belieben. Es gibt die folgenden Konfigurations-Optionen: * **`server.baseUrl`** Basis-URL unter der die Knotenverwaltung erreichbar ist, z. B.: - `"https://formular.musterstadt.freifunk.net"` + `"https://formular.musterstadt.freifunk.net"` oder `"https://musterstadt.freifunk.net/formular"` * **`server.port`** Port unter dem der Server lokal läuft, z. B.: `8080` * **`server.databaseFile`** Pfad zur Datenbank-Datei, z. B.: `"$FFFFNG_HOME/ffffng.sqlite"` diff --git a/admin/index.html b/admin/index.html index 8b6a187..f2e9ed2 100644 --- a/admin/index.html +++ b/admin/index.html @@ -80,6 +80,6 @@ - + diff --git a/admin/js/main.js b/admin/js/main.js index 38b6647..b0a157a 100644 --- a/admin/js/main.js +++ b/admin/js/main.js @@ -40,6 +40,8 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest var admin = nga.application(title); document.title = title; + var pathPrefix = config.rootPath === '/' ? '' : config.rootPath; + admin .header( '
' + @@ -59,12 +61,12 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest '' + '

' + '

' + - '' + + '' + ' Frontend' + '' + '

' ) - .baseApiUrl('/internal/api/') + .baseApiUrl(pathPrefix + '/internal/api/') .debug(true); function nodeClasses(node) { @@ -374,7 +376,7 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest .addChild(nga .menu() .template( - '' + + '' + ' Dashboard / Statistics' + '' ) @@ -398,7 +400,7 @@ angular.module('ffffngAdmin').config(function(NgAdminConfigurationProvider, Rest .addChild(nga .menu() .template( - '' + + '' + ' Logs' + '' ) diff --git a/admin/js/views/dashboardStats.js b/admin/js/views/dashboardStats.js index 475f227..9ccb0ca 100644 --- a/admin/js/views/dashboardStats.js +++ b/admin/js/views/dashboardStats.js @@ -1,10 +1,12 @@ 'use strict'; angular.module('ffffngAdmin') -.directive('faDashboardStats', function ($http, $state, notification) { +.directive('faDashboardStats', function ($http, $state, notification, config) { + var pathPrefix = config.rootPath === '/' ? '' : config.rootPath; + var link = function (scope) { scope.stats = {}; - $http.get('/internal/api/statistics') + $http.get(pathPrefix + '/internal/api/statistics') .then(function (result) { scope.stats = result.data; }) .catch(function (e) { notification.log('Error: ' + e.data, { addnCls: 'humane-flatty-error' }); diff --git a/admin/js/views/mailActionButton.js b/admin/js/views/mailActionButton.js index 154c8cc..cc443ce 100644 --- a/admin/js/views/mailActionButton.js +++ b/admin/js/views/mailActionButton.js @@ -1,7 +1,9 @@ 'use strict'; angular.module('ffffngAdmin') -.directive('faMailActionButton', function (Restangular, $state, notification) { +.directive('faMailActionButton', function (Restangular, $state, notification, config) { + var pathPrefix = config.rootPath === '/' ? '' : config.rootPath; + var link = function (scope) { scope.label = scope.label || 'ACTION'; scope.icon = scope.icon || 'envelope'; @@ -11,7 +13,7 @@ angular.module('ffffngAdmin') var mail = scope.mail(); Restangular - .one('/internal/api/mails/' + scope.action, mail.values.id).put() + .one(pathPrefix + '/internal/api/mails/' + scope.action, mail.values.id).put() .then(function () { $state.reload() }) .then(function () { notification.log('Done', { addnCls: 'humane-flatty-success' }); }) .catch(function (e) { diff --git a/admin/js/views/taskActionButton.js b/admin/js/views/taskActionButton.js index c3e86fe..dbc8887 100644 --- a/admin/js/views/taskActionButton.js +++ b/admin/js/views/taskActionButton.js @@ -1,7 +1,9 @@ 'use strict'; angular.module('ffffngAdmin') -.directive('faTaskActionButton', function (Restangular, $state, notification) { +.directive('faTaskActionButton', function (Restangular, $state, notification, config) { + var pathPrefix = config.rootPath === '/' ? '' : config.rootPath; + var link = function (scope) { scope.label = scope.label || 'ACTION'; scope.icon = scope.icon || 'play'; @@ -11,7 +13,7 @@ angular.module('ffffngAdmin') var task = scope.task(); Restangular - .one('/internal/api/tasks/' + scope.action, task.values.id).put() + .one(pathPrefix + '/internal/api/tasks/' + scope.action, task.values.id).put() .then(function () { $state.reload() }) .then(function () { notification.log('Done', { addnCls: 'humane-flatty-success' }); }) .catch(function (e) { diff --git a/admin/js/views/version.js b/admin/js/views/version.js index 0fa2110..383abc4 100644 --- a/admin/js/views/version.js +++ b/admin/js/views/version.js @@ -1,10 +1,12 @@ 'use strict'; angular.module('ffffngAdmin') -.directive('faVersion', function ($http, $state, notification) { +.directive('faVersion', function ($http, $state, notification, config) { + var pathPrefix = config.rootPath === '/' ? '' : config.rootPath; + var link = function (scope) { scope.version = '?'; - $http.get('/api/version') + $http.get(pathPrefix + '/api/version') .then(function (result) { scope.version = result.data.version; }) .catch(function (e) { notification.log('Error: ' + e.data, { addnCls: 'humane-flatty-error' }); diff --git a/app/scripts/directives/footer.js b/app/scripts/directives/footer.js index b2875da..c9f9526 100644 --- a/app/scripts/directives/footer.js +++ b/app/scripts/directives/footer.js @@ -1,10 +1,12 @@ 'use strict'; angular.module('ffffng') -.directive('fFooter', function ($http) { +.directive('fFooter', function ($http, config) { + var pathPrefix = config.rootPath === '/' ? '' : config.rootPath; + var ctrl = function ($scope) { $scope.version = '?'; - $http.get('/api/version') + $http.get(pathPrefix + '/api/version') .then(function (result) { $scope.version = result.data.version; }); }; diff --git a/app/scripts/services/monitoringService.js b/app/scripts/services/monitoringService.js index f67768d..634769a 100644 --- a/app/scripts/services/monitoringService.js +++ b/app/scripts/services/monitoringService.js @@ -1,20 +1,22 @@ 'use strict'; angular.module('ffffng') -.service('MonitoringService', function ($http, $q) { +.service('MonitoringService', function ($http, $q, config) { + var pathPrefix = config.rootPath === '/' ? '' : config.rootPath; + return { 'confirm': function (token) { if (!token) { return $q.reject({}); } - return $http.put('/api/monitoring/confirm/' + token); + return $http.put(pathPrefix + '/api/monitoring/confirm/' + token); }, 'disable': function (token) { if (!token) { return $q.reject({}); } - return $http.put('/api/monitoring/disable/' + token); + return $http.put(pathPrefix + '/api/monitoring/disable/' + token); } }; }); diff --git a/app/scripts/services/nodeService.js b/app/scripts/services/nodeService.js index 67f68b3..f05b477 100644 --- a/app/scripts/services/nodeService.js +++ b/app/scripts/services/nodeService.js @@ -1,22 +1,24 @@ 'use strict'; angular.module('ffffng') -.service('NodeService', function ($http) { +.service('NodeService', function ($http, config) { + var pathPrefix = config.rootPath === '/' ? '' : config.rootPath; + return { 'createNode': function (node) { - return $http.post('/api/node', node); + return $http.post(pathPrefix + '/api/node', node); }, 'updateNode': function (node, token) { - return $http.put('/api/node/' + token, node); + return $http.put(pathPrefix + '/api/node/' + token, node); }, 'deleteNode': function (token) { - return $http.delete('/api/node/' + token); + return $http.delete(pathPrefix + '/api/node/' + token); }, 'getNode': function (token) { - return $http.get('/api/node/' + token); + return $http.get(pathPrefix + '/api/node/' + token); } }; }); diff --git a/server/app.js b/server/app.js index c58dfa3..ca6959c 100644 --- a/server/app.js +++ b/server/app.js @@ -7,6 +7,7 @@ angular.module('ffffng').factory('app', function (fs, config, _) { var compress = require('compression'); var app = express(); + var router = express.Router(); // urls beneath /internal are protected var internalAuth = auth.basic( @@ -21,10 +22,10 @@ angular.module('ffffng').factory('app', function (fs, config, _) { ); } ); - app.use('/internal', auth.connect(internalAuth)); + router.use('/internal', auth.connect(internalAuth)); - app.use(bodyParser.json()); - app.use(bodyParser.urlencoded({ extended: true })); + router.use(bodyParser.json()); + router.use(bodyParser.urlencoded({ extended: true })); var adminDir = __dirname + '/../admin'; var clientDir = __dirname + '/../client'; @@ -34,7 +35,7 @@ angular.module('ffffng').factory('app', function (fs, config, _) { '/config.js' ]; - app.use(compress()); + router.use(compress()); function serveTemplate(mimeType, req, res, next) { return fs.readFile(templateDir + '/' + req.path, 'utf8', function (err, body) { @@ -49,15 +50,17 @@ angular.module('ffffng').factory('app', function (fs, config, _) { }); } - app.use(function (req, res, next) { + router.use(function (req, res, next) { if (jsTemplateFiles.indexOf(req.path) >= 0) { return serveTemplate('application/javascript', req, res, next); } return next(); }); - app.use('/internal/admin', express.static(adminDir + '/')); - app.use('/', express.static(clientDir + '/')); + router.use('/internal/admin', express.static(adminDir + '/')); + router.use('/', express.static(clientDir + '/')); + + app.use(config.server.rootPath, router); return app; }); diff --git a/server/config.js b/server/config.js index 9676d88..b12da3d 100644 --- a/server/config.js +++ b/server/config.js @@ -140,6 +140,10 @@ var config = deepExtend({}, defaultConfig, configJSON); stripTrailingSlash(config.server, 'baseUrl'); stripTrailingSlash(config.client.map, 'mapUrl'); +var url = require('url'); +config.server.rootPath = url.parse(config.server.baseUrl).pathname; +config.client.rootPath = config.server.rootPath; + module.exports = config; angular.module('ffffng').constant('config', config); diff --git a/server/logger.js b/server/logger.js index 23ba3cb..401cbe2 100644 --- a/server/logger.js +++ b/server/logger.js @@ -38,7 +38,8 @@ angular.module('ffffng').factory('Logger', function (app) { app.use(scribe.express.logger()); } if (config.server.internal.active) { - app.use('/internal/logs', scribe.webPanel()); + var prefix = config.server.rootPath === '/' ? '' : config.server.rootPath; + app.use(prefix + '/internal/logs', scribe.webPanel()); } return process.console; diff --git a/server/router.js b/server/router.js index 42c635f..e13d5e8 100644 --- a/server/router.js +++ b/server/router.js @@ -8,40 +8,46 @@ angular.module('ffffng').factory('Router', function ( NodeResource, MonitoringResource, TaskResource, - MailResource + MailResource, + config ) { return { init: function () { - app.post('/', FrontendResource.render); + var express = require('express'); + var router = express.Router(); - app.get('/api/version', VersionResource.get); + router.post('/', FrontendResource.render); - app.post('/api/node', NodeResource.create); - app.put('/api/node/:token', NodeResource.update); - app.delete('/api/node/:token', NodeResource.delete); - app.get('/api/node/:token', NodeResource.get); + router.get('/api/version', VersionResource.get); - app.put('/api/monitoring/confirm/:token', MonitoringResource.confirm); - app.put('/api/monitoring/disable/:token', MonitoringResource.disable); + router.post('/api/node', NodeResource.create); + router.put('/api/node/:token', NodeResource.update); + router.delete('/api/node/:token', NodeResource.delete); + router.get('/api/node/:token', NodeResource.get); - app.get('/internal/api/statistics', StatisticsResource.get); + router.put('/api/monitoring/confirm/:token', MonitoringResource.confirm); + router.put('/api/monitoring/disable/:token', MonitoringResource.disable); - app.get('/internal/api/tasks', TaskResource.getAll); - app.put('/internal/api/tasks/run/:id', TaskResource.run); - app.put('/internal/api/tasks/enable/:id', TaskResource.enable); - app.put('/internal/api/tasks/disable/:id', TaskResource.disable); + router.get('/internal/api/statistics', StatisticsResource.get); - app.get('/internal/api/monitoring', MonitoringResource.getAll); + router.get('/internal/api/tasks', TaskResource.getAll); + router.put('/internal/api/tasks/run/:id', TaskResource.run); + router.put('/internal/api/tasks/enable/:id', TaskResource.enable); + router.put('/internal/api/tasks/disable/:id', TaskResource.disable); - app.get('/internal/api/mails', MailResource.getAll); - app.get('/internal/api/mails/:id', MailResource.get); - app.delete('/internal/api/mails/:id', MailResource.delete); - app.put('/internal/api/mails/reset/:id', MailResource.resetFailures); + router.get('/internal/api/monitoring', MonitoringResource.getAll); - app.put('/internal/api/nodes/:token', NodeResource.update); - app.delete('/internal/api/nodes/:token', NodeResource.delete); - app.get('/internal/api/nodes', NodeResource.getAll); - app.get('/internal/api/nodes/:token', NodeResource.get); + router.get('/internal/api/mails', MailResource.getAll); + router.get('/internal/api/mails/:id', MailResource.get); + router.delete('/internal/api/mails/:id', MailResource.delete); + router.put('/internal/api/mails/reset/:id', MailResource.resetFailures); + + router.put('/internal/api/nodes/:token', NodeResource.update); + router.delete('/internal/api/nodes/:token', NodeResource.delete); + router.get('/internal/api/nodes', NodeResource.getAll); + router.get('/internal/api/nodes/:token', NodeResource.get); + + app.use(config.server.rootPath, router); } }; });