public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2601 from Gared/session_key_file 

Move sessionKey setting from settings.json to SESSIONKEY.txt
pull/2604/head
Stefan 2015-04-11 19:10:18 +02:00
parent 25092fcb90 a3ed82ad06
commit 43687f6e8b
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings.json.template
View File

@ -15,10 +15,6 @@
"ip": "0.0.0.0", "ip": "0.0.0.0",
"port" : 9001, "port" : 9001,
// Session Key, used for reconnecting user sessions
// Set this to a secure string at least 10 characters long. Do not share this value.
"sessionKey" : "",
/* /*
// Node native SSL support // Node native SSL support
// this is disabled by default // this is disabled by default

12
src/node/utils/Settings.js
View File

@ -286,13 +286,15 @@ exports.reloadSettings = function reloadSettings() {
} }
} }
if(!exports.sessionKey){ // If the secretKey isn't set we also create yet another unique value here if (!exports.sessionKey) {
try {
exports.sessionKey = fs.readFileSync("./SESSIONKEY.txt","utf8");
} catch(e) {
exports.sessionKey = randomString(32); exports.sessionKey = randomString(32);
var sessionWarning = "You need to set a sessionKey value in settings.json, this will allow your users to reconnect to your Etherpad Instance if your instance restarts"; fs.writeFileSync("./SESSIONKEY.txt",exports.sessionKey,"utf8");
if(!exports.suppressErrorsInPadText){
exports.defaultPadText = exports.defaultPadText + "\nWarning: " + sessionWarning + suppressDisableMsg;
} }
console.warn(sessionWarning); } else {
console.warn("Declaring the sessionKey in the settings.json is deprecated. This value is auto-generated now. Please remove the setting from the file.");
} }
if(exports.dbType === "dirty"){ if(exports.dbType === "dirty"){