Skip to content

Commit 9aaa89e

Browse files
committed
update for express-session, path/fs deprecations and incorrect loading of cookie
1 parent 1d6aab4 commit 9aaa89e

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

server.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var express = require('express'),
2+
session = require('express-session'),
23
tty = require('tty.js'),
34
app = express(),
45
util = require('util'),
@@ -22,7 +23,7 @@ var express = require('express'),
2223
exec_helper = require('./helpers/exec_helper'),
2324
request_helper = require('./helpers/request_helper'),
2425
debug_helper = require('./helpers/python/debug_helper'),
25-
RedisStore = require('connect-redis')(express),
26+
RedisStore = require('connect-redis')(session),
2627
redis = require("redis"),
2728
client = redis.createClient(),
2829
config = require('./config/config'),
@@ -39,7 +40,7 @@ winston.info("REPOSITORY_PATH", REPOSITORY_PATH);
3940

4041
//check for the existence of the logs directory, if it doesn't
4142
//exist, create it prior to starting the child process.
42-
var exists = path.existsSync(__dirname + '/logs');
43+
var exists = fs.existsSync(__dirname + '/logs');
4344
if (!exists) {
4445
fs.mkdirSync(__dirname + '/logs', 0755);
4546
winston.info('created logs folder');
@@ -138,10 +139,12 @@ app.use(express.logger());
138139
app.use(express.static(__dirname + '/public'));
139140
app.use(express.static(__dirname + '/node_modules/tty.js/static'));
140141
app.use(express.cookieParser());
141-
app.use(express.session({
142+
app.use(session({
142143
store: sessionStore,
143144
key: 'sid',
144-
secret: 'cat nap'
145+
secret: 'cat nap',
146+
resave: true,
147+
saveUninitialized: true
145148
}));
146149
app.use(express.bodyParser());
147150
app.use(express.methodOverride());
@@ -321,18 +324,18 @@ function setHostName(req) {
321324
function serverInitialization(app) {
322325

323326
//setup repositories path
324-
var exists = path.existsSync(REPOSITORY_PATH);
327+
var exists = fs.existsSync(REPOSITORY_PATH);
325328
if (!exists) {
326329
fs.mkdirSync(REPOSITORY_PATH, 0777);
327330
winston.info('created repositories folder');
328331
}
329332

330333
//setup symlink to webide home, if it exists:
331-
var has_webide_path = path.existsSync("/home/webide");
334+
var has_webide_path = fs.existsSync("/home/webide");
332335
if (has_webide_path) {
333336
//Creating symbolic link to repositories path
334337
winston.info('Linked repository paths: /home/webide/repositories');
335-
if (!path.existsSync("/home/webide/repositories")) {
338+
if (!fs.existsSync("/home/webide/repositories")) {
336339
fs.symlinkSync(REPOSITORY_PATH, "/home/webide/repositories", 'dir');
337340
}
338341
}
@@ -381,7 +384,7 @@ function start_server(cb) {
381384
function socket_listeners() {
382385
io.sockets.authorization(function(handshakeData, callback) {
383386
if (!handshakeData.headers.cookie) return callback('socket.io: cookie not found.', false);
384-
var signedCookies = require('express/node_modules/cookie').parse(handshakeData.headers.cookie);
387+
var signedCookies = require('cookie').parse(handshakeData.headers.cookie);
385388
handshakeData.cookies = require('connect/lib/utils').parseSignedCookies(signedCookies, 'cat nap');
386389

387390
sessionStore.get(handshakeData.cookies['sid'], function(err, session) {

0 commit comments

Comments
 (0)