🌴 Sync 2026-10-30 02:13:56

luci-app-openvpn-plus/root/etc/hotplug.d/iface/35-luci-app-openvpn-plus-bootup

@@ -14,7 +14,7 @@ if [ "$ACTION" != "ifup" ]; then
     exit 0
 fi
 
-# STRIP LOOPBACK: Ignore the internal system loopback to prevent a premature trigger
+# Ignore the internal system loopback to prevent a premature trigger
 if [ "$INTERFACE" = "loopback" ]; then
     exit 0
 fi
@@ -23,51 +23,65 @@ LOCK_FILE="/var/run/luci-app-openvpn-plus-bootup.lock"
 
 # Mutex implementation preventing parallel execution threads from racing each other
 if [ -f "$LOCK_FILE" ]; then
-    # Clean verification via signal 0: check if the holding PID is still alive
-    if kill -0 $(cat "$LOCK_FILE" 2>/dev/null) 2>/dev/null; then
+    # check if the holding PID is still alive
+    lock_pid=$(cat "$LOCK_FILE" 2>/dev/null)
+    if [ -n "$lock_pid" ] && kill -0 "$lock_pid" 2>/dev/null; then
         exit 0
     fi
 fi
 
 # Register active PID into the lock file to serialize the bootup checks
-echo "$$" > "$LOCK_FILE"
+printf "%s\n" "$$" > "$LOCK_FILE"
 
 # Set traps to delete the lock file reliably on unexpected script exits
-trap "rm -f $LOCK_FILE" EXIT INT TERM
+trap 'rm -f "$LOCK_FILE"' EXIT INT TERM
 
 logger -t openvpn-luci "Bootup: Interface '${INTERFACE}' is up. Checking active OpenVPN profile running state in 10 seconds..."
 
 # Give the system firewall and routing tables enough time to init
 sleep 10
 
-# Loop through all configured openvpn sections inside the UCI configuration
-uci -q show openvpn | grep "=openvpn" | while read -r line; do
-    # Extract the pure instance identity string from the current UCI line
-    inst="${line##*.}"
-    inst="${inst%%=*}"
+openvpn_sections=$(uci -q show openvpn | awk -F'[.=]' '/=openvpn$/ {print $2}')
 
-    # Process the instance only if it is explicitly enabled by the user
-    if [ "$(uci -q get openvpn.${inst}.enabled)" = "1" ]; then
-        # Bulletproof process check utilizing the immune syslog tag pattern
-        if ! ps | grep -v "grep" | grep -q "openvpn(${inst})"; then
-            logger -t openvpn-luci "Bootup: Detected unstarted instance '${inst}'. Initializing process."
+# Exit if no OpenVPN sections exist
+if [ -z "$openvpn_sections" ]; then
+	rm -f "$LOCK_FILE"
+	trap - EXIT INT TERM
+	exit 0
+fi
 
-            # Restart the service cleanly to clear out any dead zombie states or locked ports
-			/etc/init.d/openvpn stop "$inst" >/dev/null 2>&1
-			sleep 1 >/dev/null 2>&1
-            /etc/init.d/openvpn restart "$inst" >/dev/null 2>&1
-			sleep 1 >/dev/null 2>&1
-			/etc/init.d/openvpn reload "$inst" >/dev/null 2>&1
-        else
-            logger -t openvpn-luci "Bootup: Instance '${inst}' is already running safely."
-        fi
-    fi
+# Get the current process list
+proc_dump=$(ps)
+
+# Loop through all configured openvpn sections
+for inst in $openvpn_sections; do
+	[ -z "$inst" ] && continue
+
+	# Process the instance only if it is explicitly enabled by the user
+	if [ "$(uci -q get openvpn."$inst".enabled)" = "1" ]; then
+		case "$proc_dump" in
+			*"openvpn(${inst})"* )
+				logger -t openvpn-luci "Bootup: Instance '${inst}' is already running safely."
+				;;
+			*)
+				logger -t openvpn-luci "Bootup: Detected unstarted instance '${inst}'. Initializing process."
+
+				# Restart the service cleanly to clear out any dead zombie states or locked ports
+				/etc/init.d/openvpn stop "$inst" >/dev/null 2>&1
+				sleep 1
+				/etc/init.d/openvpn restart "$inst" >/dev/null 2>&1
+				sleep 1
+				/etc/init.d/openvpn reload "$inst" >/dev/null 2>&1
+				;;
+		esac
+	fi
 done
 
-# Delete the lock file manually after successful execution
+# Delete the lock file and reset all traps to system default values before exiting
 rm -f "$LOCK_FILE"
-
-# Unregister and reset all traps to system default values before exiting
 trap - EXIT INT TERM
 
 exit 0
+
+# Debug: Manual hotplug simulation (e.g. wan up):
+# ACTION="ifup" INTERFACE="wan" ash -x /etc/hotplug.d/iface/35-luci-app-openvpn-plus-bootup

luci-app-openvpn-plus/root/etc/hotplug.d/openvpn/35-luci-app-openvpn-plus-lifecycle

