diff --git a/include/routes/v1/users.js b/include/routes/v1/users.js index 2c104979..33baf48d 100644 --- a/include/routes/v1/users.js +++ b/include/routes/v1/users.js @@ -364,7 +364,7 @@ function routes(app, opts, done) { return group; } - let user = await getUser(req, res); + var user = await getUser(req, res); if (user && user.msg) { res.code(400); @@ -387,7 +387,7 @@ function routes(app, opts, done) { return group; } - const user = await getUser(req, res); + var user = await getUser(req, res); if (user && user.msg) { res.code(400); diff --git a/include/server/router.js b/include/server/router.js index b5f1041c..8035a88e 100644 --- a/include/server/router.js +++ b/include/server/router.js @@ -7,6 +7,7 @@ const log = config.log.logger; const regex = require('../utils/regex'); const parse = require('../utils/parse'); //const { proxy } = require('fast-proxy')({}); +const ignored_log_routes = ['/' + config.serviceName + '/metrics', '/' + config.serviceName + '/health']; class Router { constructor(server) { @@ -139,16 +140,27 @@ class Router { req.headers['t-id'] = sessionUser.id; req.headers['t-email'] = sessionUser.email; req.headers['t-perm'] = r.name; + req.headers['t-ip'] = parse.getIp(req) || '0.0.0.0'; } if (req.raw.url.indexOf('/' + config.serviceName + '/') == 0 && !r.host) { - if (config.log.requests) { + if (config.log.requests && ignored_log_routes.indexOf(req.raw.url) == -1) { if (authenticated) { log.info( - sessionUser.username + ' (' + routedGroup.name + ') | ' + req.raw.ip + ' | [' + req.raw.method + '] ' + req.raw.url + (sessionUser.username || sessionUser.email) + + ' (' + + routedGroup.name + + ') | ' + + parse.getIp(req) + + ' | [' + + req.raw.method + + '] ' + + req.raw.url ); } else { - log.info('Unregistered User' + ' (anonymous)' + ' | ' + req.raw.ip + ' | [' + req.raw.method + '] ' + req.raw.url); + log.info( + 'Unregistered User' + ' (anonymous)' + ' | ' + parse.getIp(req) + ' | [' + req.raw.method + '] ' + req.raw.url + ); } } return false; @@ -166,37 +178,36 @@ class Router { if (r.remove_from_path) { req.raw.url = req.raw.url.replace(this.transformRoute(sessionUser, r, r.remove_from_path, routedGroup), ''); } - - if (config.log.requests && authenticated) { - log.info( - sessionUser.username + - ' (' + - routedGroup.name + - ') | ' + - parse.getIp(req) + - ' | [' + - req.raw.method + - '] ' + - req.raw.url + - ' -> ' + - target.target + - req.raw.url - ); - } - - if (config.log.requests && !authenticated) { - log.info( - 'Unregistered User' + - ' (anonymous)' + - ' | ' + - parse.getIp(req) + - ' | [' + - req.raw.method + - '] ' + - req.raw.url + - ' -> ' + - target.target - ); + if (config.log.requests && ignored_log_routes.indexOf(req.raw.url) == -1) { + if (authenticated) { + log.info( + (sessionUser.username || sessionUser.email) + + ' (' + + routedGroup.name + + ') | ' + + parse.getIp(req) + + ' | [' + + req.raw.method + + '] ' + + req.raw.url + + ' -> ' + + target.target + + req.raw.url + ); + } else { + log.info( + 'Unregistered User' + + ' (anonymous)' + + ' | ' + + parse.getIp(req) + + ' | [' + + req.raw.method + + '] ' + + req.raw.url + + ' -> ' + + target.target + ); + } } if (r.host && req._wssocket) { diff --git a/package.json b/package.json index 186d4237..d63681b0 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,10 @@ "gateway", "api" ], + "bin": { + "travelling": "./index.js", + "traveling": "./index.js" + }, "author": "Jt Whissel", "license": "MIT", "bugs": { @@ -42,7 +46,7 @@ "fastify": "^3.11.0", "fastify-cookie": "^5.1.0", "fastify-favicon": "^3.0.0", - "fastify-good-sessions": "^1.4.0", + "fastify-good-sessions": "^1.4.2", "fastify-plugin": "^3.0.0", "fastify-static": "^3.4.0", "handlebars": "^4.7.3", diff --git a/sdk/package.json b/sdk/package.json index de3dd9d8..1ca9bf5b 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -1,6 +1,6 @@ { "name": "travelling-sdk", - "version": "1.0.1", + "version": "1.1.0", "description": "", "main": "node/index.js", "files": [