fb33aa1b6d
- fw/wg events: raw_ip → resolved_name annotation (dim) - fw events: endpoint column with pre-resolved names (two-pass render) - fw events: raw IP:port dim suffix after service name - wg events: endpoint annotation in logs (same as watch) - fw/wg: descending sort default, --ascending/--descending flags - wg events: gap/offline indicator, threshold * 2 for offline label - fw_row: no-endpoint rows show dim — placeholder for alignment - section headers: dynamic width via tput cols
245 lines
No EOL
8.5 KiB
Bash
245 lines
No EOL
8.5 KiB
Bash
#!/usr/bin/env bash
|
|
# ui/logs.module.sh — rendering for logs and watch data
|
|
|
|
function ui::logs::build_dest() {
|
|
local dest_ip="${1:-}" dest_port="${2:-}" proto="${3:-}" svc="${4:-}"
|
|
if [[ -n "$svc" ]]; then
|
|
[[ -n "$dest_port" ]] && echo "${svc}/${proto}" || echo "${svc} (${proto})"
|
|
else
|
|
[[ -n "$dest_port" ]] && echo "${dest_ip}:${dest_port}/${proto}" || echo "${dest_ip} (${proto})"
|
|
fi
|
|
}
|
|
|
|
function ui::logs::fw_section_header() {
|
|
local cols=$(( $(tput cols 2>/dev/null || echo 80) - 4 ))
|
|
printf " Firewall Drops\n"
|
|
printf " %s\n" "$(printf '─%.0s' $(seq 1 $cols))"
|
|
}
|
|
|
|
function ui::logs::wg_section_header() {
|
|
local cols=$(( $(tput cols 2>/dev/null || echo 80) - 4 ))
|
|
printf " WireGuard Events\n"
|
|
printf " %s\n" "$(printf '─%.0s' $(seq 1 $cols))"
|
|
}
|
|
|
|
function ui::logs::fw_section_header_table() {
|
|
printf " Firewall Drops:\n"
|
|
printf " %-20s %-18s %-25s %s\n" "TIME" "CLIENT" "DESTINATION" "PROTOCOL"
|
|
printf " %s\n" "$(printf '─%.0s' {1..75})"
|
|
}
|
|
|
|
function ui::logs::wg_section_header_table() {
|
|
printf " WireGuard Events:\n"
|
|
printf " %-20s %-20s %-18s %s\n" "TIME" "CLIENT" "ENDPOINT" "EVENT"
|
|
printf " %s\n" "$(printf '─%.0s' {1..75})"
|
|
}
|
|
|
|
function ui::logs::fw_row() {
|
|
local ts="${1:-}" client="${2:-}" dest_ip="${3:-}" dest_port="${4:-}" \
|
|
proto="${5:-}" svc_name="${6:-}" count="${7:-1}" \
|
|
w_client="${8:-20}" w_dest="${9:-30}" \
|
|
src_endpoint="${10:-}" src_resolved="${11:-}" w_endpoint="${12:-0}"
|
|
|
|
local ts_pad client_pad
|
|
ts_pad=$(printf "%-11s" "$ts")
|
|
client_pad=$(printf "%-${w_client}s" "$client")
|
|
|
|
# ── Source endpoint — always render at w_endpoint width ──
|
|
local src_padded=""
|
|
if [[ "$w_endpoint" -gt 0 ]]; then
|
|
if [[ -n "$src_endpoint" ]]; then
|
|
local src_colored="$src_endpoint"
|
|
[[ -n "$src_resolved" ]] && \
|
|
src_colored="${src_endpoint} \033[2m→ ${src_resolved}\033[0m"
|
|
src_padded=$(ui::pad_mb "$src_colored" "$w_endpoint")
|
|
else
|
|
# No endpoint — use dim dash padded to w_endpoint
|
|
src_padded=$(ui::pad_mb "\033[2m—\033[0m" "$w_endpoint")
|
|
fi
|
|
fi
|
|
|
|
# ── Destination ──
|
|
local svc_display=""
|
|
local raw_suffix=""
|
|
if [[ -n "$svc_name" ]]; then
|
|
[[ -n "$dest_port" ]] && svc_display="${svc_name}/${proto}" \
|
|
|| svc_display="${svc_name} (${proto})"
|
|
[[ -n "$dest_port" ]] && raw_suffix=" \033[2m(${dest_ip}:${dest_port})\033[0m" \
|
|
|| raw_suffix=" \033[2m(${dest_ip})\033[0m"
|
|
else
|
|
[[ -n "$dest_port" ]] && svc_display="${dest_ip}:${dest_port}/${proto}" \
|
|
|| svc_display="${dest_ip} (${proto})"
|
|
fi
|
|
|
|
# Pad so count aligns — based on full dest (svc + raw_suffix plain length)
|
|
local raw_plain=""
|
|
[[ -n "$svc_name" && -n "$dest_port" ]] && raw_plain=" (${dest_ip}:${dest_port})"
|
|
[[ -n "$svc_name" && -z "$dest_port" ]] && raw_plain=" (${dest_ip})"
|
|
local full_dest_len=$(( ${#svc_display} + ${#raw_plain} ))
|
|
local dest_pad_n=$(( w_dest - full_dest_len ))
|
|
[[ $dest_pad_n -lt 0 ]] && dest_pad_n=0
|
|
|
|
# ── Count ──
|
|
local count_suffix=""
|
|
[[ "$count" -gt 1 ]] && count_suffix=" \033[2m(x${count})\033[0m"
|
|
|
|
# ── Render ──
|
|
if [[ "$w_endpoint" -gt 0 ]]; then
|
|
printf " %s %s %b \033[1;31m→\033[0m %s%b%*s%b\n" \
|
|
"$ts_pad" "$client_pad" \
|
|
"$src_padded" \
|
|
"$svc_display" "$raw_suffix" \
|
|
"$dest_pad_n" "" \
|
|
"$count_suffix"
|
|
else
|
|
printf " %s %s \033[1;31m→\033[0m %s%b%*s%b\n" \
|
|
"$ts_pad" "$client_pad" \
|
|
"$svc_display" "$raw_suffix" \
|
|
"$dest_pad_n" "" \
|
|
"$count_suffix"
|
|
fi
|
|
}
|
|
|
|
function ui::logs::fw_row_table() {
|
|
local ts="${1:-}" client="${2:-}" dst="${3:-}" proto="${4:-}" count="${5:-1}"
|
|
local count_str=""
|
|
[[ "$count" -gt 1 ]] && count_str=" (x${count})"
|
|
printf " %-20s %-18s %-25s %s%s\n" "$ts" "$client" "$dst" "$proto" "$count_str"
|
|
}
|
|
|
|
function ui::logs::wg_row() {
|
|
local ts="${1:-}" client="${2:-}" endpoint="${3:-}" event="${4:-}" \
|
|
count="${5:-1}" w_client="${6:-20}" w_endpoint="${7:-20}" \
|
|
gap_seconds="${8:-}" resolved="${9:-}"
|
|
|
|
local event_color
|
|
case "$event" in
|
|
handshake) event_color="\033[1;32m" ;;
|
|
attempt) event_color="\033[1;31m" ;;
|
|
*) event_color="\033[0;37m" ;;
|
|
esac
|
|
|
|
local count_suffix=""
|
|
[[ "$count" -gt 1 ]] && count_suffix=" \033[2m(x${count})\033[0m"
|
|
|
|
# Gap suffix — offline label only when gap > threshold * 2
|
|
local gap_suffix=""
|
|
if [[ "$event" == "handshake" && -n "$gap_seconds" && "$gap_seconds" -gt 0 ]]; then
|
|
local gap_int="$gap_seconds"
|
|
local threshold="${WG_HANDSHAKE_CHECK_TIME_SEC:-300}"
|
|
local offline_label=""
|
|
[[ "$gap_int" -gt $(( threshold * 2 )) ]] && offline_label=" offline"
|
|
if (( gap_int >= 3600 )); then
|
|
gap_suffix=" \033[2m↑ $(( gap_int / 3600 ))h${offline_label}\033[0m"
|
|
elif (( gap_int >= 60 )); then
|
|
gap_suffix=" \033[2m↑ $(( gap_int / 60 ))m${offline_label}\033[0m"
|
|
fi
|
|
fi
|
|
|
|
# Build endpoint display: raw_ip [dim → resolved]
|
|
# Use ui::pad_mb so ANSI annotation doesn't affect column alignment
|
|
local endpoint_raw="${endpoint:--}"
|
|
local endpoint_colored
|
|
if [[ -n "$resolved" && -n "$endpoint" ]]; then
|
|
endpoint_colored="${endpoint} \033[2m→ ${resolved}\033[0m"
|
|
else
|
|
endpoint_colored="$endpoint_raw"
|
|
fi
|
|
local endpoint_padded
|
|
endpoint_padded=$(ui::pad_mb "$endpoint_colored" "$w_endpoint")
|
|
|
|
local ts_pad client_pad
|
|
ts_pad=$(printf "%-11s" "$ts")
|
|
client_pad=$(printf "%-${w_client}s" "$client")
|
|
|
|
printf " %s %s %b %b%s\033[0m%b%b\n" \
|
|
"$ts_pad" "$client_pad" \
|
|
"$endpoint_padded" \
|
|
"$event_color" "$event" "$count_suffix" "$gap_suffix"
|
|
}
|
|
|
|
function ui::logs::wg_row_table() {
|
|
local ts="${1:-}" client="${2:-}" endpoint="${3:-}" event="${4:-}" count="${5:-1}"
|
|
local count_str=""
|
|
[[ "$count" -gt 1 ]] && count_str=" (x${count})"
|
|
local event_colored
|
|
case "$event" in
|
|
attempt*) event_colored="\033[1;31m${event}\033[0m" ;;
|
|
handshake*) event_colored="\033[1;32m${event}\033[0m" ;;
|
|
*) event_colored="$event" ;;
|
|
esac
|
|
printf " %-20s %-20s %-18s %b%s\n" "$ts" "$client" "$endpoint" "$event_colored" "$count_str"
|
|
}
|
|
|
|
_UI_WATCH_FW_COLOR="\033[1;31m"
|
|
_UI_WATCH_WG_COLOR="\033[1;32m"
|
|
|
|
function ui::watch::fw_row() {
|
|
local ts="${1:-}" client="${2:-}" dest_display="${3:-}" \
|
|
w_client="${4:-20}" w_dest="${5:-18}"
|
|
|
|
# "fw" is always 2 visible chars — no padding needed
|
|
local src="${_UI_WATCH_FW_COLOR}fw\033[0m"
|
|
|
|
local ts_pad client_pad dest_pad_n
|
|
ts_pad=$(printf "%-11s" "$ts")
|
|
client_pad=$(printf "%-${w_client}s" "$client")
|
|
dest_pad_n=$(( w_dest - ${#dest_display} ))
|
|
[[ $dest_pad_n -lt 0 ]] && dest_pad_n=0
|
|
|
|
printf " %s %b %s \033[1;31m→\033[0m %s%*s \033[1;31mdrop\033[0m\n" \
|
|
"$ts_pad" "$src" "$client_pad" "$dest_display" "$dest_pad_n" ""
|
|
}
|
|
|
|
function ui::watch::wg_row() {
|
|
local ts="${1:-}" client="${2:-}" endpoint="${3:-}" event="${4:-}" \
|
|
w_client="${5:-20}" w_endpoint="${6:-18}"
|
|
|
|
local event_color
|
|
case "$event" in
|
|
handshake) event_color="\033[1;32m" ;;
|
|
attempt) event_color="\033[1;31m" ;;
|
|
*) event_color="\033[0;37m" ;;
|
|
esac
|
|
|
|
# "wg" is always 2 visible chars — no padding needed
|
|
local src="${_UI_WATCH_WG_COLOR}wg\033[0m"
|
|
|
|
# Use "-" not "—" to avoid multi-byte padding issues
|
|
local endpoint_display="${endpoint:--}"
|
|
|
|
local ts_pad client_pad endpoint_pad_n
|
|
ts_pad=$(printf "%-11s" "$ts")
|
|
client_pad=$(printf "%-${w_client}s" "$client")
|
|
endpoint_pad_n=$(( w_endpoint - ${#endpoint_display} ))
|
|
[[ $endpoint_pad_n -lt 0 ]] && endpoint_pad_n=0
|
|
|
|
printf " %s %b %s %s%*s %b%s\033[0m\n" \
|
|
"$ts_pad" "$src" "$client_pad" "$endpoint_display" "$endpoint_pad_n" "" \
|
|
"$event_color" "$event"
|
|
}
|
|
|
|
|
|
function ui::watch::header_table() {
|
|
printf "\n %-20s %-8s %-22s %-28s %-14s %s\n" \
|
|
"TIME" "SOURCE" "CLIENT" "DESTINATION/ENDPOINT" "EVENT" "STATUS"
|
|
printf " %s\n\n" "$(printf '─%.0s' {1..105})"
|
|
}
|
|
|
|
function ui::watch::fw_row_table() {
|
|
local ts="${1:-}" client="${2:-}" dest="${3:-}" event="${4:-}" status="${5:-}"
|
|
printf " %-20s %-8s %-22s %-28s \033[1;31m%-14s\033[0m %s\n" \
|
|
"$ts" "firewall" "$client" "$dest" "$event" "$status"
|
|
}
|
|
|
|
function ui::watch::wg_row_table() {
|
|
local ts="${1:-}" client="${2:-}" endpoint="${3:-}" event="${4:-}" status="${5:-}"
|
|
local event_color
|
|
case "$event" in
|
|
handshake) event_color="\033[1;32m" ;;
|
|
attempt) event_color="\033[1;31m" ;;
|
|
*) event_color="\033[0;37m" ;;
|
|
esac
|
|
printf " %-20s %-8s %-22s %-28s %b%-14s\033[0m %s\n" \
|
|
"$ts" "wireguard" "$client" "$endpoint" "$event_color" "$event" "$status"
|
|
} |