From 45dd94e5d59132120c9e1d9aacbd82795dbc2a24 Mon Sep 17 00:00:00 2001
From: Jokob-sk <jokob.sk@gmail.com>
Date: Fri, 7 Jul 2023 07:48:45 +1000
Subject: [PATCH] arp-scan debug #261 work

---
 front/js/handle_version.js             |  2 +-
 front/maintenance.php                  |  4 ++--
 front/php/templates/language/en_us.php |  4 ++--
 pialert/scanners/arpscan.py            | 21 ++++++++++++---------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/front/js/handle_version.js b/front/js/handle_version.js
index 91c5a4c9..fa9d7194 100755
--- a/front/js/handle_version.js
+++ b/front/js/handle_version.js
@@ -42,7 +42,7 @@ function handleVersion(){
     {
       $.get('https://api.github.com/repos/jokob-sk/Pi.Alert/releases').done(function(response) {
         // Handle successful response
-        var releases = data;
+        var releases = response;
         
         if(releases.length > 0)
         {
diff --git a/front/maintenance.php b/front/maintenance.php
index 33999641..bce93eeb 100755
--- a/front/maintenance.php
+++ b/front/maintenance.php
@@ -371,9 +371,9 @@ $db->close();
                             <div class="row logs-row">
                               <textarea id="pialert_log" class="logs" cols="70" rows="10" wrap='off' readonly >
                                 <?php                               
-                                if(filesize("./log/pialert.log") > 200000)
+                                if(filesize("./log/pialert.log") > 2000000)
                                 {
-                                  echo file_get_contents( "./log/pialert.log", false, null, -200000); 
+                                  echo file_get_contents( "./log/pialert.log", false, null, -2000000); 
                                 }
                                 else{
                                   echo file_get_contents( "./log/pialert.log" );
diff --git a/front/php/templates/language/en_us.php b/front/php/templates/language/en_us.php
index de9e6b2f..c51d2d88 100755
--- a/front/php/templates/language/en_us.php
+++ b/front/php/templates/language/en_us.php
@@ -487,7 +487,7 @@ $lang['en_us'] = array(
 'run_event_tooltip' => 'Enable the setting and save your changes at first before you run it.',
 'run_event_icon' => 'fa-play',
 'general_event_title' => 'Executing an ad-hoc event',
-'general_event_description' => 'The event you\'ve triggered might take a while until background processes finish. The execution ended once you see <code>finished</code> below. Check the <a  href="/maintenance.php#tab_Logging">error log</a> if you didn\'t get the expected result. <br/> <br/>  Status: ',
+'general_event_description' => ' The event you\'ve triggered might take a while until background processes finish. The execution ended once you see <code>finished</code> below. Check the <a  href=\"/maintenance.php#tab_Logging\">error log</a> if you didn\'t get the expected result. <br/> <br/>  Status: ',
 
 
 
@@ -565,7 +565,7 @@ The arp-scan time itself depends on the number of IP addresses to check so set t
 'Email_display_name' => 'Email',
 'Email_icon' => '<i class="fa fa-at"></i>',
 'REPORT_MAIL_name' => 'Enable email',
-'REPORT_MAIL_description' => 'If enabled an email is sent out with a list of changes you\'ve subscribed to. Please also fill out all remaining settings related to the SMTP setup below. If facing issues, set <code>LOG_LEVEL</code> to <code>debug</code> and check the <a  href="/maintenance.php#tab_Logging">error log</a>.',
+'REPORT_MAIL_description' => 'If enabled an email is sent out with a list of changes you\'ve subscribed to. Please also fill out all remaining settings related to the SMTP setup below. If facing issues, set <code>LOG_LEVEL</code> to <code>debug</code> and check the <a  href=\"/maintenance.php#tab_Logging\">error log</a>.',
 'SMTP_SERVER_name' => 'SMTP server URL',
 'SMTP_SERVER_description' => 'The SMTP server host URL. For example <code>smtp-relay.sendinblue.com</code>. To use Gmail as an SMTP server <a target="_blank" href="https://github.com/jokob-sk/Pi.Alert/blob/main/docs/SMTP_GMAIL.md">follow this guide</a>',
 'SMTP_PORT_name' => 'SMTP server PORT',
diff --git a/pialert/scanners/arpscan.py b/pialert/scanners/arpscan.py
index 723edcb6..dfb4261e 100755
--- a/pialert/scanners/arpscan.py
+++ b/pialert/scanners/arpscan.py
@@ -1,5 +1,6 @@
 import re
 import subprocess
+import conf
 
 from logger import mylog
 from helper import write_file
@@ -16,8 +17,6 @@ def execute_arpscan (userSubnets):
     for interface in userSubnets :   
         arpscan_output += execute_arpscan_on_interface (interface)    
         index += 1         
-        write_file (logPath + '/arp_scan_output_' + str(index) + '.txt', arpscan_output)
-    
     
     # Search IP + MAC + Vendor as regular expresion
     re_ip = r'(?P<ip>((2[0-5]|1[0-9]|[0-9])?[0-9]\.){3}((2[0-5]|1[0-9]|[0-9])?[0-9]))'
@@ -54,17 +53,21 @@ def execute_arpscan_on_interface (interface):
     arpscan_args = ['sudo', 'arp-scan', '--ignoredups', '--retry=6'] + subnets
 
     # Execute command
-    try:
+    if conf.LOG_LEVEL == 'debug':
         # try runnning a subprocess
         result = subprocess.check_output (arpscan_args, universal_newlines=True)
-    except subprocess.CalledProcessError as e:
-        # An error occured, handle it
-        error_type = type(e).__name__  # Capture the error type
+    else:
+        try:
+            # try runnning a subprocess safely
+            result = subprocess.check_output (arpscan_args, universal_newlines=True)
+        except subprocess.CalledProcessError as e:
+            # An error occured, handle it
+            error_type = type(e).__name__  # Capture the error type
 
-        mylog('none', [f'[ARP Scan] Error type  : {error_type}'])
-        mylog('none', [f'[ARP Scan] Error output: {e.output}'])
+            mylog('none', [f'[ARP Scan] Error type  : {error_type}'])
+            mylog('none', [f'[ARP Scan] Error output: {e.output}'])
 
-        result = ""
+            result = ""
 
     mylog('debug', ['[ARP Scan] on Interface Completed with results: ', result])
     return result