Remove authbox and add banned IP list.
This commit is contained in:
		@@ -1,10 +1,10 @@
 | 
				
			|||||||
var express = require('express')
 | 
					var express = require('express')
 | 
				
			||||||
  , app = express()
 | 
					  , app = express()
 | 
				
			||||||
  , _ = require('underscore')
 | 
					  , _ = require('underscore')
 | 
				
			||||||
  , authbox = require('authbox')
 | 
					 | 
				
			||||||
  , crypto = require('crypto')
 | 
					  , crypto = require('crypto')
 | 
				
			||||||
  , exec = require('child_process').exec
 | 
					  , exec = require('child_process').exec
 | 
				
			||||||
  , fs = require('fs')
 | 
					  , fs = require('fs')
 | 
				
			||||||
 | 
					  , path = require('path')
 | 
				
			||||||
  , mixpanel = require('mixpanel')
 | 
					  , mixpanel = require('mixpanel')
 | 
				
			||||||
  , redis = require('redis-url').connect()
 | 
					  , redis = require('redis-url').connect()
 | 
				
			||||||
  , spawn = require('child_process').spawn
 | 
					  , spawn = require('child_process').spawn
 | 
				
			||||||
@@ -36,9 +36,23 @@ try {
 | 
				
			|||||||
  banned_numbers = {BLACKLIST: {}};
 | 
					  banned_numbers = {BLACKLIST: {}};
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					var banned_ips = {};
 | 
				
			||||||
 | 
					try {
 | 
				
			||||||
 | 
					  var banned_list = fs.readFileSync(path.join(__dirname, './torlist')).toString('utf-8').split('\n');
 | 
				
			||||||
 | 
					  banned_list.map(function(ip) {
 | 
				
			||||||
 | 
					    ip = ip.trim();
 | 
				
			||||||
 | 
					    if (ip != '') {
 | 
				
			||||||
 | 
					      banned_ips[ip] = true;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  });
 | 
				
			||||||
 | 
					  console.log(banned_list.length, 'banned ips loaded');
 | 
				
			||||||
 | 
					} catch(e) {
 | 
				
			||||||
 | 
					  console.log(e);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var mpq
 | 
					var mpq
 | 
				
			||||||
  , mixpanel_config
 | 
					  , mixpanel_config;
 | 
				
			||||||
  , authbox_config;
 | 
					 | 
				
			||||||
try {
 | 
					try {
 | 
				
			||||||
  mixpanel_config = require('./mixpanel_config.js');
 | 
					  mixpanel_config = require('./mixpanel_config.js');
 | 
				
			||||||
  mpq = new mixpanel.Client(mixpanel_config.api_key);
 | 
					  mpq = new mixpanel.Client(mixpanel_config.api_key);
 | 
				
			||||||
@@ -46,14 +60,6 @@ try {
 | 
				
			|||||||
  mpq = {track: function() {}};
 | 
					  mpq = {track: function() {}};
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
try {
 | 
					 | 
				
			||||||
  authbox_config = require('./authbox_config.js');
 | 
					 | 
				
			||||||
  authbox.configure(authbox_config);
 | 
					 | 
				
			||||||
  app.use(authbox.middleware);
 | 
					 | 
				
			||||||
} catch(e) {
 | 
					 | 
				
			||||||
  authbox = {log: function() {}};
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
var access_keys;
 | 
					var access_keys;
 | 
				
			||||||
try {
 | 
					try {
 | 
				
			||||||
  // Optionally, you may specify special access keys in a keys.json file.
 | 
					  // Optionally, you may specify special access keys in a keys.json file.
 | 
				
			||||||
@@ -104,14 +110,8 @@ function textRequestHandler(req, res, number, region, key) {
 | 
				
			|||||||
    ip = req.header('CF-Connecting-IP');
 | 
					    ip = req.header('CF-Connecting-IP');
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  var authbox_details = {
 | 
					 | 
				
			||||||
    $actionName: 'text',
 | 
					 | 
				
			||||||
    $ipAddress: ip
 | 
					 | 
				
			||||||
  };
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  if (!number || !req.body.message) {
 | 
					  if (!number || !req.body.message) {
 | 
				
			||||||
    mpq.track('incomplete request', {ip: ip, ip2: ip});
 | 
					    mpq.track('incomplete request', {ip: ip, ip2: ip});
 | 
				
			||||||
    authbox.log(req, _.extend(authbox_details, {$failureReason: 'incomplete_request'}));
 | 
					 | 
				
			||||||
    res.send({success:false, message:'Number and message parameters are required.'});
 | 
					    res.send({success:false, message:'Number and message parameters are required.'});
 | 
				
			||||||
    return;
 | 
					    return;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
@@ -122,14 +122,16 @@ function textRequestHandler(req, res, number, region, key) {
 | 
				
			|||||||
    // contains a colon.
 | 
					    // contains a colon.
 | 
				
			||||||
    message = ' ' + message;
 | 
					    message = ' ' + message;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					  if (ip in banned_ips) {
 | 
				
			||||||
 | 
					    // Shadowban tor ips
 | 
				
			||||||
 | 
					    setTimeout(function() {
 | 
				
			||||||
 | 
					      res.send({success:false});
 | 
				
			||||||
 | 
					    }, 1000);
 | 
				
			||||||
 | 
					    return;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  var shasum = crypto.createHash('sha1');
 | 
					  var shasum = crypto.createHash('sha1');
 | 
				
			||||||
  shasum.update(number);
 | 
					  shasum.update(number);
 | 
				
			||||||
  var authbox_digest = shasum.digest('hex');
 | 
					 | 
				
			||||||
  _.extend(authbox_details, {
 | 
					 | 
				
			||||||
    recipient: authbox_digest,
 | 
					 | 
				
			||||||
    message__text: message
 | 
					 | 
				
			||||||
  });
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  var tracking_details = {
 | 
					  var tracking_details = {
 | 
				
			||||||
    number: number,
 | 
					    number: number,
 | 
				
			||||||
@@ -140,7 +142,6 @@ function textRequestHandler(req, res, number, region, key) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  if (banned_numbers.BLACKLIST[number]) {
 | 
					  if (banned_numbers.BLACKLIST[number]) {
 | 
				
			||||||
    mpq.track('banned number', tracking_details);
 | 
					    mpq.track('banned number', tracking_details);
 | 
				
			||||||
    authbox.log(req, _.extend(authbox_details, {$failureReason: 'banned_number'}));
 | 
					 | 
				
			||||||
    res.send({success:false,message:'Sorry, texts to this number are disabled.'});
 | 
					    res.send({success:false,message:'Sorry, texts to this number are disabled.'});
 | 
				
			||||||
    return;
 | 
					    return;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
@@ -152,7 +153,6 @@ function textRequestHandler(req, res, number, region, key) {
 | 
				
			|||||||
    text.send(number, message, region, function(err) {
 | 
					    text.send(number, message, region, function(err) {
 | 
				
			||||||
      if (err) {
 | 
					      if (err) {
 | 
				
			||||||
        mpq.track('sendText failed', tracking_details);
 | 
					        mpq.track('sendText failed', tracking_details);
 | 
				
			||||||
        authbox.log(req, _.extend(authbox_details, {$failureReason: 'gateway_failed'}));
 | 
					 | 
				
			||||||
        res.send(_.extend(response_obj,
 | 
					        res.send(_.extend(response_obj,
 | 
				
			||||||
                          {
 | 
					                          {
 | 
				
			||||||
                            success:false,
 | 
					                            success:false,
 | 
				
			||||||
@@ -161,7 +161,6 @@ function textRequestHandler(req, res, number, region, key) {
 | 
				
			|||||||
      }
 | 
					      }
 | 
				
			||||||
      else {
 | 
					      else {
 | 
				
			||||||
        mpq.track('sendText success', tracking_details);
 | 
					        mpq.track('sendText success', tracking_details);
 | 
				
			||||||
        authbox.log(req, _.extend(authbox_details, {$success: true}));
 | 
					 | 
				
			||||||
        res.send(_.extend(response_obj, {success:true}));
 | 
					        res.send(_.extend(response_obj, {success:true}));
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
@@ -199,7 +198,6 @@ function textRequestHandler(req, res, number, region, key) {
 | 
				
			|||||||
    }, 1000*60*3);
 | 
					    }, 1000*60*3);
 | 
				
			||||||
    if (num > 3) {
 | 
					    if (num > 3) {
 | 
				
			||||||
      //mpq.track('exceeded phone quota', tracking_details);
 | 
					      //mpq.track('exceeded phone quota', tracking_details);
 | 
				
			||||||
      //authbox.log(req, _.extend(authbox_details, {$failureReason: 'exceeded_phone_quota'}));
 | 
					 | 
				
			||||||
      res.send({success:false, message:'Exceeded quota for this phone number. ' + number});
 | 
					      res.send({success:false, message:'Exceeded quota for this phone number. ' + number});
 | 
				
			||||||
      return;
 | 
					      return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@@ -213,7 +211,6 @@ function textRequestHandler(req, res, number, region, key) {
 | 
				
			|||||||
      }
 | 
					      }
 | 
				
			||||||
      if (num > 75) {
 | 
					      if (num > 75) {
 | 
				
			||||||
        mpq.track('exceeded ip quota', tracking_details);
 | 
					        mpq.track('exceeded ip quota', tracking_details);
 | 
				
			||||||
        authbox.log(req, _.extend(authbox_details, {$failureReason: 'exceeded_ip_quota'}));
 | 
					 | 
				
			||||||
        res.send({success:false, message:'Exceeded quota for this IP address. ' + ip});
 | 
					        res.send({success:false, message:'Exceeded quota for this IP address. ' + ip});
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user