mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

settings, APIHandler: use makeAbsolute() for locating APIKEY and SESSIONKEY

Browse source
This commit is contained in:
muxator 2018-08-22 01:56:40 +02:00 • committed by muxator
parent 8247d5eef3
commit ce14a99606
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/handler/APIHandler.js
View file

@ -18,7 +18,7 @@
* limitations under the License. * limitations under the License.
*/ */
var absolutePaths = require('../utils/AbsolutePaths');
var ERR = require("async-stacktrace"); var ERR = require("async-stacktrace");
var fs = require("fs"); var fs = require("fs");
var api = require("../db/API"); var api = require("../db/API");
@ -31,7 +31,7 @@ var apiHandlerLogger = log4js.getLogger('APIHandler');
//ensure we have an apikey //ensure we have an apikey
var apikey = null; var apikey = null;
var apikeyFilename = argv.apikey || "./APIKEY.txt"; var apikeyFilename = absolutePaths.makeAbsolute(argv.apikey || "./APIKEY.txt");
try try
{ {
apikey = fs.readFileSync(apikeyFilename,"utf8"); apikey = fs.readFileSync(apikeyFilename,"utf8");

2
src/node/utils/Settings.js
View file

@ -471,7 +471,7 @@ exports.reloadSettings = function reloadSettings() {
} }
if (!exports.sessionKey) { if (!exports.sessionKey) {
var sessionkeyFilename = argv.sessionkey || "./SESSIONKEY.txt"; var sessionkeyFilename = absolutePaths.makeAbsolute(argv.sessionkey || "./SESSIONKEY.txt");
try { try {
exports.sessionKey = fs.readFileSync(sessionkeyFilename,"utf8"); exports.sessionKey = fs.readFileSync(sessionkeyFilename,"utf8");
console.info(`Session key loaded from: ${sessionkeyFilename}`); console.info(`Session key loaded from: ${sessionkeyFilename}`);