From ce14a9960610cba75de7de7631eadafbbbe0a3be Mon Sep 17 00:00:00 2001 From: muxator Date: Wed, 22 Aug 2018 01:56:40 +0200 Subject: [PATCH] settings, APIHandler: use makeAbsolute() for locating APIKEY and SESSIONKEY --- src/node/handler/APIHandler.js | 4 ++-- src/node/utils/Settings.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/node/handler/APIHandler.js b/src/node/handler/APIHandler.js index 3907df79a..7e7da49be 100644 --- a/src/node/handler/APIHandler.js +++ b/src/node/handler/APIHandler.js @@ -18,7 +18,7 @@ * limitations under the License. */ - +var absolutePaths = require('../utils/AbsolutePaths'); var ERR = require("async-stacktrace"); var fs = require("fs"); var api = require("../db/API"); @@ -31,7 +31,7 @@ var apiHandlerLogger = log4js.getLogger('APIHandler'); //ensure we have an apikey var apikey = null; -var apikeyFilename = argv.apikey || "./APIKEY.txt"; +var apikeyFilename = absolutePaths.makeAbsolute(argv.apikey || "./APIKEY.txt"); try { apikey = fs.readFileSync(apikeyFilename,"utf8"); diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 6514d2331..c4df920b2 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -471,7 +471,7 @@ exports.reloadSettings = function reloadSettings() { } if (!exports.sessionKey) { - var sessionkeyFilename = argv.sessionkey || "./SESSIONKEY.txt"; + var sessionkeyFilename = absolutePaths.makeAbsolute(argv.sessionkey || "./SESSIONKEY.txt"); try { exports.sessionKey = fs.readFileSync(sessionkeyFilename,"utf8"); console.info(`Session key loaded from: ${sessionkeyFilename}`);