Merge pull request #238 from cubedro/develop

Added banned ip
This commit is contained in:
Marian OANCΞA 2015-07-31 00:13:38 +03:00
commit c95b35b4df
3 changed files with 11 additions and 4 deletions

4
app.js
View File

@ -4,7 +4,7 @@ var chalk = require('chalk');
var http = require('http'); var http = require('http');
var WS_SECRET = process.env.WS_SECRET || "eth-net-stats-has-a-secret"; var WS_SECRET = process.env.WS_SECRET || "eth-net-stats-has-a-secret";
var banned = require('./lib/utils/config').banned;
// Init http server // Init http server
if( process.env.NODE_ENV !== 'production' ) if( process.env.NODE_ENV !== 'production' )
@ -81,7 +81,7 @@ api.on('connection', function (spark)
{ {
console.info('API', 'CON', 'Hello', data['id']); console.info('API', 'CON', 'Hello', data['id']);
if( _.isUndefined(data.secret) || data.secret !== WS_SECRET ) if( _.isUndefined(data.secret) || data.secret !== WS_SECRET || banned.indexOf(spark.address.ip) >= 0 )
{ {
spark.end(undefined, { reconnect: false }); spark.end(undefined, { reconnect: false });
console.error('API', 'CON', 'Closed - wrong auth', data); console.error('API', 'CON', 'Closed - wrong auth', data);

View File

@ -1,6 +1,6 @@
var geoip = require('geoip-lite'); var geoip = require('geoip-lite');
var _ = require('lodash'); var _ = require('lodash');
var trusted = require('./utils/config'); var trusted = require('./utils/config').trusted;
var MAX_HISTORY = 40; var MAX_HISTORY = 40;
var MAX_INACTIVE_TIME = 1000*60*60*4; var MAX_INACTIVE_TIME = 1000*60*60*4;

View File

@ -18,4 +18,11 @@ var trusted = [
'::ffff:127.0.0.1', '::ffff:127.0.0.1',
]; ];
module.exports = trusted; var banned = [
'198.48.150.206'
];
module.exports = {
trusted: trusted,
banned: banned
};