npm: Updated packages for fixing audit

- Added environment variable REGISTER_PASS for authorize register
- Added endpoint /:fqdn/:code/:pass for register new fqdn's

app.js

@@ -12,7 +12,7 @@ let hbs = require('hbs');
 //let sessionMySQL = require("connect-mysql")(expressSession);
 let compression = require("compression");
 //let expressMinify = require('express-minify');
-//let expressMinifyHtml = require('express-minify-html');
+//let expressMinifyHtml = require('express-minify-html-2');
 
 let app = express();
 

libs/configuration.js

@@ -6,4 +6,5 @@ module.exports = {
         password: process.env.DATABASE_PASSWORD,
         database: process.env.DATABASE_NAME,
     },
+    registerPass: process.env.REGISTER_PASS,
 };

package.json

@@ -15,11 +15,11 @@
     "express": "~4.16.0",
     "express-layout": "^0.1.0",
     "express-minify": "^1.0.0",
-    "express-minify-html": "^0.12.0",
+    "express-minify-html-2": "^1.0.1",
     "express-session": "^1.15.6",
     "express-validator": "^5.3.0",
     "handlebars": "^4.1.0",
-    "hbs": "^4.0.3",
+    "hbs": "^4.0.5",
     "http-errors": "~1.6.2",
     "ical-generator": "^1.0.4",
     "ipaddr.js": "^1.8.1",

routes/ping.js

@@ -1,9 +1,12 @@
 let express = require("express");
 let ipaddr = require("ipaddr.js");
+let moment = require("moment");
+let conf = require("../libs/configuration");
 let db = require("../libs/Database").instance();
 let router = express.Router();
 
 const IP_TYPES = ["ipv4", "ipv6"];
+const REGISTER_PASS = conf.registerPass;
 
 function combineToList(a, b) {
     return a + "\n" + b;
@@ -14,36 +17,54 @@ function toList(array) {
 }
 
 function testIP(req, res, next) {
-	let addr = ipaddr.parse(req.ip);
+    let addr = ipaddr.parse(req.ip);
     if (!IP_TYPES.includes(addr.kind())) return res.status(400).send("Invalid ip address");
-	req.params.addr = addr;
-	next();
+    req.params.addr = addr;
+    next();
 }
 
 router.use((req, res, next) => {
     res.type('text/plain');
-	next();
+    next();
 });
 
 router.get("/", testIP, (req, res) => {
-	res.send(req.params.addr.toString());
+    res.send(req.params.addr.toString());
 });
 
 router.get("/:fqdn", (req, res) => {
-    db.q.select(IP_TYPES).from("addresses").filter("fqdn", req.params.fqdn).first((e, d) => {
-		if (e) return res.status(400).send("Error");
-		if (!d) return res.status(404).send("Unknown FQDN");
-		res.send(d.ipv4 ? (d.ipv6 ? d.ipv4 + "\n" + d.ipv6 : d.ipv4) : (d.ipv6 ? d.ipv6 : ""));
-	});
+    db.q.select(IP_TYPES.concat(IP_TYPES.map(e => e + "LastPing"))).from("addresses").filter("fqdn", req.params.fqdn).first((e, d) => {
+        if (e) return res.status(400).send("Error");
+        if (!d) return res.status(404).send("Unknown FQDN");
+        res.send([
+            d.ipv4 ? d.ipv4 : "0.0.0.0",
+            moment(d.ipv4LastPing).toISOString(),
+            d.ipv6 ? d.ipv6 : "::",
+            moment(d.ipv6LastPing).toISOString(),
+        ].reduce((a, b) => a + "\n" + b));
+    });
 });
 
 router.get("/:fqdn/:code", testIP, (req, res) => {
-	let addr = req.params.addr;
+    let addr = req.params.addr;
     db.query("UPDATE addresses SET " + addr.kind() + " = ?, " + addr.kind() + "LastPing = CURRENT_TIMESTAMP WHERE fqdn = ? AND code = ?", [addr.toString(), req.params.fqdn, req.params.code], (e, d) => {
-		if (e) return res.status(400).send("Error");
-		if (d.affectedRows <= 0) return res.status(400).send("Invalid token");
-		res.send(addr.toString());
-	});
+        if (e) return res.status(400).send("Error");
+        if (d.affectedRows <= 0) return res.status(403).send("Invalid token");
+        res.send(addr.toString());
+    });
+});
+
+router.get("/:fqdn/:code/:pass", (req, res) => {
+    const pass = req.params.pass;
+    const fqdn = req.params.fqdn;
+    const code = req.params.code;
+    if (REGISTER_PASS === "" || pass !== REGISTER_PASS) return res.status(403).send("Invalid token");
+    db.query("INSERT INTO addresses SET fqdn = ?, code = ? ON DUPLICATE KEY UPDATE code = ?", [fqdn, code, code], (e, d) => {
+        if (e) return res.status(400).send("Error");
+        if (d.insertId <= 0) return res.send("Already registered");
+        if (d.affectedRows >= 2) return res.send("Successful changed code");
+        res.send("Successful registered");
+    })
 });
 
 module.exports = router;