yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 02:29:26 +02:00
Code Issues Releases Wiki Activity

Update to express 4.

Browse source
This commit is contained in:
Simo Kinnunen 2014-06-03 16:33:00 +09:00
parent 4d4cf58dee
commit 9bb066f0c6
4 changed files with 52 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

48
lib/roles/app.js
View file

@ -5,6 +5,11 @@ var util = require('util')
var express = require('express') var express = require('express')
var validator = require('express-validator') var validator = require('express-validator')
var cookieSession = require('cookie-session')
var bodyParser = require('body-parser')
var serveFavicon = require('serve-favicon')
var serveStatic = require('serve-static')
var csrf = require('csurf')
var socketio = require('socket.io') var socketio = require('socket.io')
var zmq = require('zmq') var zmq = require('zmq')
var Promise = require('bluebird') var Promise = require('bluebird')
@ -55,27 +60,27 @@ module.exports = function(options) {
} }
app.use('/static/bower_components', app.use('/static/bower_components',
express.static(pathutil.resource('bower_components'))) serveStatic(pathutil.resource('bower_components')))
app.use('/intro', app.use('/intro',
express.static(pathutil.resource('bower_components/stf-site/intro'))) serveStatic(pathutil.resource('bower_components/stf-site/intro')))
app.use('/manual-basic', app.use('/manual-basic',
express.static(pathutil.resource('bower_components/stf-site/manual/basic'))) serveStatic(pathutil.resource('bower_components/stf-site/manual/basic')))
app.use('/manual-advanced', app.use('/manual-advanced',
express.static(pathutil.resource('bower_components/stf-site/manual/advanced'))) serveStatic(pathutil.resource('bower_components/stf-site/manual/advanced')))
app.use('/v2-features', app.use('/v2-features',
express.static(pathutil.resource('bower_components/stf-site/v2-features'))) serveStatic(pathutil.resource('bower_components/stf-site/v2-features')))
app.use('/static/data', express.static(pathutil.resource('data'))) app.use('/static/data', serveStatic(pathutil.resource('data')))
app.use('/static/build', express.static(pathutil.resource('build'))) app.use('/static/build', serveStatic(pathutil.resource('build')))
app.use('/static/browsers', browserIconMiddleware()) app.use('/static/browsers', browserIconMiddleware())
app.use('/static/devices', deviceIconMiddleware()) app.use('/static/devices', deviceIconMiddleware())
app.use('/static', express.static(pathutil.resource('app'))) app.use('/static', serveStatic(pathutil.resource('app')))
app.use(express.favicon(pathutil.resource( app.use(serveFavicon(pathutil.resource(
'bower_components/stf-graphics/logo/exports/STF-128.png'))) 'bower_components/stf-graphics/logo/exports/STF-128.png')))
app.use(express.cookieParser(options.secret)) app.use(cookieSession({
app.use(express.cookieSession({ name: options.ssid
key: options.ssid , keys: [options.secret]
})) }))
app.use(auth({ app.use(auth({
secret: options.secret secret: options.secret
@ -103,9 +108,8 @@ module.exports = function(options) {
}) })
}) })
app.use(express.json()) app.use(bodyParser.json())
app.use(express.urlencoded()) app.use(csrf())
app.use(express.csrf())
app.use(validator()) app.use(validator())
// Output // Output
@ -227,13 +231,17 @@ module.exports = function(options) {
}) })
io.set('authorization', (function() { io.set('authorization', (function() {
var parse = Promise.promisify(express.cookieParser(options.secret)) var session = Promise.promisify(cookieSession({
name: options.ssid
, keys: [options.secret]
}))
return function(handshake, accept) { return function(handshake, accept) {
parse(handshake, {}) var res = Object.create(null)
session(handshake, res)
.then(function() { .then(function() {
if (handshake.signedCookies[options.ssid]) { var token = handshake.session.jwt
handshake.session = handshake.signedCookies[options.ssid] if (token) {
return dbapi.loadUser(handshake.session.jwt.email) return dbapi.loadUser(token.email)
.then(function(user) { .then(function(user) {
if (user) { if (user) {
handshake.user = user handshake.user = user

20
lib/roles/auth/ldap.js
View file

@ -2,6 +2,10 @@ var http = require('http')
var express = require('express') var express = require('express')
var validator = require('express-validator') var validator = require('express-validator')
var cookieSession = require('cookie-session')
var bodyParser = require('body-parser')
var serveStatic = require('serve-static')
var csrf = require('csurf')
var Promise = require('bluebird') var Promise = require('bluebird')
var logger = require('../../util/logger') var logger = require('../../util/logger')
@ -30,18 +34,16 @@ module.exports = function(options) {
app.set('strict routing', true) app.set('strict routing', true)
app.set('case sensitive routing', true) app.set('case sensitive routing', true)
app.use(express.cookieParser()) app.use(cookieSession({
app.use(express.cookieSession({ name: options.ssid
secret: options.secret , keys: [options.secret]
, key: options.ssid
})) }))
app.use(express.json()) app.use(bodyParser.json())
app.use(express.urlencoded()) app.use(csrf())
app.use(express.csrf())
app.use(validator()) app.use(validator())
app.use('/static/bower_components', app.use('/static/bower_components',
express.static(pathutil.resource('bower_components'))) serveStatic(pathutil.resource('bower_components')))
app.use('/static', express.static(pathutil.resource('auth-ldap'))) app.use('/static', serveStatic(pathutil.resource('auth-ldap')))
app.use(function(req, res, next) { app.use(function(req, res, next) {
res.cookie('XSRF-TOKEN', req.csrfToken()); res.cookie('XSRF-TOKEN', req.csrfToken());

20
lib/roles/auth/mock.js
View file

@ -2,6 +2,10 @@ var http = require('http')
var express = require('express') var express = require('express')
var validator = require('express-validator') var validator = require('express-validator')
var cookieSession = require('cookie-session')
var bodyParser = require('body-parser')
var serveStatic = require('serve-static')
var csrf = require('csurf')
var Promise = require('bluebird') var Promise = require('bluebird')
var logger = require('../../util/logger') var logger = require('../../util/logger')
@ -29,18 +33,16 @@ module.exports = function(options) {
app.set('strict routing', true) app.set('strict routing', true)
app.set('case sensitive routing', true) app.set('case sensitive routing', true)
app.use(express.cookieParser()) app.use(cookieSession({
app.use(express.cookieSession({ name: options.ssid
secret: options.secret , keys: [options.secret]
, key: options.ssid
})) }))
app.use(express.json()) app.use(bodyParser.json())
app.use(express.urlencoded()) app.use(csrf())
app.use(express.csrf())
app.use(validator()) app.use(validator())
app.use('/static/bower_components', app.use('/static/bower_components',
express.static(pathutil.resource('bower_components'))) serveStatic(pathutil.resource('bower_components')))
app.use('/static', express.static(pathutil.resource('auth-mock'))) app.use('/static', serveStatic(pathutil.resource('auth-mock')))
app.use(function(req, res, next) { app.use(function(req, res, next) {
res.cookie('XSRF-TOKEN', req.csrfToken()); res.cookie('XSRF-TOKEN', req.csrfToken());

3
lib/roles/storage/temp.js
View file

@ -4,6 +4,7 @@ var path = require('path')
var express = require('express') var express = require('express')
var validator = require('express-validator') var validator = require('express-validator')
var bodyParser = require('body-parser')
var formidable = require('formidable') var formidable = require('formidable')
var Promise = require('bluebird') var Promise = require('bluebird')
@ -22,7 +23,7 @@ module.exports = function(options) {
app.set('case sensitive routing', true) app.set('case sensitive routing', true)
app.set('trust proxy', true) app.set('trust proxy', true)
app.use(express.json()) app.use(bodyParser.json())
app.use(validator()) app.use(validator())
storage.on('timeout', function(id) { storage.on('timeout', function(id) {