Updated ShotGun to use Range and AddComputers to trim

rusec · Mar 4, 2024 · 2cf23c4 · 2cf23c4
1 parent 0f8d21a
commit 2cf23c4
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 41 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/front/page/addComputer.ts b/src/front/page/addComputer.ts
@@ -8,9 +8,9 @@ import { Home } from "../menu/home";
 import { pressEnter } from "../../modules/console/enddingModules";
 import options from "../../modules/util/options";
 const addComputer = async function () {
-    const { ip, user, pass } = await inquirer.prompt([
+    const { ip_input, user_input, pass_input }: { ip_input: string; user_input: string; pass_input: string } = await inquirer.prompt([
         {
-            name: "ip",
+            name: "ip_input",
             message: "please enter an ip:",
             type: "input",
             validate: (v) => {
@@ -20,17 +20,24 @@ const addComputer = async function () {
             },
         },
         {
-            name: "user",
+            name: "user_input",
             message: "please enter a username",
             type: "input",
         },
         {
-            name: "pass",
+            name: "pass_input",
             message: "please enter a password",
             type: "input",
         },
     ]);
+
+    const ip = ip_input.trim();
+    const user = user_input.trim();
+    const pass = pass_input.trim();
+    log(`Attempting connection to ${ip} using ${user}`, "info");
+
     await trySSH();
+
     async function trySSH(): Promise<void> {
         var computer_info = await scanSSH(ip, user, pass);
         // console.log(computer_info);

diff --git a/src/front/page/ssh.ts b/src/front/page/ssh.ts
@@ -38,7 +38,7 @@ async function ShotGun() {
 
                 return true;
             },
-            message: "host ids (the last digit of the ip)",
+            message: "host ids (separated by spaces) (the last digit of the ip)",
         },
         {
             name: "usernames_string",
@@ -57,7 +57,8 @@ async function ShotGun() {
     let network_ip = ip_net.split(".");
     network_ip.pop();
     network_ip = network_ip.join(".").trim();
-    let hosts = hosts_ids.split(" ");
+    let hosts = expandHostIds(hosts_ids);
+
     var computers = hosts.map((value: string) => {
         value = value.trim();
         return network_ip + "." + value;
@@ -142,7 +143,9 @@ async function ShotGun() {
         try {
             var string = "\n";
             for (const computer of computers) {
-                string += `${computer.ip}     ${computer.name}\n`;
+                let computerInfo = await runningDB.getComputer(computer);
+                if (!computerInfo) continue;
+                string += `${computer}  ${computerInfo.Name}\n`;
             }
             if (process.platform === "linux" || process.platform === "darwin" || process.platform === "freebsd" || process.platform === "openbsd") {
                 await exec(`echo '${string}' | sudo tee -a /etc/hosts`);
@@ -158,5 +161,23 @@ async function ShotGun() {
     bar.stop();
     console.clear();
 }
+function expandHostIds(hosts_ids: string): string[] {
+    const hosts: string[] = [];
+    const ranges: string[] = hosts_ids.split(" ");
+
+    ranges.forEach((range) => {
+        const [start, end] = range.split("-").map(Number);
+        if (!end) {
+            if (isNaN(start)) return;
+            hosts.push(start.toString());
+        } else {
+            if (isNaN(start) || isNaN(end)) return;
+            for (let i = start; i <= end; i++) {
+                hosts.push(i.toString());
+            }
+        }
+    });
 
+    return hosts;
+}
 export { ShotGun as sshMenu };