libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 22:23:33 +01:00
Code Issues Projects Releases Wiki Activity

Refuse connection if the user is no longer authorized

Browse source 
This should do the trick for issue 815. Please review and merge if
it works.

Try again: Fewer variables.
This commit is contained in:
Mark Holmquist 2012-06-26 15:28:18 -07:00
parent e4ff4021ab
commit 79ca5f3e7c
1 changed files with 55 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -168,31 +168,63 @@ exports.handleMessage = function(client, message)
messageLogger.warn("Message has no type attribute!"); messageLogger.warn("Message has no type attribute!");
return; return;
} }
//Check what type of message we get and delegate to the other methodes var finalHandler = function () {
if(message.type == "CLIENT_READY") { //Check what type of message we get and delegate to the other methodes
handleClientReady(client, message); if(message.type == "CLIENT_READY") {
} else if(message.type == "CHANGESET_REQ") { handleClientReady(client, message);
handleChangesetRequest(client, message); } else if(message.type == "CHANGESET_REQ") {
} else if(message.type == "COLLABROOM") { handleChangesetRequest(client, message);
if (sessioninfos[client.id].readonly) { } else if(message.type == "COLLABROOM") {
messageLogger.warn("Dropped message, COLLABROOM for readonly pad"); if (sessioninfos[client.id].readonly) {
} else if (message.data.type == "USER_CHANGES") { messageLogger.warn("Dropped message, COLLABROOM for readonly pad");
handleUserChanges(client, message); } else if (message.data.type == "USER_CHANGES") {
} else if (message.data.type == "USERINFO_UPDATE") { handleUserChanges(client, message);
handleUserInfoUpdate(client, message); } else if (message.data.type == "USERINFO_UPDATE") {
} else if (message.data.type == "CHAT_MESSAGE") { handleUserInfoUpdate(client, message);
handleChatMessage(client, message); } else if (message.data.type == "CHAT_MESSAGE") {
} else if (message.data.type == "SAVE_REVISION") { handleChatMessage(client, message);
handleSaveRevisionMessage(client, message); } else if (message.data.type == "SAVE_REVISION") {
} else if (message.data.type == "CLIENT_MESSAGE" && handleSaveRevisionMessage(client, message);
message.data.payload.type == "suggestUserName") { } else if (message.data.type == "CLIENT_MESSAGE" &&
handleSuggestUserName(client, message); message.data.payload.type == "suggestUserName") {
handleSuggestUserName(client, message);
} else {
messageLogger.warn("Dropped message, unknown COLLABROOM Data Type " + message.data.type);
}
} else { } else {
messageLogger.warn("Dropped message, unknown COLLABROOM Data Type " + message.data.type); messageLogger.warn("Dropped message, unknown Message Type " + message.type);
} }
} else { };
messageLogger.warn("Dropped message, unknown Message Type " + message.type);
if (message && message.padId) {
async.series([
//check permissions
function(callback)
{
// Note: message.sessionID is an entirely different kind of
// session from the sessions we use here! Beware! FIXME: Call
// our "sessions" "connections".
// FIXME: Use a hook instead
// FIXME: Allow to override readwrite access with readonly
securityManager.checkAccess(message.padId, message.sessionID, message.token, message.password, function(err, statusObject)
{
if(ERR(err, callback)) return;
//access was granted
if(statusObject.accessStatus == "grant")
{
callback();
}
//no access, send the client a message that tell him why
else
{
client.json.send({accessStatus: statusObject.accessStatus})
}
});
},
finalHandler
]);
} }
} }