mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update server.js

Browse Source
This commit is contained in:
Robert Richter 2019-02-01 21:20:56 +01:00
parent 31abdd7dfd
commit a56e6d4798
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server.js
View File

@ -7,13 +7,9 @@ var async = require('async');
var path = require('path'); var path = require('path');
var favicon = require('serve-favicon'); var favicon = require('serve-favicon');
var bodyParser = require('body-parser'); var bodyParser = require('body-parser');
var cookieParser = require('cookie-parser'); // kann gelöscht werden -> var cookieParser = require('cookie-parser');
var session = require('express-session');
var SQLiteStore = require('connect-sqlite3')(session);
var bcrypt = require('bcrypt'); var bcrypt = require('bcrypt');
var passport = require('passport'); var passport = require('passport');
// TODO: gegen SQLITE ersetzen
var LocalStrategy = require('passport-local').Strategy;
// Express-Einstellungen // Express-Einstellungen
app.set('views', path.join(__dirname, 'views')); app.set('views', path.join(__dirname, 'views'));
@ -24,33 +20,20 @@ app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ app.use(bodyParser.urlencoded({
extended: false extended: false
})); }));
// TODO: secret pruefen und ggf. aus app_cfg laden // kann gelöscht werden -> app.use(cookieParser('secret'));
app.use(cookieParser('secret'));
app.use(session({
store: new SQLiteStore,
secret: 'secret',
resave: false,
saveUninitialized: true,
cookie: { maxAge: 60 * 60 * 1000 } // 1 hour
}));
app.use(passport.initialize());
app.use(passport.session());
// Scripte einbinden // Scripte einbinden
var app_cfg = require('./server/app_cfg.js'); var app_cfg = require('./server/app_cfg.js');
var sql_cfg = require('./server/sql_cfg')(bcrypt, app_cfg); var sql_cfg = require('./server/sql_cfg')(bcrypt, app_cfg);
var sql = require('./server/sql_qry')(sql_cfg) var sql = require('./server/sql_qry')(sql_cfg)
var waip_io = require('./server/waip_io')(io, sql, async, app_cfg); var waip_io = require('./server/waip_io')(io, sql, async, app_cfg);
var udp = require('./server/udp')(app_cfg, waip_io); var udp = require('./server/udp')(app_cfg, waip_io, sql);
var auth = require('./server/auth')(app_cfg, sql_cfg, bcrypt, passport, LocalStrategy); var auth = require('./server/auth')(app, app_cfg, sql_cfg, bcrypt, passport);
var routes = require('./server/routing')(app, sql, app_cfg, passport); var routes = require('./server/routing')(app, sql, app_cfg, passport, auth);
// Server starten // Server starten
server.listen(app_cfg.global.webport, function() { server.listen(app_cfg.global.webport, function() {
console.log('Wachalarm-IP-Webserver auf Port ' + app_cfg.global.webport + ' gestartet'); sql.db_log('Anwendung' ,'Wachalarm-IP-Webserver auf Port ' + app_cfg.global.webport + ' gestartet');
}); });
// TODO: auf HTTPS mit TLS1.2 umstellen, inkl. WSS // TODO: auf HTTPS mit TLS1.2 umstellen, inkl. WSS