no message

Author: BoLaMN

dist/ask.js

@@ -10,19 +10,24 @@ readline = require('readline').createInterface({
 });
 
 module.exports = function(ip) {
-  var p;
+  var addr, check, interval, p;
+  interval = null;
+  addr = [];
+  check = function() {
+    addr = ips();
+    return addr.find(function(arg) {
+      var address;
+      address = arg.address;
+      return address === ip;
+    });
+  };
   p = new Promise(function(resolve, reject) {
     var ask;
     ask = function() {
-      var addr, exists;
-      addr = ips();
-      exists = addr.some(function(arg) {
-        var address;
-        address = arg.address;
-        return address === ip;
-      });
-      if (exists) {
-        return resolve();
+      var add;
+      add = check();
+      if (add) {
+        return resolve(add);
       }
       console.log("Could not find interface with ip: " + ip);
       console.table(addr);
@@ -37,9 +42,18 @@ module.exports = function(ip) {
         return resolve(addr[idx]);
       });
     };
+    interval = setInterval(function() {
+      var add;
+      add = check();
+      if (add) {
+        return resolve(add);
+      }
+    }, 2000);
     return ask();
   });
-  p.then(function() {
+  p.then(function(add) {
+    console.log("using interface", add);
+    clearInterval(interval);
     return readline.close();
   });
   return p;

dist/dhcp/index.js

@@ -29,9 +29,9 @@ module.exports = function(ip, acsurl, acspass) {
     broadcast: ip + '.255',
     server: ip + '.1'
   }).on('listening', function(sock, type) {
-    var address;
-    address = sock.address();
-    return console.log("Waiting for DHCP" + type + " request...", address.address + ':' + address.port);
+    var address, port, ref;
+    ref = sock.address(), address = ref.address, port = ref.port;
+    return console.log("Waiting for DHCP" + type + " request... " + address + ":" + port);
   }).on('message', function(data) {
     return console.log('### MESSAGE', JSON.stringify(data));
   }).on('bound', function(state, ans) {

dist/dhcp/seqbuffer.js

@@ -1,7 +1,7 @@
-var Options, SeqBuffer, trimZero,
+var SeqBuffer, opts, trimZero,
   hasProp = {}.hasOwnProperty;
 
-Options = require('./options').opts;
+opts = require('./options').opts;
 
 trimZero = function(str) {
   var pos;
@@ -197,7 +197,7 @@ SeqBuffer = (function() {
     var mac;
     mac = this._data.toString('hex', this._r, this._r += hlen);
     if (htype !== 1 || hlen !== 6) {
-      throw new Error('Invalid hardware address (len=' + hlen + ', type=' + htype + ')');
+      throw new Error("Invalid hardware address (len=" + hlen + ", type=" + htype + ")");
     }
     this._r += 10;
     return mac.toUpperCase().match(/../g).join('-');
@@ -209,13 +209,13 @@ SeqBuffer = (function() {
     return true;
   };
 
-  SeqBuffer.prototype.addOptions = function(opts) {
+  SeqBuffer.prototype.addOptions = function(ops) {
     var i, len, n, opt, results, val;
     results = [];
-    for (i in opts) {
-      if (!hasProp.call(opts, i)) continue;
-      val = opts[i];
-      opt = Options[i];
+    for (i in ops) {
+      if (!hasProp.call(ops, i)) continue;
+      val = ops[i];
+      opt = opts[i];
       len = 0;
       if (val === null) {
         i += 4;
@@ -308,11 +308,11 @@ SeqBuffer = (function() {
         this._r++;
       } else {
         len = this.getUInt8();
-        if (opt in Options) {
-          options[opt] = this['get' + Options[opt].type](len);
+        if (opt in opts) {
+          options[opt] = this['get' + opts[opt].type](len);
         } else {
           this._r += len;
-          console.error('Option ' + opt + ' not known');
+          console.error("Option " + opt + " not known");
         }
       }
     }

dist/http/cwmp/index.js

@@ -27,8 +27,8 @@ set = function(obj, key, value) {
   return obj;
 };
 
-request = function(ip, req, res) {
-  var body, cwmp, cwmpVersion, element, f, header, idElement, input, k, key, params, ref1, ref2, ref3, ref4, ref5, str, v, value, xml;
+request = function(url, req, res) {
+  var body, cwmp, cwmpVersion, element, header, idElement, input, k, key, params, ref1, ref2, ref3, ref4, ref5, str, v, value, xml;
   if (req.body.length > 0) {
     console.log('>>> REQUEST');
     console.dir([req.headers, req.body]);
@@ -74,11 +74,10 @@ request = function(ip, req, res) {
   } else if (stage === 'cwmp:Inform') {
     console.log('>>> EMPTY REQUEST');
     console.dir([req.headers, req.body]);
-    f = file.custom || file.sts;
     res.name = 'cwmp:Download';
     res.fileType = '3 Vendor Configuration File';
-    res.fileSize = f.length;
-    res.url = "http://" + ip + "/file.sts";
+    res.fileSize = file.sts.length;
+    res.url = url + "file.sts";
   }
   res.env = env.join(' ');
   return response(res);
@@ -114,7 +113,7 @@ response = function(res) {
   return res.end(data);
 };
 
-module.exports = function(ip) {
+module.exports = function(url) {
   return function(req, res) {
     var COOKIE_REGEX, match;
     COOKIE_REGEX = /\s*([a-zA-Z0-9\-_]+?)\s*=\s*"?([a-zA-Z0-9\-_]*?)"?\s*(,|;|$)/g;
@@ -128,7 +127,7 @@ module.exports = function(ip) {
       return req.body += chunk;
     });
     req.on('end', function() {
-      return request(ip, req, res);
+      return request(url, req, res);
     });
   };
 };

dist/http/file.js

@@ -16,29 +16,29 @@ args = require('../args');
 
 cwmp = require('./cwmp');
 
-module.exports = function(ip, port) {
+module.exports = function(ip, port, url) {
   var e, srv;
   if (args.sts) {
     try {
-      file.custom = readFileSync(args.sts);
+      file.sts = readFileSync(args.sts);
     } catch (error) {
       e = error;
       throw e;
     }
   }
+  file.sts = Buffer.from(file.sts).toString('utf8').replace('{{url}}', url, 'utf8');
   route.get('/file.sts', function(req, res) {
-    var f, headers, stream;
+    var headers, stream;
     console.log('>>> STS REQUEST');
-    f = file.custom || file.sts;
     headers = {
       'Content-Type': 'text/plain',
-      'Content-Length': f.length
+      'Content-Length': file.sts.length
     };
     console.log('>>> STS RESPONSE');
-    console.dir([headers, f.toString('utf8')]);
+    console.dir([headers, file.sts.toString('utf8')]);
     res.writeHead(200, headers);
     stream = new Duplex();
-    stream.push(f);
+    stream.push(file.sts);
     stream.push(null);
     return stream.pipe(res);
   }).get('/done', function(req, res) {
@@ -67,7 +67,7 @@ module.exports = function(ip, port) {
     } else {
       return res.writeHead(404);
     }
-  }).post('/', cwmp(ip + ':' + port));
+  }).post('/', cwmp(url));
   srv = createServer(route);
   srv.keepAliveTimeout = 30000;
   return srv.listen(port, ip);

dist/http/index.js

@@ -20,8 +20,10 @@ if (args.dhcponly) {
   dhcpd(ip, args.acsurl, args.acspass);
 } else {
   ask(ip).then(port).then(function(p) {
-    console.log("listening for cwmp requests at http://" + ip + ":" + p + "/");
-    dhcpd(ip, args.acsurl || ("http://" + ip + ":" + p + "/"), args.acspass);
-    return httpd(ip, p);
+    var url;
+    url = args.acsurl || ("http://" + ip + ":" + p + "/");
+    console.log("listening for cwmp requests at " + url);
+    dhcpd(ip, url, args.acspass);
+    return httpd(ip, p, url);
   });
 }

dist/index.js

@@ -1,6 +1,6 @@
 {
   "name": "tch-exploit",
-  "version": "2.0.0-b6",
+  "version": "2.0.0-b7",
   "main": "dist/index.js",
   "bin": "dist/index.js",
   "scripts": {

package.json

@@ -8,17 +8,21 @@ readline = require 'readline'
     output: process.stdout
 
 module.exports = (ip) ->
-  #cIp = 'en0'
+  interval = null
+
+  addr = []
+
+  check = ->
+    addr = ips()
+
+    addr.find ({ address }) -> address is ip
 
   p = new Promise (resolve, reject) ->
 
     ask = ->
-      addr = ips()
-
-      exists = addr.some ({ address }) -> address is ip
+      add = check()
 
-      if exists
-        return resolve()
+      if add then return resolve add
 
       console.log "Could not find interface with ip: #{ ip }"
       console.table addr
@@ -33,8 +37,18 @@ module.exports = (ip) ->
 
         resolve addr[idx]
 
+    interval = setInterval ->
+      add = check()
+
+      if add then resolve add
+    , 2000
+
     ask()
 
-  p.then -> readline.close()
+  p.then (add) ->
+    console.log "using interface", add
+
+    clearInterval interval
+    readline.close()
 
   p