From 14f0af92e3e9085d878cf328c3583b9c5449e468 Mon Sep 17 00:00:00 2001 From: Tim Windelschmidt Date: Wed, 7 Oct 2015 12:23:39 +0200 Subject: [PATCH] Added Codelines from the Shell --- node/routes/index.js | 5 ++++- node/statusbot.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 node/routes/index.js mode change 100644 => 100755 node/statusbot.js diff --git a/node/routes/index.js b/node/routes/index.js old mode 100644 new mode 100755 index a9edad3..25bfe09 --- a/node/routes/index.js +++ b/node/routes/index.js @@ -14,9 +14,11 @@ exports.form = function (req, res) { action = req.body.action; var status = ""; mac = mac.toLowerCase(); + var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress; if (/^([0-9a-f]{2}[:-]){5}([0-9a-f]{2})$/.exec(mac)) { if (action == "add") { + console.log("add mac request mac: "+mac + " label " + label + " ip: " + ip); if (/^[0-9a-zA-Z]+$/.exec(label)) { snmpMac.add(mac, label, function (err) { console.log("add mac result: " + err); @@ -28,6 +30,7 @@ exports.form = function (req, res) { res.redirect("/db"); } } else if (action == "remove") { + console.log("remove mac request mac: "+mac + " label " + label + " ip: " + ip); snmpMac.delete(mac, function (err) { console.log("delete mac result: " + err); req.flash('status', err == null ? "" : "database error: " + err); @@ -40,4 +43,4 @@ exports.form = function (req, res) { req.flash('status', 'mac address is invalid'); res.redirect("/db"); } -}; \ No newline at end of file +}; diff --git a/node/statusbot.js b/node/statusbot.js old mode 100644 new mode 100755 index ecaf820..1a03896 --- a/node/statusbot.js +++ b/node/statusbot.js @@ -115,7 +115,7 @@ app.use(express.bodyParser()); app.use(express.cookieParser('chaostreff')); app.use(express.session({cookie: {maxAge: 60000}})); app.use(flash()); - +app.enable('trust proxy'); app.get('/api/spaceapi/v13', function (req, res) { res.setHeader("Access-Control-Allow-Origin", "*");