From 0176f7194460be512cc200ca4bf1212a50999175 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 31 Oct 2023 14:38:45 +0000 Subject: [PATCH 01/17] Initial commit --- installers/debuglog.sh | 272 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 272 insertions(+) create mode 100755 installers/debuglog.sh diff --git a/installers/debuglog.sh b/installers/debuglog.sh new file mode 100755 index 00000000..09c82e59 --- /dev/null +++ b/installers/debuglog.sh @@ -0,0 +1,272 @@ +#!/bin/bash +# +# RaspAP Debug log generator +# Author: @billz +# Author URI: https://github.com/billz/ +# License: GNU General Public License v3.0 +# License URI: https://github.com/raspap/raspap-webgui/blob/master/LICENSE +# +# Typically used in an ajax call from the RaspAP UI, this utility may also +# be invoked directly to generate a detailed system debug log. +# +# Usage: debuglog.sh [options] +# +# OPTIONS: +# -p, --path Overrides the debug logfile write path (/tmp) +# -i, --install Overrides the default RaspAP install location (/var/www/html) +# +# NOTE +# Detailed system information is gathered for debugging and/or troubleshooting +# purposes only. Passwords or other sensitive data are NOT included. +# +# You are not obligated to bundle the LICENSE file with your RaspAP projects as long +# as you leave these references intact in the header comments of your source files. + +# Exit on error +set -o errexit +# Exit on error inside functions +set -o errtrace +# Turn on traces, disabled by default +# set -o xtrace + +# Set defaults +readonly RASPAP_DIR="/etc/raspap" +readonly DNSMASQ_D_DIR="/etc/dnsmasq.d" +readonly RASPAP_DHCDPCD="/etc/dhcpcd.conf" +readonly RASPAP_HOSTAPD="$RASPAP_DIR/hostapd.ini" +readonly RASPAP_PROVIDER="$RASPAP_DIR/provider.ini" +readonly RASPAP_LOGFILE="raspap_debug.log" +readonly RASPAP_DEBUG_VERSION="1.0" + +readonly PREAMBLE=" + 888888ba .d888888 888888ba + 88 8b d8 88 88 8b + a88aaaa8P' .d8888b. .d8888b. 88d888b. 88aaaaa88a a88aaaa8P + 88 8b. 88 88 Y8ooooo. 88 88 88 88 88 + 88 88 88. .88 88 88. .88 88 88 88 + dP dP 88888P8 88888P 88Y888P 88 88 dP + 88 + dP Debug Log Generator $RASPAP_DEBUG_VERSION + +This process collects debug and troubleshooting information about your RaspAP installation. +It is intended to assist users with a self-diagnosis of their installations, as well as +provide useful information as a starting point for others to assist with troubleshooting. +Debug log information contains the RaspAP version, current state and configuration of AP +related services, relevant installed package versions, Linux kernel version and local +networking configuration details. + +If you wish to share your debug info, paste the output to one of the following: + https://pastebin.com/ + https://paste.ubuntu.com/ + +Please do NOT paste the log in its entirety to RaspAP's discussions, issues or other +support channels. Use one of the above links instead. + +DISCLAIMER: This log DOES contain details about your system, including networking +settings. However, NO passwords or other sensitive data are included in the debug output. +=========================================================================================" + +function _main() { + _parse_params "$@" + _initialize + _output_preamble + _generate_log +} + +function _parse_params() { + # default option values + logfile_path="/tmp" + install_dir="/var/www/html" + + while :; do + case "${1-}" in + -p|--path) + logfile_path="$2" + shift + ;; + -i|--install) + install_dir="$2" + shift + ;; + -*|--*) + echo "Unknown option: $1" + _usage + exit 1 + ;; + *) + break + ;; + esac + shift + done +} + +function _generate_log() { + timestamp=$(date) + _log_write "Debug log generation started at ${timestamp}" + _log_write "Writing log to ${logfile_path}/${RASPAP_LOGFILE}" + + _system_info + _packages_info + _raspap_info + _dnsmasq_info + _interface_info + _routing_info + _iw_dev_info + _iw_reg_info + _systemd_info + + _log_write "RaspAP debug log generation complete." + exit 0 +} + +function _system_info() { + local model=$(tr -d '\0' < /proc/device-tree/model) + local system_uptime=$(uptime | awk -F'( |,|:)+' '{if ($7=="min") m=$6; else {if ($7~/^day/){if ($9=="min") {d=$6;m=$8} else {d=$6;h=$8;m=$9}} else {h=$6;m=$7}}} {print d+0,"days,",h+0,"hours,",m+0,"minutes"}') + local free_mem=$(free -m | awk 'NR==2{ total=$2 ; used=$3 } END { print used/total*100}') + _log_separator "SYSTEM INFO" + _log_write "Hardware: ${model}" + _log_write "Detected OS: ${DESC} ${LONG_BIT}-bit" + _log_write "Kernel: ${KERNEL}" + _log_write "System Uptime: ${system_uptime}" + _log_write "Memory Usage: ${free_mem}%" +} + +function _packages_info() { + local php_version=$(php -v | grep -oP "PHP \K[0-9]+\.[0-9]+.*") + local dnsmasq_version=$(dnsmasq -v | grep -oP "Dnsmasq version \K[0-9]+\.[0-9]+") + local dhcpcd_version=$(dhcpcd --version | grep -oP '\d+\.\d+\.\d+') + local lighttpd_version=$(lighttpd -v | grep -oP '(\d+\.\d+\.\d+)') + local vnstat_version=$(vnstat -v | grep -oP "vnStat \K[0-9]+\.[0-9]+") + _log_separator "INSTALLED PACKAGES" + _log_write "PHP Version: ${php_version}" + _log_write "Dnsmasq Version: ${dnsmasq_version}" + _log_write "dhcpcd Version: ${dhcpcd_version}" + _log_write "lighttpd Version: ${lighttpd_version}" + _log_write "vnStat Version: ${vnstat_version}" +} + +function _raspap_info() { + local version=$(grep "RASPI_VERSION" $install_dir/includes/defaults.php | awk -F"'" '{print $4}') + local hostapd_ini=$(cat ${RASPAP_HOSTAPD} || echo "Not present") + local provider_ini=$(cat ${RASPAP_PROVIDER} || echo "Not present") + _log_separator "RASPAP INSTALL" + _log_write "RaspAP Version: ${version}" + _log_write "RaspAP Installation Directory: ${install_dir}" + _log_write "RaspAP hostapd.ini contents:\n${hostapd_ini}" + _log_write "RaspAP provider.ini: ${provider_ini}" +} + +function _dnsmasq_info() { + local stdout=$(ls -h ${DNSMASQ_D_DIR}/090_*.conf) + local contents + _log_separator "DNSMASQ CONTENTS" + _log_write "${stdout}" + IFS= # set IFS to empty + if [ -d "${DNSMASQ_D_DIR}" ]; then + for file in "${DNSMASQ_D_DIR}"/090_*.conf; do + if [ -f "$file" ]; then + contents+="\n$file contents:\n" + contents+="$(cat $file)" + contents="${contents}$\n" + fi + done + _log_write $contents + else + _log_write "Not found: ${DNSMASQ_D_DIR}" + fi +} + +function _interface_info() { + local stdout=$(ip a) + _log_separator "INTERFACES" + _log_write "${stdout}" +} + +function _iw_reg_info() { + local stdout=$(iw reg get) + _log_separator "IW REGULATORY INFO" + _log_write "${stdout}" +} + +function _iw_dev_info() { + local stdout=$(iw dev) + _log_separator "IW DEVICE INFO" + _log_write "${stdout}" +} + +function _routing_info() { + local stdout=$(ip route) + _log_separator "ROUTING TABLE" + _log_write "${stdout}" +} + +function _systemd_info() { + local SYSTEMD_SERVICES=( + "hostapd" + "dnsmasq" + "dhcpcd" + "systemd-networkd" + "systemd-resolved" + "wg-quick@wg0" + "openvpn-client@client" + "lighttpd") + + _log_separator "SYSTEMD SERVICES" + for i in "${!SYSTEMD_SERVICES[@]}"; do + _log_write "${SYSTEMD_SERVICES[$i]} status:" + stdout=$(systemctl status "${SYSTEMD_SERVICES[$i]}" || echo "") + _log_write "${stdout}\n" + done +} + +function _output_preamble() { + _log_write "${PREAMBLE}\n" +} + +# Determines host Linux distribution details +function _get_linux_distro() { + if type lsb_release >/dev/null 2>&1; then # linuxbase.org + OS=$(lsb_release -si) + RELEASE=$(lsb_release -sr) + CODENAME=$(lsb_release -sc) + DESC=$(lsb_release -sd) + LONG_BIT=$(getconf LONG_BIT) + elif [ -f /etc/os-release ]; then # freedesktop.org + . /etc/os-release + OS=$ID + RELEASE=$VERSION_ID + CODENAME=$VERSION_CODENAME + DESC=$PRETTY_NAME + else + OS="Unsupported Linux distribution" + fi + KERNEL=$(uname -a) +} + +# Initialized log for writing +function _initialize() { + if [ -e "${logfile_path}/${RASPAP_LOGFILE}" ]; then + echo "Existing debug log found. Re-initializing..." + rm "${logfile_path}/${RASPAP_LOGFILE}" + fi + _get_linux_distro +} + +function _log_separator(){ + local separator="" + local msg="$1" + local length=${#msg} + _log_write "\n$1" + for ((i=1; i<=length; i++)); do + separator+="=" + done + _log_write $separator +} + +# Writes to logfile and stdout +function _log_write() { + echo -e "${@}" | tee -a $logfile_path/$RASPAP_LOGFILE +} + +_main "$@" From 11e17a88958ddf17f979c123aaabd1d58371f589 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 31 Oct 2023 14:40:10 +0000 Subject: [PATCH 02/17] Rename tab, add debugModal dialog --- templates/system.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/templates/system.php b/templates/system.php index cf390742..a3eb2fe6 100755 --- a/templates/system.php +++ b/templates/system.php @@ -17,7 +17,7 @@ - +
@@ -25,7 +25,7 @@ - +
@@ -88,3 +88,20 @@ + + + From 362feae185aaa33f6186c92cd567bae624637d8d Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 31 Oct 2023 15:14:55 +0000 Subject: [PATCH 03/17] Echo logfile path + file for ajax handler --- ajax/system/sys_debug.php | 10 ++++++++++ installers/debuglog.sh | 1 + templates/system/tools.php | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 ajax/system/sys_debug.php create mode 100644 templates/system/tools.php diff --git a/ajax/system/sys_debug.php b/ajax/system/sys_debug.php new file mode 100644 index 00000000..a62931fc --- /dev/null +++ b/ajax/system/sys_debug.php @@ -0,0 +1,10 @@ + diff --git a/installers/debuglog.sh b/installers/debuglog.sh index 09c82e59..ed2fe2e6 100755 --- a/installers/debuglog.sh +++ b/installers/debuglog.sh @@ -117,6 +117,7 @@ function _generate_log() { _systemd_info _log_write "RaspAP debug log generation complete." + echo "${logfile_path}/${RASPAP_LOGFILE}" exit 0 } diff --git a/templates/system/tools.php b/templates/system/tools.php new file mode 100644 index 00000000..f47be509 --- /dev/null +++ b/templates/system/tools.php @@ -0,0 +1,35 @@ + +
+

