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 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

updated to use settings

Browse source 
updated handler/SocketIORouter.js to use new setting
updated hooks/express.js to use new setting
updated utils/Settings.js to accept new setting
updated settings.json.template so new setting is present
This commit is contained in:
Spruce (Felix Fichte) 2013-04-24 12:19:41 +02:00
parent 6ea5efbcc3
commit fb0bc31056
4 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
settings.json.template
View file

@ -79,6 +79,9 @@
/* Require authorization by a module, or a user with is_admin set, see below. */ /* Require authorization by a module, or a user with is_admin set, see below. */
"requireAuthorization": false, "requireAuthorization": false,
/*when you use NginX or another proxy/ load-balancer set this to true*/
"trustProxy": false,
/* Users for basic authentication. is_admin = true gives access to /admin. /* Users for basic authentication. is_admin = true gives access to /admin.
If you do not uncomment this, /admin will not be available! */ If you do not uncomment this, /admin will not be available! */
/* /*

7
src/node/handler/SocketIORouter.js
View file

@ -23,6 +23,7 @@ var ERR = require("async-stacktrace");
var log4js = require('log4js'); var log4js = require('log4js');
var messageLogger = log4js.getLogger("message"); var messageLogger = log4js.getLogger("message");
var securityManager = require("../db/SecurityManager"); var securityManager = require("../db/SecurityManager");
var settings = require('../utils/Settings');
/** /**
* Saves all components * Saves all components
@ -55,11 +56,11 @@ exports.setSocketIO = function(_socket)
socket.sockets.on('connection', function(client) socket.sockets.on('connection', function(client)
{ {
if(client.handshake.headers['x-forwarded-for'] === undefined){ if(settings.trustProxy && client.handshake.headers['x-forwarded-for'] !== undefined){
client.set('remoteAddress', client.handshake.address.address); client.set('remoteAddress', client.handshake.headers['x-forwarded-for']);
} }
else{ else{
client.set('remoteAddress', client.handshake.headers['x-forwarded-for']); client.set('remoteAddress', client.handshake.address.address);
} }
var clientAuthorized = false; var clientAuthorized = false;

4
src/node/hooks/express.js
View file

@ -75,6 +75,10 @@ exports.restartServer = function () {
next(); next();
}); });
if(settings.trustProxy){
app.enable('trust proxy');
}
app.configure(function() { app.configure(function() {
hooks.callAll("expressConfigure", {"app": app}); hooks.callAll("expressConfigure", {"app": app});
}); });

5
src/node/utils/Settings.js
View file

@ -119,6 +119,11 @@ exports.logconfig = { appenders: [{ type: "console" }]};
*/ */
exports.sessionKey = false; exports.sessionKey = false;
/*
* Trust Proxy, whether or not trust the x-forwarded-for header.
*/
exports.trustProxy = false;
/* This setting is used if you need authentication and/or /* This setting is used if you need authentication and/or
* authorization. Note: /admin always requires authentication, and * authorization. Note: /admin always requires authentication, and
* either authorization by a module, or a user with is_admin set */ * either authorization by a module, or a user with is_admin set */