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

pass correct padID to checkAccess if pad is requested via readOnly link

Browse source
This commit is contained in:
vileda 2013-10-13 22:31:41 +02:00
parent ef4e0d0eb0
commit 77c2313025
2 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/node/handler/PadMessageHandler.js
View file

@ -240,7 +240,7 @@ exports.handleMessage = function(client, message)
callback();
}else{
var auth = sessioninfos[client.id].auth;
securityManager.checkAccess(auth.padID, auth.sessionID, auth.token, auth.password, function(err, statusObject)
var checkAccessCallback = function(err, statusObject)
{
if(ERR(err, callback)) return;
@ -254,7 +254,17 @@ exports.handleMessage = function(client, message)
{
client.json.send({accessStatus: statusObject.accessStatus})
}
});
};
//check if pad is requested via readOnly
if (auth.padID.indexOf("r.") === 0) {
//Pad is readOnly, first get the real Pad ID
readOnlyManager.getPadId(auth.padID, function(err, value) {
ERR(err);
securityManager.checkAccess(value, auth.sessionID, auth.token, auth.password, checkAccessCallback);
});
} else {
securityManager.checkAccess(auth.padID, auth.sessionID, auth.token, auth.password, checkAccessCallback);
}
}
},
finalHandler