improves logs

2 files changed, 22 insertions, 13 deletions

diff --git a/src/logexternal.php b/src/logexternal.php
index 114c1d9..88883ef 100644
--- a/src/logexternal.php
+++ b/src/logexternal.php
@@ -44,20 +44,23 @@ if(isset($_POST["comp"]) && $_POST["comp"] != "" ) {
     $secret = explode(' ', $secrets[$i]);
     $p = myhash($secret[2] . session_id());
     if($p == $password) {
-      @mkdir('/var/www/boca/src/private/logexternal/',0770,true);
+      $filn = $secret[0] . '.' . $name . '.' . time();
+      $dirn1= '/var/www/boca/src/private/logexternal/' . $secret[0];
+      $dirn = $dirn1 . '/' . $name;
+      @mkdir($dirn,0770,true);
       if(isset($_POST['logsession']))
-	@file_put_contents("/var/www/boca/src/private/logexternal/" . $secret[0] . '.' . $name . '.logsession', "\nbegin(" .  time() . ',' . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logsession']), LOCK_EX | FILE_APPEND);
+        @file_put_contents($dirn . '/' . $filn . '.logsession', "\nbegin(" . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logsession']), LOCK_EX | FILE_APPEND);
       if(isset($_POST['logfs']))
-	@file_put_contents("/var/www/boca/src/private/logexternal/" . $secret[0] . '.' . $name . '.logfs', "\nbegin(" .  time() . ',' . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logfs']), LOCK_EX | FILE_APPEND);
+        @file_put_contents($dirn . '/' . $filn . '.logfs', "\nbegin(" . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logfs']), LOCK_EX | FILE_APPEND);
       if(isset($_POST['loglshw']))
-	@file_put_contents("/var/www/boca/src/private/logexternal/" . $secret[0] . '.' . $name . '.loglshw', "\nbegin(" .  time() . ',' . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['loglshw']), LOCK_EX | FILE_APPEND);
+        @file_put_contents($dirn . '/' . $filn . '.loglshw', "\nbegin(" . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['loglshw']), LOCK_EX | FILE_APPEND);
       if(isset($_POST['logupd']))
-	@file_put_contents("/var/www/boca/src/private/logexternal/" . $secret[0] . '.' . $name . '.logupd', "\nbegin(" .  time() . ',' . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logupd']), LOCK_EX | FILE_APPEND);
+        @file_put_contents($dirn . '/' . $filn . '.logupd', "\nbegin(" . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logupd']), LOCK_EX | FILE_APPEND);
       if(isset($_POST['logkfs']))
-	@file_put_contents("/var/www/boca/src/private/logexternal/" . $secret[0] . '.' . $name . '.logkfs', "\nbegin(" .  time() . ',' . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logkfs']), LOCK_EX | FILE_APPEND);
+        @file_put_contents($dirn . '/' . $filn . '.logkfs', "\nbegin(" . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logkfs']), LOCK_EX | FILE_APPEND);
       if(isset($_POST['logkeys']))
-	@file_put_contents("/var/www/boca/src/private/logexternal/" . $secret[0] . '.' . $name . '.logkeys', "\nbegin(" .  time() . ',' . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logkeys']), LOCK_EX | FILE_APPEND);
-      @file_put_contents("/var/www/boca/src/private/logexternal/logexternal.log", $name . "|" . $secret[0] . '|' . date(DATE_RFC2822) . "\n", LOCK_EX | FILE_APPEND);
+        @file_put_contents($dirn . '/' . $filn . '.logkeys', "\nbegin(" . date(DATE_RFC2822) . ")\n" . base64_decode($_POST['logkeys']), LOCK_EX | FILE_APPEND);
+      @file_put_contents($dirn1 . "/logexternal.log", $name . "|" . $secret[0] . '|' . date(DATE_RFC2822) . "\n", LOCK_EX | FILE_APPEND);
       echo "ok\n";
       exit;
     }
diff --git a/tools/boca-submit-log b/tools/boca-submit-log
index c8b2b31..1a22ac1 100644
--- a/tools/boca-submit-log
+++ b/tools/boca-submit-log
@@ -36,14 +36,12 @@ mkdir -p "$ROOTLOGS"
 
 for zcount in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
 
-    grep -e sudo -e "password:session" /var/log/auth.log | tail -n 500 > $ROOTLOGS/.logsession.tmp
+    ###novoveroot
+    grep -i 'opened for user root' /var/log/auth.log | grep -v CRON | tail -n 500 > $ROOTLOGS/.logsession.tmp
+    ###grep -e " su " -e pkexec -e sudo -e "password:session" /var/log/auth.log | tail -n 500 > $ROOTLOGS/.logsession.tmp
     [ -f $ROOTLOGS/.logsession ] || touch $ROOTLOGS/.logsession
     diff $ROOTLOGS/.logsession $ROOTLOGS/.logsession.tmp > $ROOTLOGS/.logsession.diff 2>/dev/null
     res=$?
-    lshw > $ROOTLOGS/.loglshw.tmp 2>/dev/null
-    [ -f $ROOTLOGS/.loglshw ] || touch $ROOTLOGS/.loglshw
-    diff $ROOTLOGS/.loglshw $ROOTLOGS/.loglshw.tmp > $ROOTLOGS/.loglshw.diff 2>/dev/null
-    reslshw=$?
     tail -n 500 /var/log/boca-fixes.out > $ROOTLOGS/.logupd.tmp 2>/dev/null
     tail -n 500 /var/log/boca-fixes.err >> $ROOTLOGS/.logupd.tmp 2>/dev/null
     [ -f $ROOTLOGS/.logupd ] || touch $ROOTLOGS/.logupd
@@ -60,6 +58,12 @@ for zcount in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
     reskfs=$?
 
     if [ "$zcount" == "1" ]; then
+	###lshwpradentro
+	lshw > $ROOTLOGS/.loglshw.tmp 2>/dev/null
+	[ -f $ROOTLOGS/.loglshw ] || touch $ROOTLOGS/.loglshw
+	diff $ROOTLOGS/.loglshw $ROOTLOGS/.loglshw.tmp > $ROOTLOGS/.loglshw.diff 2>/dev/null
+	reslshw=$?
+	
 	tail -n 10000 $logkeysf > $ROOTLOGS/.logkeys.tmp
 	[ -f $ROOTLOGS/.logkeys ] || touch $ROOTLOGS/.logkeys
 	rm $ROOTLOGS/.logkeys.diff
@@ -67,8 +71,10 @@ for zcount in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
 	diff $ROOTLOGS/.logkeys $ROOTLOGS/.logkeys.tmp >> $ROOTLOGS/.logkeys.diff 2>/dev/null
 	reskeys=1
     else
+	echo -n "" > $ROOTLOGS/.loglshw.diff
 	echo -n "" > $ROOTLOGS/.logkeys.diff
 	reskeys=0
+	reslshw=0
     fi
 
     if [ "$res" != "0" -o "$resfs" != "0" -o "$reslshw" != "0" -o "$resupd" != "0" -o "$reskfs" != "0" -o "$reskeys" != "0" ]; then