1747350365

.gitignore

@@ -1,4 +1,5 @@
 scans/*
+logs/*
 scratch*
 *.bak*
 *.old*

index.php

@@ -15,6 +15,9 @@
         <input type="text" id="nmapcmd" name="nmapcmd">
         <input type="button" onclick="runNmapScan()" value="Go, Baby, Go!">
         <br>
-        <span class="hidden" id="out"></span>
+        <span class="hidden" id="link"></span>
+        <br>
+        <pre class="hidden" id="progress">
+        </pre>
 </body>
 </html>

js/nmaprincesspi.js

@@ -14,8 +14,8 @@ function copyToClipboard(ID) {
 
 function xhrSuccess(xhrRet) {
     let xhrResponseText = xhrRet.target.responseText;
-    getID('out').innerHTML = '<a href="'+xhrResponseText+'">Scan Report Here ('+xhrResponseText+')</a>';
-    getID('out').style.display = "inline";
+    getID('link').innerHTML = '<a href="'+xhrResponseText+'">Scan Report Here ('+xhrResponseText+')</a>';
+    getID('link').style.display = "inline";
 }
 
 function xhr404(xhrRet) {
@@ -41,9 +41,9 @@ function xhrLoadend(xhrRet) {
     }
 }
 
-function doXhr(xhrFilePath, xhrMethod='GET', xhrPostData=null) {
+function doXhr(xhrFilePath, xhrLoadEndFun=xhrLoadEnd, xhrMethod='GET', xhrPostData=null) {
     const xhr = new XMLHttpRequest();
-    xhr.addEventListener("loadend", xhrLoadend);
+    xhr.addEventListener("loadend", xhrLoadEndFun);
     xhr.open(xhrMethod, xhrFilePath);
 
     if(xhrMethod == 'POST') {
@@ -68,15 +68,39 @@ function changeFavIcon(icoFile) {
     icoLink.href = icoFile;
 } 
 
-function runNmapScan() {
-    let nmapcmd = getID('nmapcmd').value;
-    console.log(nmapcmd);
-    let postData = 'nmapcmd='+encodeURIComponent(nmapcmd);
-    doXhr('run_scan.php', 'POST', postData);
+function xhrRunNmapScan(xhrRet) {
+    // let xhrResponseText = xhrRet.target.responseText;
+    xhrJson = JSON.parse(xhrRet.target.responseText);
+
+    getID('link').innerHTML = '<a href="'+xhrJson.webName+'">Scan Report Here ('+xhrJson.webName+')</a>';
+    getID('link').style.display = "inline";
+
+    if(typeof pollInterval !== 'undefined') {
+        clearInterval(pollInterval);
+    }
+
+    getID('progress').innerHTML = '';
+    getID('progress').style.display = 'none';
+
+    pollFile(xhrJson.runningLog);
+
 }
 
-function pollFile(filePath) {
-    var poll = setInterval(function() {
-        doXhr(filePath);
+function xhrPollFile(xhrRet) {
+    let xhrResponseText = xhrRet.target.responseText;
+    getID('progress').innerHTML = xhrResponseText;
+    getID('progress').style.display = "block";
+}
+
+function pollFile(runningLog) {
+    var pollInterval = setInterval(function() {
+        doXhr(runningLog, xhrPollFile);
     }, 1000);
 }
+
+function runNmapScan() {
+    let nmapcmd = getID('nmapcmd').value;
+    let postData = 'nmapcmd='+encodeURIComponent(nmapcmd);
+
+    doXhr('run_scan.php', xhrRunNmapScan, 'POST', postData);
+}

run_scan.php

@@ -11,8 +11,6 @@
     $run_cmd = "bash ./scripts/run_scan.sh nmap -oX ./scans/$file_name --stylesheet /nmaprincesspi/xsl/princesspi-nmap.xsl $post_cmd";
     $web_name = "/nmaprincesspi/scans/$file_name";
 
-    echo $web_name;
-
-    $exec = shell_exec($run_cmd);
-    echo $exec;
+    $exec = trim(shell_exec($run_cmd));
+    echo "{\"runningLog\":\"$exec\",\"webName\":\"$web_name\"}";
 ?>

running.log

@@ -1,12 +0,0 @@
-Starting Nmap 7.95 ( https://nmap.org ) at 2025-05-15 16:07 MDT
-Nmap scan report for kasm.h.acker.is (64.20.45.110)
-Host is up (0.070s latency).
-Not shown: 995 filtered tcp ports (no-response)
-PORT     STATE SERVICE
-22/tcp   open  ssh
-80/tcp   open  http
-443/tcp  open  https
-3389/tcp open  ms-wbt-server
-8888/tcp open  sun-answerbook
-
-Nmap done: 1 IP address (1 host up) scanned in 7.70 seconds

scripts/fix_perms.sh

@@ -1,2 +1,3 @@
 #!/bin/bash
-sudo chown -R www-data:www-data .. 2>>../error.log
+sudo chown -R www-data:www-data .. 2>>../logs/error.log
+sudo chmod +x ../logs/*

scripts/run_clear.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
-rm -f ../error.log 2>>./error.log
-rm -f ../running.log 2>>./error.log
-rm -f ../scans/* 2>>./error.log
+rm -f ../log/* 2>>../logs/error.log
+rm -f ../scans/* 2>>../logs/error.log

scripts/run_scan.sh

@@ -1,2 +1,4 @@
 #!/bin/bash
-eval "$* 2>error.log 1>running.log&"
+runningLog="$(date +%Y%m%d%H%M%S)-$RANDOM.log"
+eval "$* 2>>logs/error.log 1>logs/$runningLog&"
+echo "/nmaprincesspi/logs/$runningLog"

todo.txt

@@ -13,3 +13,9 @@ c work on scans filename?
 fix perms
 auth system
 input/output validation
+work on princesspi-nmap.xsl
+    clean up
+    minimize stuff
+        remove rundundant code
+    make prettier
+        green class