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

update Di 26. Mai 15:31:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-05-26 15:31:01 +02:00
parent a50a44b67a
commit 0a47010425
2 changed files with 161 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
server/api.js
View File

@ -4,6 +4,45 @@ module.exports = function (io, io_api, sql, app_cfg, waip) {
const io_api = require('socket.io-client'); const io_api = require('socket.io-client');
// Socket.IO API
if (app_cfg.api.enabled) {
var nsp_api = io.of('/api');
nsp_api.on('connection', function (socket) {
// versuche Remote-IP zu ermitteln
var remote_ip = socket.handshake.headers["x-real-ip"] || socket.handshake.headers['x-forwarded-for'] || socket.request.connection.remoteAddress;
//TODO pruefen ob Verbindung mit passendem Geheimnis und aus IP-Bereich
//secret: 'asdfwert1234567890#',
//access_list: ['192.168.2.20', '192.168.2.30']
// in Liste der Clients mit aufnehmen
sql.db_update_client_status(socket, 'api');
// Neuen Einsatz speichern
socket.on('new_waip', function (data) {
sql.db_log('API', 'Neuer Einsatz von ' + remote_ip + ': ' + data);
waip.einsatz_speichern(data);
});
socket.on('new_rmld', function (data) {
sql.db_save_rmld(data, function (result) {
if (result) {
waip.rmld_verteilen_by_uuid(data.waip_uuid, data.rmld_uuid);
sql.db_log('API', 'Rückmeldung von ' + remote_ip + ' gespeichert: ' + data);
} else {
sql.db_log('API', 'Fehler beim speichern der Rückmeldung von ' + remote_ip + ': ' + data);
};
});
});
// Disconnect
socket.on('disconnect', function () {
sql.db_log('API', 'Schnittstelle von ' + remote_ip + ' (' + socket.id + ') geschlossen.');
sql.db_client_delete(socket);
});
});
};
// Endpoint-API // Endpoint-API
if (app_cfg.endpoint.enabled) { if (app_cfg.endpoint.enabled) {
const remote_api = io_api.connect(app_cfg.global.remoteapi, { const remote_api = io_api.connect(app_cfg.global.remoteapi, {
@ -70,42 +109,7 @@ if (app_cfg.endpoint.enabled) {
rmld_verteilen_by_uuid: rmld_verteilen_by_uuid rmld_verteilen_by_uuid: rmld_verteilen_by_uuid
}; };
// Socket.IO API
if (app_cfg.api.enabled) {
var nsp_api = io.of('/api');
nsp_api.on('connection', function (socket) {
// versuche Remote-IP zu ermitteln
var remote_ip = socket.handshake.headers["x-real-ip"] || socket.handshake.headers['x-forwarded-for'] || socket.request.connection.remoteAddress;
//FIXME pruefen ob Verbindung mit passendem Secret und aus IP-Bereich
//secret: 'asdfwert1234567890#',
//access_list: ['192.168.2.20', '192.168.2.30']
// in Liste der Clients mit aufnehmen
sql.db_update_client_status(socket, 'api');
// Neuen Einsatz speichern
socket.on('new_waip', function (data) {
sql.db_log('API', 'Neuer Einsatz von ' + remote_ip + ': ' + data);
waip.einsatz_speichern(data);
});
socket.on('new_rmld', function (data) {
sql.db_save_rmld(data, function (result) {
if (result) {
waip.rmld_verteilen_by_uuid(data.waip_uuid, data.rmld_uuid);
sql.db_log('API', 'Rückmeldung von ' + remote_ip + ' gespeichert: ' + data);
} else {
sql.db_log('API', 'Fehler beim speichern der Rückmeldung von ' + remote_ip + ': ' + data);
};
});
});
// Disconnect
socket.on('disconnect', function () {
sql.db_log('API', 'Schnittstelle von ' + remote_ip + ' (' + socket.id + ') geschlossen.');
sql.db_client_delete(socket);
});
});
};
}; };

4
server/routing.js
View File

@ -269,7 +269,6 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
}); });
// laufende Einsaetze anzeigen // laufende Einsaetze anzeigen
// TODO: eventuell unter Dashboard oder Startseite anzeigen
app.get('/adm_show_missions', auth.ensureAdmin, function (req, res) { app.get('/adm_show_missions', auth.ensureAdmin, function (req, res) {
sql.db_get_active_waips(function (data) { sql.db_get_active_waips(function (data) {
res.render('admin/adm_show_missions', { res.render('admin/adm_show_missions', {
@ -393,9 +392,8 @@ module.exports = function(app, sql, uuidv4, app_cfg, passport, auth, waip, udp)
// error handler // error handler
app.use(function (err, req, res, next) { app.use(function (err, req, res, next) {
// set locals, only providing error in development // set locals, only providing error in development
// TODO: Development Modus abfangen
res.locals.message = err.message; res.locals.message = err.message;
res.locals.error = req.app.get('env') === 'development' ? err : {}; res.locals.error = app_cfg.global.development ? err : {};
// render the error page // render the error page
res.status(err.status || 500); res.status(err.status || 500);
res.render('error', { res.render('error', {