+ + + +
+
+ +
+ +
+
+
+ + +
+
+ + +
+ +
+
+
+ + + +
+ + From d619269df4b21f20aedd5c4b6d91c7aa902808b8 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 31 Oct 2023 15:17:13 +0000 Subject: [PATCH 04/17] CSRF check, exec system/debuglog.sh --- ajax/system/sys_debug.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ajax/system/sys_debug.php b/ajax/system/sys_debug.php index a62931fc..faad8fd3 100644 --- a/ajax/system/sys_debug.php +++ b/ajax/system/sys_debug.php @@ -3,8 +3,13 @@ require '../../includes/csrf.php'; require_once '../../includes/config.php'; +if (isset($_POST['csrf_token'])) { + if (csrfValidateRequest() && !CSRFValidate()) { + handleInvalidCSRFToken(); + } + exec( RASPI_CONFIG.'/system/debuglog.sh', $return); + echo json_encode(end($return)); +} else { + handleInvalidCSRFToken(); +} -$return = 0; -echo json_encode($return); - -?> From 15632a60df6a92318bbc001508b5190ff5a75e8c Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 31 Oct 2023 15:19:01 +0000 Subject: [PATCH 05/17] Create system debug log dir, copy shell scripts to destination --- installers/common.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/installers/common.sh b/installers/common.sh index 34975cbf..3e124d04 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -539,12 +539,19 @@ function _create_openvpn_scripts() { _install_log "Creating OpenVPN control scripts" sudo mkdir $raspap_dir/openvpn || _install_status 1 "Unable to create directory '$raspap_dir/openvpn'" - # Move service auth control & logging shell scripts + _install_log "Creating RaspAP debug log control script" + sudo mkdir $raspap_dir/system || _install_status 1 "Unable to create directory '$raspap_dir/system'" + + # Move service auth control, logging and debug shell scripts sudo cp "$webroot_dir/installers/"configauth.sh "$raspap_dir/openvpn" || _install_status 1 "Unable to move auth control script" sudo cp "$webroot_dir/installers/"openvpnlog.sh "$raspap_dir/openvpn" || _install_status 1 "Unable to move logging script" + sudo cp "$webroot_dir/installers/"debuglog.sh "$raspap_dir/system" || _install_status 1 "Unable to move debug logging script" # Restrict script execution to root user sudo chown -c root:root "$raspap_dir/openvpn/"*.sh || _install_status 1 "Unable change owner and/or group" sudo chmod 750 "$raspap_dir/openvpn/"*.sh || _install_status 1 "Unable to change file permissions" + sudo chown -c root:root "$raspap_dir/system/"*.sh || _install_status 1 "Unable change owner and/or group" + sudo chmod 750 "$raspap_dir/system/"*.sh || _install_status 1 "Unable to change file permissions" + _install_status 0 } From 00792501fde639e03866f9ec24a81ad42606e5d6 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 31 Oct 2023 17:52:17 +0000 Subject: [PATCH 06/17] Change system > reset tab to tools --- templates/system.php | 4 ++-- templates/system/reset.php | 21 --------------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 templates/system/reset.php diff --git a/templates/system.php b/templates/system.php index a3eb2fe6..dff367ab 100755 --- a/templates/system.php +++ b/templates/system.php @@ -96,10 +96,10 @@
-
+
- +
diff --git a/templates/system/reset.php b/templates/system/reset.php deleted file mode 100644 index bb598059..00000000 --- a/templates/system/reset.php +++ /dev/null @@ -1,21 +0,0 @@ - -
-

- - -
-
- - -
- -
-
-
- - -
- - From e99e98d8ca2c76529d0e9e2be1f248976c84da78 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 31 Oct 2023 20:27:56 +0000 Subject: [PATCH 07/17] Omit debug logfile write to /tmp --- installers/debuglog.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/installers/debuglog.sh b/installers/debuglog.sh index ed2fe2e6..baeb9c42 100755 --- a/installers/debuglog.sh +++ b/installers/debuglog.sh @@ -35,7 +35,6 @@ readonly DNSMASQ_D_DIR="/etc/dnsmasq.d" readonly RASPAP_DHCDPCD="/etc/dhcpcd.conf" readonly RASPAP_HOSTAPD="$RASPAP_DIR/hostapd.ini" readonly RASPAP_PROVIDER="$RASPAP_DIR/provider.ini" -readonly RASPAP_LOGFILE="raspap_debug.log" readonly RASPAP_DEBUG_VERSION="1.0" readonly PREAMBLE=" @@ -104,8 +103,6 @@ function _parse_params() { function _generate_log() { timestamp=$(date) _log_write "Debug log generation started at ${timestamp}" - _log_write "Writing log to ${logfile_path}/${RASPAP_LOGFILE}" - _system_info _packages_info _raspap_info @@ -115,9 +112,7 @@ function _generate_log() { _iw_dev_info _iw_reg_info _systemd_info - _log_write "RaspAP debug log generation complete." - echo "${logfile_path}/${RASPAP_LOGFILE}" exit 0 } @@ -202,13 +197,13 @@ function _routing_info() { _log_write "${stdout}" } +# Status of systemd services function _systemd_info() { local SYSTEMD_SERVICES=( "hostapd" "dnsmasq" "dhcpcd" "systemd-networkd" - "systemd-resolved" "wg-quick@wg0" "openvpn-client@client" "lighttpd") @@ -245,12 +240,7 @@ function _get_linux_distro() { KERNEL=$(uname -a) } -# Initialized log for writing function _initialize() { - if [ -e "${logfile_path}/${RASPAP_LOGFILE}" ]; then - echo "Existing debug log found. Re-initializing..." - rm "${logfile_path}/${RASPAP_LOGFILE}" - fi _get_linux_distro } @@ -265,9 +255,8 @@ function _log_separator(){ _log_write $separator } -# Writes to logfile and stdout function _log_write() { - echo -e "${@}" | tee -a $logfile_path/$RASPAP_LOGFILE + echo -e "${@}" } _main "$@" From 97a9cac5e8ecd19edc7ca931174e55ed26ae1464 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 31 Oct 2023 20:31:27 +0000 Subject: [PATCH 08/17] Write debug log to tempDir, redirect + download w/ readfile() --- ajax/system/sys_debug.php | 11 ++++++++++- ajax/system/sys_get_logfile.php | 21 +++++++++++++++++++++ app/js/custom.js | 11 +++++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 ajax/system/sys_get_logfile.php diff --git a/ajax/system/sys_debug.php b/ajax/system/sys_debug.php index faad8fd3..8390dafc 100644 --- a/ajax/system/sys_debug.php +++ b/ajax/system/sys_debug.php @@ -8,7 +8,16 @@ if (isset($_POST['csrf_token'])) { handleInvalidCSRFToken(); } exec( RASPI_CONFIG.'/system/debuglog.sh', $return); - echo json_encode(end($return)); + + $logOutput = implode(PHP_EOL, $return); + $filename = "raspap_debug.log"; + $tempDir = sys_get_temp_dir(); + $filePath = $tempDir . DIRECTORY_SEPARATOR . $filename; + $handle = fopen($filePath, "w"); + fwrite($handle, $logOutput); + fclose($handle); + echo json_encode($filePath); + } else { handleInvalidCSRFToken(); } diff --git a/ajax/system/sys_get_logfile.php b/ajax/system/sys_get_logfile.php new file mode 100644 index 00000000..7bcb3445 --- /dev/null +++ b/ajax/system/sys_get_logfile.php @@ -0,0 +1,21 @@ + Date: Tue, 31 Oct 2023 22:16:34 +0000 Subject: [PATCH 09/17] Update modal icon fa-sync-alt fa-spin --- templates/system.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/system.php b/templates/system.php index dff367ab..d25c3efa 100755 --- a/templates/system.php +++ b/templates/system.php @@ -93,7 +93,7 @@
- +
From 86ac3e2ff6fbd9056b599b06d00d4b021fc70112 Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 31 Oct 2023 22:18:23 +0000 Subject: [PATCH 10/17] Replace literal w/ RASPI_DEBUG_LOG --- ajax/system/sys_debug.php | 7 +++---- ajax/system/sys_get_logfile.php | 4 ++-- config/config.php | 1 + includes/defaults.php | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ajax/system/sys_debug.php b/ajax/system/sys_debug.php index 8390dafc..e596ea1b 100644 --- a/ajax/system/sys_debug.php +++ b/ajax/system/sys_debug.php @@ -7,17 +7,16 @@ if (isset($_POST['csrf_token'])) { if (csrfValidateRequest() && !CSRFValidate()) { handleInvalidCSRFToken(); } - exec( RASPI_CONFIG.'/system/debuglog.sh', $return); + $root = getenv("DOCUMENT_ROOT"); + exec( RASPI_CONFIG.'/system/debuglog.sh -i '.$root, $return); $logOutput = implode(PHP_EOL, $return); - $filename = "raspap_debug.log"; $tempDir = sys_get_temp_dir(); - $filePath = $tempDir . DIRECTORY_SEPARATOR . $filename; + $filePath = $tempDir . DIRECTORY_SEPARATOR . RASPI_DEBUG_LOG; $handle = fopen($filePath, "w"); fwrite($handle, $logOutput); fclose($handle); echo json_encode($filePath); - } else { handleInvalidCSRFToken(); } diff --git a/ajax/system/sys_get_logfile.php b/ajax/system/sys_get_logfile.php index 7bcb3445..92309696 100644 --- a/ajax/system/sys_get_logfile.php +++ b/ajax/system/sys_get_logfile.php @@ -1,11 +1,11 @@ RASPI_CONFIG.'/raspap.auth', 'RASPI_WIFI_AP_INTERFACE' => 'wlan0', 'RASPI_CACHE_PATH' => sys_get_temp_dir() . '/raspap', + 'RASPI_DEBUG_LOG' => 'raspap_debug.log', // Constants for configuration file paths. // These are typical for default RPi installs. Modify if needed. From 5e46cd407cb8231278c5fbfe59691c8cd451190d Mon Sep 17 00:00:00 2001 From: billz Date: Tue, 31 Oct 2023 22:28:33 +0000 Subject: [PATCH 11/17] Add system tools > debug msgs to en_US locale + compile .mo --- locale/en_US/LC_MESSAGES/messages.mo | Bin 36407 -> 37317 bytes locale/en_US/LC_MESSAGES/messages.po | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index 36af0739751cc78e493e729fd9e6819efab63a7d..3fa8bffb8ce15c61c9571a7c7060ae7977c99ac7 100644 GIT binary patch delta 10304 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 Q{NnJ=vHx55|MzwOKfXq9-v9sr delta 9526 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 diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index 0f48a1ed..97e27466 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -821,6 +821,24 @@ msgstr "Select a theme" msgid "Color" msgstr "Color" +msgid "Tools" +msgstr "Tools" + +msgid "System tools" +msgstr "System tools" + +msgid "To generate a system debug log, click or tap the button below." +msgstr "To generate a system debug log, click or tap the button below." + +msgid "Debug log information contains the RaspAP version, current state and configuratin of AP related services, installed system packages, Linux kernel version and networking details. No passwords or other sensitive data are included." +msgstr "Debug log information contains the RaspAP version, current state and configuratin of AP related services, installed system packages, Linux kernel version and networking details. No passwords or other sensitive data are included." + +msgid "Generate debug log" +msgstr "Generate debug log" + +msgid "Debug log generation in progress..." +msgstr "Debug log generation in progress..." + #: includes/data_usage.php msgid "Data usage" msgstr "Data usage" From 54e154c01a402795c0866088e9baa1ed7199e5ea Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 1 Nov 2023 07:33:36 +0000 Subject: [PATCH 12/17] Add icons to system > generate debug + reset buttons --- templates/system/tools.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/system/tools.php b/templates/system/tools.php index f47be509..1cd67364 100644 --- a/templates/system/tools.php +++ b/templates/system/tools.php @@ -14,7 +14,9 @@
- +
@@ -27,7 +29,9 @@
- + From 9663832f0de179526032b9d7133cffbe37f769c6 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 1 Nov 2023 07:45:19 +0000 Subject: [PATCH 13/17] Add _usb_info, _wpa_info and -w --write option --- installers/debuglog.sh | 45 ++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/installers/debuglog.sh b/installers/debuglog.sh index baeb9c42..1f004832 100755 --- a/installers/debuglog.sh +++ b/installers/debuglog.sh @@ -12,7 +12,7 @@ # Usage: debuglog.sh [options] # # OPTIONS: -# -p, --path Overrides the debug logfile write path (/tmp) +# -w, --write Writes the debug log to /tmp (useful if sourced directly) # -i, --install Overrides the default RaspAP install location (/var/www/html) # # NOTE @@ -35,8 +35,9 @@ readonly DNSMASQ_D_DIR="/etc/dnsmasq.d" readonly RASPAP_DHCDPCD="/etc/dhcpcd.conf" readonly RASPAP_HOSTAPD="$RASPAP_DIR/hostapd.ini" readonly RASPAP_PROVIDER="$RASPAP_DIR/provider.ini" +readonly RASPAP_LOGPATH="/tmp" +readonly RASPAP_LOGFILE="$RASPAP_LOGPATH/raspap_debug.log" readonly RASPAP_DEBUG_VERSION="1.0" - readonly PREAMBLE=" 888888ba .d888888 888888ba 88 8b d8 88 88 8b @@ -74,14 +75,13 @@ function _main() { function _parse_params() { # default option values - logfile_path="/tmp" install_dir="/var/www/html" + writelog=0 while :; do case "${1-}" in - -p|--path) - logfile_path="$2" - shift + -w|--write) + writelog=1 ;; -i|--install) install_dir="$2" @@ -101,11 +101,12 @@ function _parse_params() { } function _generate_log() { - timestamp=$(date) - _log_write "Debug log generation started at ${timestamp}" + _log_write "Debug log generation started at $(date)" _system_info _packages_info _raspap_info + _usb_info + _wpa_info _dnsmasq_info _interface_info _routing_info @@ -116,6 +117,7 @@ function _generate_log() { exit 0 } +# Fetches hardware, OS, uptime & used memory function _system_info() { local model=$(tr -d '\0' < /proc/device-tree/model) local system_uptime=$(uptime | awk -F'( |,|:)+' '{if ($7=="min") m=$6; else {if ($7~/^day/){if ($9=="min") {d=$6;m=$8} else {d=$6;h=$8;m=$9}} else {h=$6;m=$7}}} {print d+0,"days,",h+0,"hours,",m+0,"minutes"}') @@ -128,6 +130,7 @@ function _system_info() { _log_write "Memory Usage: ${free_mem}%" } +# Outputs installed package versions function _packages_info() { local php_version=$(php -v | grep -oP "PHP \K[0-9]+\.[0-9]+.*") local dnsmasq_version=$(dnsmasq -v | grep -oP "Dnsmasq version \K[0-9]+\.[0-9]+") @@ -142,6 +145,7 @@ function _packages_info() { _log_write "vnStat Version: ${vnstat_version}" } +# Outputs installed RaspAP version & settings function _raspap_info() { local version=$(grep "RASPI_VERSION" $install_dir/includes/defaults.php | awk -F"'" '{print $4}') local hostapd_ini=$(cat ${RASPAP_HOSTAPD} || echo "Not present") @@ -153,6 +157,19 @@ function _raspap_info() { _log_write "RaspAP provider.ini: ${provider_ini}" } +function _usb_info() { + local stdout=$(lsusb) + _log_separator "USB DEVICES" + _log_write "${stdout}" +} + +function _wpa_info() { + local stdout=$(wpa_cli status) + _log_separator "WPA SUPPLICANT" + _log_write "${stdout}" +} + +# Iterates the contents of RaspAP's 090_*.conf files in dnsmasq.d function _dnsmasq_info() { local stdout=$(ls -h ${DNSMASQ_D_DIR}/090_*.conf) local contents @@ -220,7 +237,7 @@ function _output_preamble() { _log_write "${PREAMBLE}\n" } -# Determines host Linux distribution details +# Fetches host Linux distribution details function _get_linux_distro() { if type lsb_release >/dev/null 2>&1; then # linuxbase.org OS=$(lsb_release -si) @@ -241,6 +258,9 @@ function _get_linux_distro() { } function _initialize() { + if [ -e "${RASPAP_LOGFILE}" ]; then + rm "${RASPAP_LOGFILE}" + fi _get_linux_distro } @@ -256,7 +276,12 @@ function _log_separator(){ } function _log_write() { - echo -e "${@}" + if [ "${writelog}" = 1 ]; then + echo -e "${@}" | tee -a $RASPAP_LOGFILE + else + echo -e "${@}" + fi } _main "$@" + From 22cd0ae017c1390f9b09abf3ef995bff60deef0d Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 1 Nov 2023 07:46:36 +0000 Subject: [PATCH 14/17] Add system/debuglog.sh to sudoers --- ajax/system/sys_debug.php | 2 +- installers/raspap.sudoers | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ajax/system/sys_debug.php b/ajax/system/sys_debug.php index e596ea1b..bb1fed31 100644 --- a/ajax/system/sys_debug.php +++ b/ajax/system/sys_debug.php @@ -8,7 +8,7 @@ if (isset($_POST['csrf_token'])) { handleInvalidCSRFToken(); } $root = getenv("DOCUMENT_ROOT"); - exec( RASPI_CONFIG.'/system/debuglog.sh -i '.$root, $return); + exec('sudo '.RASPI_CONFIG.'/system/debuglog.sh -i '.$root, $return); $logOutput = implode(PHP_EOL, $return); $tempDir = sys_get_temp_dir(); diff --git a/installers/raspap.sudoers b/installers/raspap.sudoers index 2e97f4fc..1b5cc806 100644 --- a/installers/raspap.sudoers +++ b/installers/raspap.sudoers @@ -41,6 +41,7 @@ www-data ALL=(ALL) NOPASSWD:/etc/raspap/hostapd/servicestart.sh www-data ALL=(ALL) NOPASSWD:/etc/raspap/lighttpd/configport.sh www-data ALL=(ALL) NOPASSWD:/etc/raspap/openvpn/configauth.sh www-data ALL=(ALL) NOPASSWD:/etc/raspap/openvpn/openvpnlog.sh +www-data ALL=(ALL) NOPASSWD:/etc/raspap/system/debuglog.sh www-data ALL=(ALL) NOPASSWD:/bin/chmod o+r /tmp/hostapd.log www-data ALL=(ALL) NOPASSWD:/bin/chmod o+r /var/log/dnsmasq.log www-data ALL=(ALL) NOPASSWD:/bin/chmod o+r /tmp/wireguard.log From 5e5eb7d04fead9e592941c9300e151502e51b4ee Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 1 Nov 2023 08:53:20 +0000 Subject: [PATCH 15/17] Minor: label typo fix --- locale/en_US/LC_MESSAGES/messages.mo | Bin 37317 -> 37319 bytes locale/en_US/LC_MESSAGES/messages.po | 4 ++-- templates/system/tools.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo index 3fa8bffb8ce15c61c9571a7c7060ae7977c99ac7..9bf6a3bd35b34275b8b898340a1a0f5a8d4fb647 100644 GIT binary patch delta 6428 zcmXxn3s_f08prYZ1EQh`f*^_lf+8X+<_$~4@QNtjK*AJPB`u9Y$y;g%Ez=N7ygX^H z^0>8+n(2e0WV+?9d8sv@%3aKCHx+d?TPw}lE?e#Q$ISMapP4!5%)IYAa}ILyRln1( z`c*IW_pTdb%6b|Tf-~EtreraXK2GF^6zI&Dy@k9Ke)*o-z3}F7-1e3;U%R^AIja{+Nr-@czckr9TQA z<2$H8PN4!hkIMWeM&pmDOe5~Mi44LB`dO%ir(zqN=h4sv6{v-`qbl$pOu)zoY)1E^ zG9890T_MKeeANA$FdPq}0(%dG@B%9EtEjEZ8(>URoQw*@n@J;p#$wdO&$t^lxqcPu z##+>typM5s4poV7vEi(sGW1Kg3rAsd`U%cdTuVP4+u|8aWPS558pFvz1(PeX_2HtNA& zQF|Erpv@o-{pt5Wo$g-F4AddYMlJM+8!tfxxYYHZMQ!0rs7m|+wRLZzr-+Zy&;;jE z4_-k9aMO+dfQsBd)9zg;D&wxG%zC3Hd>B>18K{L8IxA4?>_8pr!x)AC$fW+-qwg5d z`x-Eq1B79y1tU2SRAR?b0iQ)3_VcLwJ{wH^ zweXh=DB>ScC2ldq-q;qG(2vFTxD_?gTNsDOQ2|^X-a z7A(crbwL@$46_+0q893fjc^?5!F&wFnWz#M<0H7-jo(1s{}qnFdq^%OeYm}UIV$5# zr~v+m`VxAz?m`MrY2pE>ij2hoEW{+7;l?YFSKYjVP4E-cp}mZH?k;vgm7^;pV|Sd0 zntvtg{w+vip4mgAF#|_Xr96&`v<_9e>#qL|=FvAJZRsbX0$hk4a49OF?br=>qRvnq zs)F^XdGBBu`m!}Y`@e#QB3g^epbDGfUep6`y7AM_I&8-HRa8b_qwe<~W#U=IA*u=J8VJ!!Li0<;MlR$e-Mpz46wcCW1NQ3}W@_EK%I0ZvEK-%hJ)Z60aQGX4rWFQ=0Mn$*>^*uO( zA^0JxgqKi1y}raG44i0x`1C-{lZ$~k6SalKs4ZB8dVW1>-tDOSYCIY`6h|-u-$gC( zDeB(?_fR*E&L>OE#Y9|%t#KbJz*DHRa31wme2!Z1Dk`zBQCscLr12Pws*IQE2G(N= z1BaaTs0Ts{>;hdenEnH(g|blB$6+cKV=Zn+1&}w%1~|z%4>ewnI!iAhKlwegg@#J? z32Nec=PlIFg1gwq$Il2<$-7QA<_XM2ZPmLNhv!hI`de&`+Hh4S3j1Obs?t+Y*B`}E zdjHF4aPG`m48s^sluFkVm0>#iV*zT5rl2M$MFqSDBXI+2f!9%Ip$3QGNsPsysdnCE z)EVfD!5)ol8lA8Jm631z7~VqdY0p{4Jcc=_%nqXhJc0iB zDJrmkVk5liu78CJ)c;X?Js5SEy(k(9G`iz;9FGbpja8n*5g3SPQ4jnbd*LlN9y8kp z(h1uz-V-}vHY$O+sQXu76RbsjM~-2#ig}iX_T&dt$wTJYjN>te{$r>ISG#^C#?h}v z1^O|n^jEOq?Lci+v&U^W>F=W8=p7u#P3f5m*R?SI1lFlzdw{RB_I zG{)a>UdOrgV@mAauEP-en^A%6!caVddVS9znVK7@M8bGjm5jzP9j2Z%RJtM95(|;9 zuPH%Q;C<8<-Na_te4foT3RSsO)L|Nqx_=hxoBup2uvah$Uq_}ehfrJExs>`hrO};6 z7^YzWW}_w^i@H9`_2;7QTaC(OE5_k#*ceY@!&$+Gvw~Xq7B3GXQy+PfD}5m%xn*oAtq1{J^&H~v>tGX4RzP@`q`a3!D~?1Gv&4OQX{d;}-B z@wZTi@y|E{PvKw;dB)y90hRD9^i-;aGd+o=*H2&<`sc7K{ujGrQkk7Uzl{3pfjJB)vt_6XRG><^5f$l9RO#My{o|NN z{~X3)(sCPM7IvVYg9@kwyWwI~MR%gsIf$C~-Q`47M&oY`Xo1`nHiN0C%;%!sa}V{v z3vPUib0_MI970v>FR1(LP>Eea&2tAe|8J;3f}XVjw)SW!qBzur9?k)%3S^-koQzs% z7A9jUw!`htqo~SVK%I@tsON8B1pb6=F!VV)PckYnuP+TPJOrb094gadH@*xtQ8_Bm zZKw?2z=yFG`(xNj`)|TgIE?;Q9E$Zg9+RH8zY8vLo<`>LO!zAM%V0bX;>PKig|Ff? zyp5xA%xe2@zip_AuOn-lt}oc%1*@@;en7bmWCoVfKY+6_agF_rrxK^ozk)6G{%2I! z*JT`P&+<`w`4}qWWvK5#1*$STP+PGd+v3}pgcq|zcp7(TjKNkf*`IDjm_mP*^C0ShD;R>mU@!)+vkOI|t|wqBW?(IrpaSSzX#-4g z4nd7iuHg;2CX)6TyvYChuein+pY8LzV>aX@WHQf&^$D52`89P3KL`7stl9Bs$1XMZ JChh%y`+u1MMO^>@ delta 6419 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 I{7B9GKgPU71^@s6 diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index 97e27466..609b404d 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -830,8 +830,8 @@ msgstr "System tools" msgid "To generate a system debug log, click or tap the button below." msgstr "To generate a system debug log, click or tap the button below." -msgid "Debug log information contains the RaspAP version, current state and configuratin of AP related services, installed system packages, Linux kernel version and networking details. No passwords or other sensitive data are included." -msgstr "Debug log information contains the RaspAP version, current state and configuratin of AP related services, installed system packages, Linux kernel version and networking details. No passwords or other sensitive data are included." +msgid "Debug log information contains the RaspAP version, current state and configuration of AP related services, installed system packages, Linux kernel version and networking details. No passwords or other sensitive data are included." +msgstr "Debug log information contains the RaspAP version, current state and configuration of AP related services, installed system packages, Linux kernel version and networking details. No passwords or other sensitive data are included." msgid "Generate debug log" msgstr "Generate debug log" diff --git a/templates/system/tools.php b/templates/system/tools.php index 1cd67364..ff9f54f8 100644 --- a/templates/system/tools.php +++ b/templates/system/tools.php @@ -10,7 +10,7 @@ debug log, click or tap the button below."), "https://docs.raspap.com/ap-basics/#debug-log/"); ;?>
- +
From c3d97182cba16e7bb880c886b1fa6381b843b2d3 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 1 Nov 2023 11:13:33 +0000 Subject: [PATCH 16/17] Update _initialize() w/ delete log condition, revise separator labels --- installers/debuglog.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/installers/debuglog.sh b/installers/debuglog.sh index 1f004832..5451f1fd 100755 --- a/installers/debuglog.sh +++ b/installers/debuglog.sh @@ -122,7 +122,7 @@ function _system_info() { local model=$(tr -d '\0' < /proc/device-tree/model) local system_uptime=$(uptime | awk -F'( |,|:)+' '{if ($7=="min") m=$6; else {if ($7~/^day/){if ($9=="min") {d=$6;m=$8} else {d=$6;h=$8;m=$9}} else {h=$6;m=$7}}} {print d+0,"days,",h+0,"hours,",m+0,"minutes"}') local free_mem=$(free -m | awk 'NR==2{ total=$2 ; used=$3 } END { print used/total*100}') - _log_separator "SYSTEM INFO" + _log_separator "System Info" _log_write "Hardware: ${model}" _log_write "Detected OS: ${DESC} ${LONG_BIT}-bit" _log_write "Kernel: ${KERNEL}" @@ -137,7 +137,7 @@ function _packages_info() { local dhcpcd_version=$(dhcpcd --version | grep -oP '\d+\.\d+\.\d+') local lighttpd_version=$(lighttpd -v | grep -oP '(\d+\.\d+\.\d+)') local vnstat_version=$(vnstat -v | grep -oP "vnStat \K[0-9]+\.[0-9]+") - _log_separator "INSTALLED PACKAGES" + _log_separator "Installed Packaged" _log_write "PHP Version: ${php_version}" _log_write "Dnsmasq Version: ${dnsmasq_version}" _log_write "dhcpcd Version: ${dhcpcd_version}" @@ -150,7 +150,7 @@ function _raspap_info() { local version=$(grep "RASPI_VERSION" $install_dir/includes/defaults.php | awk -F"'" '{print $4}') local hostapd_ini=$(cat ${RASPAP_HOSTAPD} || echo "Not present") local provider_ini=$(cat ${RASPAP_PROVIDER} || echo "Not present") - _log_separator "RASPAP INSTALL" + _log_separator "RaspAP Install" _log_write "RaspAP Version: ${version}" _log_write "RaspAP Installation Directory: ${install_dir}" _log_write "RaspAP hostapd.ini contents:\n${hostapd_ini}" @@ -159,13 +159,13 @@ function _raspap_info() { function _usb_info() { local stdout=$(lsusb) - _log_separator "USB DEVICES" + _log_separator "USB Devices" _log_write "${stdout}" } function _wpa_info() { local stdout=$(wpa_cli status) - _log_separator "WPA SUPPLICANT" + _log_separator "WPA Supplicant" _log_write "${stdout}" } @@ -173,7 +173,7 @@ function _wpa_info() { function _dnsmasq_info() { local stdout=$(ls -h ${DNSMASQ_D_DIR}/090_*.conf) local contents - _log_separator "DNSMASQ CONTENTS" + _log_separator "Dnsmasq Contents" _log_write "${stdout}" IFS= # set IFS to empty if [ -d "${DNSMASQ_D_DIR}" ]; then @@ -192,25 +192,25 @@ function _dnsmasq_info() { function _interface_info() { local stdout=$(ip a) - _log_separator "INTERFACES" + _log_separator "Interfaces" _log_write "${stdout}" } function _iw_reg_info() { local stdout=$(iw reg get) - _log_separator "IW REGULATORY INFO" + _log_separator "IW Regulatory Info" _log_write "${stdout}" } function _iw_dev_info() { local stdout=$(iw dev) - _log_separator "IW DEVICE INFO" + _log_separator "IW Device Info" _log_write "${stdout}" } function _routing_info() { local stdout=$(ip route) - _log_separator "ROUTING TABLE" + _log_separator "Routing Info" _log_write "${stdout}" } @@ -224,8 +224,7 @@ function _systemd_info() { "wg-quick@wg0" "openvpn-client@client" "lighttpd") - - _log_separator "SYSTEMD SERVICES" + _log_separator "Systemd Services" for i in "${!SYSTEMD_SERVICES[@]}"; do _log_write "${SYSTEMD_SERVICES[$i]} status:" stdout=$(systemctl status "${SYSTEMD_SERVICES[$i]}" || echo "") @@ -258,7 +257,7 @@ function _get_linux_distro() { } function _initialize() { - if [ -e "${RASPAP_LOGFILE}" ]; then + if [ -e "${RASPAP_LOGFILE}" ] && [ "${writelog}" = 1 ]; then rm "${RASPAP_LOGFILE}" fi _get_linux_distro From 3eb8e5ae3fab9b58d757727afe5b63945f4cb0c3 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 1 Nov 2023 20:33:15 +0000 Subject: [PATCH 17/17] Check for presence of commands, ini files and defaults.php --- installers/debuglog.sh | 52 ++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/installers/debuglog.sh b/installers/debuglog.sh index 5451f1fd..61db216d 100755 --- a/installers/debuglog.sh +++ b/installers/debuglog.sh @@ -64,7 +64,7 @@ support channels. Use one of the above links instead. DISCLAIMER: This log DOES contain details about your system, including networking settings. However, NO passwords or other sensitive data are included in the debug output. -=========================================================================================" +========================================================================================" function _main() { _parse_params "$@" @@ -130,14 +130,31 @@ function _system_info() { _log_write "Memory Usage: ${free_mem}%" } -# Outputs installed package versions +# Fetch installed package versions function _packages_info() { - local php_version=$(php -v | grep -oP "PHP \K[0-9]+\.[0-9]+.*") - local dnsmasq_version=$(dnsmasq -v | grep -oP "Dnsmasq version \K[0-9]+\.[0-9]+") - local dhcpcd_version=$(dhcpcd --version | grep -oP '\d+\.\d+\.\d+') - local lighttpd_version=$(lighttpd -v | grep -oP '(\d+\.\d+\.\d+)') - local vnstat_version=$(vnstat -v | grep -oP "vnStat \K[0-9]+\.[0-9]+") - _log_separator "Installed Packaged" + local php_version="Not present" + local dnsmasq_version="Not present" + local dhcpcd_version="Not present" + local lighttpd_version="Not present" + local vnstat_version="Not present" + + if [ -x "$(command -v php)" ]; then + php_version=$(php -v | grep -oP "PHP \K[0-9]+\.[0-9]+.*") + fi + if [ -x "$(command -v dnsmasq)" ]; then + dnsmasq_version=$(dnsmasq -v | grep -oP "Dnsmasq version \K[0-9]+\.[0-9]+") + fi + if [ -x "$(command -v dhcpcd)" ]; then + dhcpcd_version=$(dhcpcd --version | grep -oP '\d+\.\d+\.\d+') + fi + if [ -x "$(command -v dhcpcd)" ]; then + lighttpd_version=$(lighttpd -v | grep -oP '(\d+\.\d+\.\d+)') + fi + if [ -x "$(command -v dhcpcd)" ]; then + vnstat_version=$(vnstat -v | grep -oP "vnStat \K[0-9]+\.[0-9]+") + fi + + _log_separator "Installed Packages" _log_write "PHP Version: ${php_version}" _log_write "Dnsmasq Version: ${dnsmasq_version}" _log_write "dhcpcd Version: ${dhcpcd_version}" @@ -147,9 +164,20 @@ function _packages_info() { # Outputs installed RaspAP version & settings function _raspap_info() { - local version=$(grep "RASPI_VERSION" $install_dir/includes/defaults.php | awk -F"'" '{print $4}') - local hostapd_ini=$(cat ${RASPAP_HOSTAPD} || echo "Not present") - local provider_ini=$(cat ${RASPAP_PROVIDER} || echo "Not present") + local version="Not present" + local hostapd_ini="Not present" + local provider_ini="Not present" + + if [ -f ${install_dir}/includes/defaults.php ]; then + version=$(grep "RASPI_VERSION" $install_dir/includes/defaults.php | awk -F"'" '{print $4}') + fi + if [ -f ${RASPAP_HOSTAPD} ]; then + hostapd_ini=$(cat ${RASPAP_HOSTAPD}) + fi + if [ -f ${RASPAP_PROVIDER} ]; then + provider_ini=$(cat ${RASPAP_PROVIDER}) + fi + _log_separator "RaspAP Install" _log_write "RaspAP Version: ${version}" _log_write "RaspAP Installation Directory: ${install_dir}" @@ -210,7 +238,7 @@ function _iw_dev_info() { function _routing_info() { local stdout=$(ip route) - _log_separator "Routing Info" + _log_separator "Routing Table" _log_write "${stdout}" }