@@ -6,7 +6,7 @@
 # This is free software, licensed under the Apache License, Version 2.0.
 # See /LICENSE for more information.
 #
-# luci-app-openvpn-plus : OpenWrt hotplug lifecycle manager for ddns server and client common name
+# luci-app-openvpn-plus : hotplug lifecycle manager for ddns server and client common name
 # /etc/hotplug.d/openvpn/35-luci-app-openvpn-plus-lifecycle
 
 # Ensure we catch the active OpenVPN name context across all OpenWrt variants
@@ -25,12 +25,12 @@ PID_FILE="/var/run/openvpn-ddns-${ovpn_instance}.pid"
 case "$ACTION" in
 
     up)
-
 	    inst_role=$(uci -q get openvpn."$ovpn_instance".role)
 
 		# Save the active interface name into the OpenWrt UCI configuration
 		if [ "$inst_role" = "server" ] || [ "$inst_role" = "client" ]; then
 			if [ -n "$ovpn_dev" ]; then
+				# Only write and commit if the devname actually changed
 				current_devname=$(uci -q get openvpn."$ovpn_instance".devname)
 				if [ "$current_devname" != "$ovpn_dev" ]; then
 					uci -q set openvpn."$ovpn_instance".devname="$ovpn_dev"
@@ -60,40 +60,52 @@ case "$ACTION" in
 					start-stop-daemon -S -b -m -p "$PID_FILE" -x /usr/libexec/luci-app-openvpn-plus -- ddnsservice "$domain" "$url" "$ovpn_instance"
 				fi
 			fi
+
 		# CLIENT: EXTRACT COMMON NAME
         elif [ "$inst_role" = "client" ]; then
 			cn_update="0"
-            # Extract the last connection initiation line from logread for this specific instance
-            log_line=$(logread | grep "openvpn(${ovpn_instance})" | grep "Peer Connection Initiated" | tail -n 1)
 
-            if [ -n "$log_line" ]; then
-                # Parse the pure CN string from inside the brackets (Example: [OfficeServer] -> OfficeServer)
-                server_cn=$(echo "$log_line" | sed -n 's/.*: \[\([^]]*\)\].*Peer Connection Initiated.*/\1/p')
+			# Let logread stream only the lines belonging to this specific instance.
+			log_line=$(logread -e "openvpn(${ovpn_instance})" | grep "Peer Connection Initiated" | tail -n 1)
 
-                if [ -n "$server_cn" ]; then
-                    # Write the resolved Common Name safely into the OpenWrt UCI configuration
-                    uci -q set openvpn."$ovpn_instance".server_common_name="$server_cn"
-                    uci commit openvpn
+			if [ -n "$log_line" ]; then
+				# Parse the pure CN string from inside the brackets (Example: [OfficeServer] -> OfficeServer)
+				server_cn=$(echo "$log_line" | sed -n 's/.*\[\([^]]*\)\].*Peer Connection Initiated.*/\1/p')
+
+				if [ -n "$server_cn" ]; then
+					# Only write and commit if the Common Name actually changed
+					current_cn=$(uci -q get openvpn."$ovpn_instance".server_common_name)
+					if [ "$current_cn" != "$server_cn" ]; then
+						uci -q set openvpn."$ovpn_instance".server_common_name="$server_cn"
+						uci commit openvpn
+						logger -t openvpn-luci "Hotplug (${ovpn_instance}): set server_common_name ${server_cn}"
+					fi
 					cn_update="1"
-                fi
-            fi
-            if [ "$cn_update" = "1" ]; then
-                logger -t openvpn-luci "Hotplug (${ovpn_instance}): Server Common Name '${server_cn}' resolved"
-            else
-                logger -t openvpn-luci "Hotplug (${ovpn_instance}): Server Common Name not found in Peer Connection log entry"
-            fi
-        fi
+				fi
+			fi
+
+			if [ "$cn_update" = "1" ]; then
+				logger -t openvpn-luci "Hotplug (${ovpn_instance}): Server Common Name '${server_cn}' resolved"
+			else
+				logger -t openvpn-luci "Hotplug (${ovpn_instance}): Server Common Name not found in Peer Connection log entry"
+			fi
+		fi
         ;;
 
     route-pre-down|down)
-
 		# Clean application stop via standard system manager signals
 		if start-stop-daemon -K -q -p "$PID_FILE" -t 2>/dev/null; then
 			logger -t openvpn-luci "Hotplug: Stopping DDNS service for ${ovpn_instance} because tunnel is down."
 			start-stop-daemon -K -q -p "$PID_FILE" 2>/dev/null
 		fi
 		rm -f "$PID_FILE"
-
+		;;
 esac
 
 exit 0
+
+# Debug: Manual hotplug simulation (e.g. instance1 up):
+# ACTION="up" INSTANCE="instance1" dev="tun0" ash -x /etc/hotplug.d/openvpn/35-luci-app-openvpn-plus-lifecycle
+
+# Debug: Manual hotplug simulation (e.g. instance1 down):
+# ACTION="down" INSTANCE="instance1" dev="tun0" ash -x /etc/hotplug.d/openvpn/35-luci-app-openvpn-plus-lifecycle