libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1013 from eldiddio/develop

Browse source 
Fixed foreach loop on session IDs, was breaking EP on single session in cookie
This commit is contained in:
John McLear 2012-09-18 08:53:43 -07:00
commit f81a110229
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/node/db/SecurityManager.js
View file

@ -123,26 +123,29 @@ exports.checkAccess = function (padID, sessionCookie, token, password, callback)
}
var sessionIDs = sessionCookie.split(',');
async.foreach(sessionIDs, function(sessionID) {
sessionManager.getSessionInfo(sessionID, function(err, sessionInfo) {
//skip session if it doesn't exist
if(err && err.message == "sessionID does not exist") return;
if (sessionIDs){
async.forEach(sessionIDs, function(sessionID, cb){
sessionManager.getSessionInfo(sessionID, function(err, sessionInfo) {
//skip session if it doesn't exist
if(err && err.message == "sessionID does not exist") return;
if(ERR(err, callback)) return;
if(ERR(err, callback)) return;
var now = Math.floor(new Date().getTime()/1000);
var now = Math.floor(new Date().getTime()/1000);
//is it for this group?
if(sessionInfo.groupID != groupID) return;
//is it for this group?
if(sessionInfo.groupID != groupID) return;
//is validUntil still ok?
if(sessionInfo.validUntil <= now) return;
//is validUntil still ok?
if(sessionInfo.validUntil <= now) return;
// There is a valid session
validSession = true;
sessionAuthor = sessionInfo.authorID;
});
}, callback)
// There is a valid session
validSession = true;
sessionAuthor = sessionInfo.authorID;
cb(); // finish the current value and go to next
});
}, callback)
}
},
//get author for token
function(callback)