[pve] Weekly backup 2026-07-05 — 20 files changed, 228 insertions(+), 71 deletions(-)

pve/scripts/jarvis-phone-probe.sh

@@ -3,9 +3,13 @@
 # Pings all Yealink phones + checks FusionPBX SIP registration (read-only)
 # 200.3 is on an external FusionPBX — ping only, no SIP check
 
-JARVIS_URL="https://165.22.1.228"
+JARVIS_URL="http://10.48.200.211"
 JARVIS_HOST="jarvis.orbishosting.com"
-REG_KEY="f846a9aaf7ce9a61742c63c87c4186052a71d2a580c65518"
+REG_KEY=$(cat /etc/jarvis-agent/reg-key 2>/dev/null)
+if [ -z "$REG_KEY" ]; then
+    echo "$(date): ERROR: /etc/jarvis-agent/reg-key not found" >&2
+    exit 1
+fi
 FUSION_HOST="134.209.72.226"
 
 # IP|alias|extension(none=skip SIP check)|mac
@@ -21,19 +25,17 @@ PHONES=(
 REG_OUTPUT=$(ssh -o StrictHostKeyChecking=no -o ConnectTimeout=5 -o BatchMode=yes \
   root@$FUSION_HOST "fs_cli -x 'show registrations'" 2>/dev/null || echo "")
 
-DEVICES="["
-FIRST=1
+# Collect results as TSV, delegate JSON building to python3 to avoid injection
+RESULTS=""
 for PHONE in "${PHONES[@]}"; do
   IFS='|' read -r IP ALIAS EXT MAC <<< "$PHONE"
 
-  # Ping probe
   if ping -c 1 -W 2 "$IP" > /dev/null 2>&1; then
     STATUS="online"
   else
     STATUS="offline"
   fi
 
-  # SIP check — skip for external phones (ext=none)
   if [ "$EXT" = "none" ]; then
     SIP="external"
   elif [ -n "$REG_OUTPUT" ] && echo "$REG_OUTPUT" | grep -q "^${EXT},"; then
@@ -42,15 +44,31 @@ for PHONE in "${PHONES[@]}"; do
     SIP="unregistered"
   fi
 
-  [ $FIRST -eq 0 ] && DEVICES+=","
-  DEVICES+="{\"ip\":\"$IP\",\"alias\":\"$ALIAS\",\"mac\":\"$MAC\",\"vendor\":\"Yealink\",\"status\":\"$STATUS\",\"sip_status\":\"$SIP\",\"extension\":\"$EXT\"}"
-  FIRST=0
+  RESULTS="${RESULTS}${IP}\t${ALIAS}\t${MAC}\t${STATUS}\t${SIP}\t${EXT}\n"
 done
-DEVICES+="]"
+
+JSON=$(printf "%b" "$RESULTS" | python3 -c "
+import sys, json
+devices = []
+for line in sys.stdin:
+    line = line.rstrip('\n')
+    if not line:
+        continue
+    parts = line.split('\t')
+    if len(parts) < 6:
+        continue
+    ip, alias, mac, status, sip, ext = parts[:6]
+    devices.append({
+        'ip': ip, 'alias': alias, 'mac': mac,
+        'vendor': 'Yealink', 'status': status,
+        'sip_status': sip, 'extension': ext,
+    })
+print(json.dumps({'devices': devices}))
+")
 
 curl -sk --max-time 10 \
   -X POST "$JARVIS_URL/api/netscan" \
   -H "Host: $JARVIS_HOST" \
   -H "Content-Type: application/json" \
   -H "X-Registration-Key: $REG_KEY" \
-  -d "{\"devices\":$DEVICES}" > /dev/null 2>&1
+  -d "$JSON" > /dev/null 2>&1