Skip to content
This repository has been archived by the owner on Nov 26, 2019. It is now read-only.

fix for etherpad 1.5.7 #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix for etherpad 1.5.7 #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions ep_sotauth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ var settings = require('ep_etherpad-lite/node/utils/Settings');
var exp = require('ep_etherpad-lite/node_modules/express');
var authorManager = require("ep_etherpad-lite/node/db/AuthorManager");

/* sotauthUsername is set by authenticate and used in messageHandler, keyed on express_sid */
var sotauthUsername = {};


function sotauthSetUsername(token, username) {
Expand Down Expand Up @@ -38,7 +36,6 @@ exports.authenticate = function(hook_name, context, cb) {
settings.users[username].username = username;
settings.globalUserName = username;
console.debug('ep_sotauth.authenticate: deferring setting of username [%s] to CLIENT_READY for express_sid = %s', username, express_sid);
sotauthUsername[express_sid] = username;
return cb([true]);
} else {
console.debug('ep_sotauth.authenticate: have no x-forwarded-user for express_sid = %s', express_sid);
Expand All @@ -53,10 +50,7 @@ exports.handleMessage = function(hook_name, context, cb) {
if(!context.message.token) {
console.debug('ep_sotauth.handleMessage: intercepted CLIENT_READY message has no token!');
} else {
var client_id = context.client.id;
var express_sid = context.client.manager.handshaken[client_id].sessionID;
console.debug('ep_sotauth.handleMessage: intercepted CLIENT_READY message for client_id = %s express_sid = %s, setting username for token %s to %s', client_id, express_sid, context.message.token, sotauthUsername);
sotauthSetUsername(context.message.token, sotauthUsername[express_sid]);
sotauthSetUsername(context.message.token, context.client.handshake.headers['x-forwarded-user']);
}
} else if( context.message.type == "COLLABROOM" && context.message.data.type == "USERINFO_UPDATE" ) {
console.debug('ep_sotauth.handleMessage: intercepted USERINFO_UPDATE and dropping it!');
Expand Down