Merge pull request #13 from MasseranoLabs/adminapi

Added admin web API skeleton, add node endpoint

Author: pierotofy

Diff for: adminweb.js

@@ -0,0 +1,56 @@
+/**
+ *  nodeodm-proxy - A reverse proxy, load balancer and task tracker for NodeODM
+ *  Copyright (C) 2018-present MasseranoLabs LLC
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ *  published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+const logger = require('./libs/logger');
+const express = require('express');
+const basicAuth = require('express-basic-auth');
+const nodes = require('./libs/nodes');
+
+module.exports = {
+    create: function(options){
+        logger.info("Starting admin web interface on " + options.port);
+        const app = express();
+
+        if (!options.password){
+            logger.warn(`No admin password specified, make sure port ${options.port} is secured`);
+        }else{
+            app.use(basicAuth({
+                users: { 'admin': options.password },
+                challenge: true,
+                realm: "nodeodm-proxy"
+            }));
+        }
+        
+        app.use(express.static('public'));
+        app.use(express.json());
+
+        // API
+        app.post('/r/node/add', (req, res) => {
+            const { hostname, port, token } = req.body;
+            const node = nodes.add(hostname, port, token);
+            if (node) {
+                node.updateInfo();
+                res.send({success: true});
+            }else{
+                res.send({error: "Invalid"});
+            }
+        });
+
+        app.listen(options.port);
+    }
+}
+

Diff for: config.js

@@ -18,7 +18,7 @@
 'use strict';
 
 let argv = require('minimist')(process.argv.slice(2), {
-    string: ['port', 'admin-cli-port', 'admin-cli-pass', 
+    string: ['port', 'admin-cli-port', 'admin-pass', 'admin-web-port',
             'cloud-provider', 'downloads-from-s3', 'log-level',
             'upload-max-speed', 'ssl-key', 'ssl-cert', 'secure-port',
             'cluster-address'],
@@ -31,7 +31,8 @@ let argv = require('minimist')(process.argv.slice(2), {
         'port': 3000,
         'secure-port': 0,
         'admin-cli-port': 8080,
-        'admin-cli-pass': '',
+        'admin-web-port': 10000,
+        'admin-pass': '',
         'cloud-provider': 'local',
         'downloads-from-s3': '',
         'no-cluster': false,
@@ -51,8 +52,9 @@ Usage: node index.js [options]
 Options:
     -p, --port <number> 	Port to bind the server to (default: 3000)
     --secure-port <number>	If SSL is enabled and you want to expose both a secure and non-secure service, set this value to the secure port. Otherwise only SSL will be enabled using the --port value. (default: none)
-    --admin-cli-port <number> 	Port to bind the admin CLI to (default: 8080)
-    --admin-cli-pass <string> 	Password to log-in to the admin CLI (default: none)
+    --admin-cli-port <number> 	Port to bind the admin CLI to. Set to zero to disable. (default: 8080)
+    --admin-web-port <number> 	Port to bind the admin web interface to. Set to zero to disable. (default: 10000)
+    --admin-pass <string> 	Password to log-in to the admin functions (default: none)
     --log-level <logLevel>	Set log level verbosity (default: info)
     -c, --cloud-provider	Cloud provider to use (default: local)
     --upload-max-speed <number>	Upload to processing nodes speed limit in bytes / second (default: no limit)
@@ -79,7 +81,8 @@ config.logger.logDirectory = '' // Set this to a full path to a directory - if n
 config.port = parseInt(argv.port);
 config.secure_port = parseInt(argv['secure-port']);
 config.admin_cli_port = parseInt(argv['admin-cli-port']);
-config.admin_cli_pass = argv['admin-cli-pass'];
+config.admin_web_port = parseInt(argv['admin-web-port']);
+config.admin_pass = argv['admin-pass'];
 config.cloud_provider = argv['cloud-provider'];
 config.no_cluster = argv['no-cluster'];
 config.cluster_address = argv['cluster-address'];

Diff for: index.js

@@ -17,6 +17,7 @@
  */
 const config = require('./config');
 const admincli = require('./admincli');
+const adminweb = require('./adminweb');
 const logger = require('./libs/logger');
 const package_info = require('./package_info');
 const nodes = require('./libs/nodes');
@@ -26,7 +27,8 @@ const routetable = require('./libs/routetable');
 (async function(){
     if (config.debug) logger.warn("Running in debug mode");
     logger.info(package_info.name + " " + package_info.version);
-    admincli.create({port: config.admin_cli_port, password: config.admin_cli_pass});
+    if (config.admin_cli_port !== 0) admincli.create({port: config.admin_cli_port, password: config.admin_pass});
+    if (config.admin_web_port !== 0) adminweb.create({port: config.admin_web_port, password: config.admin_pass});
     const cloudProvider = (require('./libs/cloudProvider')).initialize(config.cloud_provider);
     await nodes.initialize();
 

Diff for: package.json

@@ -16,6 +16,8 @@
     "async": "^2.6.1",
     "axios": "^0.18.0",
     "busboy": "^0.2.14",
+    "express": "^4.16.4",
+    "express-basic-auth": "^1.2.0",
     "http-proxy": "^1.17.0",
     "minimist": "^1.2.0",
     "node-libcurl": "^1.3.3",

Diff for: public/index.html

@@ -0,0 +1 @@
+TODO