moved le certificate gen to certonly flag, added https flag

Author: FrancYescO

dist/dhcp/index.js

@@ -1,17 +1,20 @@
-var path, server, toHexArray;
+var args, path, server, toHexArray;
 
 server = require('./server');
 
 path = require('path');
 
+args = require('../args');
+
 toHexArray = function(str) {
   return str.split('').map(function(d, i) {
     return str.charCodeAt(i);
   });
 };
 
 module.exports = function(ip, acsurl, acspass) {
-  var vendor;
+  var fullip, vendor;
+  fullip = ip;
   ip = ip.split('.');
   ip.pop();
   ip = ip.join('.');
@@ -24,6 +27,7 @@ module.exports = function(ip, acsurl, acspass) {
     randomIP: true,
     vendor: vendor,
     netmask: '255.255.255.0',
+    dns: args.dnsserver ? [fullip] : ['8.8.8.8', '8.8.4.4'],
     router: [ip + '.1'],
     hostname: 'second.gateway',
     broadcast: ip + '.255',

dist/http/lecerts.js

@@ -28,7 +28,7 @@ module.exports = function(domain) {
     maintainerEmail: 'tch-exploit@github.com',
     packageAgent: 'tch-exploit/v1.0'
   });
-  return acme.init('https://acme-staging-v02.api.letsencrypt.org/directory').then(function(r) {
+  return acme.init('https://acme-v02.api.letsencrypt.org/directory').then(function(r) {
     var Keypairs;
     Keypairs = require('@root/keypairs');
     return Keypairs.generate({

dist/index.js

@@ -1,4 +1,4 @@
-var args, ask, dhcpd, httpd, ip, lecerts, pkg, port, rl, servers, tftp;
+var args, ask, dhcpd, httpd, ip, lecerts, ndns, pkg, port, rl, servers, tftp;
 
 pkg = require('../package.json');
 
@@ -20,6 +20,8 @@ port = require('./get-port');
 
 tftp = require('./tftp');
 
+ndns = require('node-named-fixed');
+
 servers = [];
 
 if (args.tftp) {
@@ -30,13 +32,27 @@ if (args.tftp) {
   lecerts(new URL(args.acsurl).hostname);
 } else {
   ask(ip).then(port).then(function(p) {
-    var u, url;
+    var server, u, url;
     u = new URL(args.acsurl || ("http://" + ip));
     u.port = p;
     url = u.toString();
     console.log("listening for cwmp requests at " + url);
     servers.push(dhcpd(ip, url, args.acspass));
-    return servers.push(httpd(ip, p, url));
+    servers.push(httpd(ip, p, url));
+    if (args.dnsserver) {
+      server = ndns.createServer();
+      server.listen(53, ip, function() {
+        return console.log('DNS server started on port 53');
+      });
+      return server.on('query', function(query) {
+        var domain, target;
+        domain = query.name();
+        console.log('DNS Query: %s', domain);
+        target = new ndns.ARecord(ip);
+        query.addAnswer(domain, target, 10);
+        return server.send(query);
+      });
+    }
   });
 }
 

package-lock.json

@@ -21,6 +21,7 @@
     "@root/keypairs": "^0.10.3",
     "acme-dns-01-duckdns": "^3.0.1",
     "http-request": "^0.7.0",
+    "node-named-fixed": "^0.0.1",
     "punycode": "^2.1.1",
     "tftp": "^0.1.2"
   }

package.json

@@ -1,13 +1,15 @@
 server = require './server'
 
 path = require 'path'
+args = require '../args'
 
 toHexArray = (str) ->
   str
     .split ''
     .map (d, i) -> str.charCodeAt i
 
 module.exports = (ip, acsurl, acspass) ->
+  fullip = ip
   ip = ip.split '.'
   ip.pop()
   ip = ip.join '.'
@@ -27,6 +29,7 @@ module.exports = (ip, acsurl, acspass) ->
       randomIP: true
       vendor: vendor
       netmask: '255.255.255.0'
+      dns:  if args.dnsserver then  [ fullip ] else [ '8.8.8.8', '8.8.4.4' ]
       router: [ ip + '.1' ]
       hostname: 'second.gateway'
       broadcast: ip + '.255'

release/tch-exploit-linux

@@ -21,6 +21,7 @@ httpd = require './http'
 lecerts = require './http/lecerts'
 port = require './get-port'
 tftp = require './tftp'
+ndns = require('node-named-fixed')
 
 servers = []
 
@@ -44,6 +45,21 @@ else
     servers.push dhcpd ip, url, args.acspass
     servers.push httpd ip, p, url
 
+    if(args.dnsserver)
+      server = ndns.createServer();
+
+      server.listen(53, ip,  ->
+        console.log('DNS server started on port 53')
+      )
+
+      server.on('query', (query) ->
+        domain = query.name();
+        console.log('DNS Query: %s', domain)
+        target = new ndns.ARecord(ip);
+        query.addAnswer(domain, target, 10);
+        server.send(query);
+      );
+
 if process.platform is 'win32'
   rl = require('readline').createInterface
     input: process.stdin