avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-08-04 12:20:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(qbittorrent): prevent recursive routing by adding VPN server route to table 1000

Browse Source 
Agent-Logs-Url: https://github.com/alexbelgium/hassio-addons/sessions/a702f853-3b84-4896-b792-83ead5a511a6

Co-authored-by: alexbelgium <44178713+alexbelgium@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-05-13 07:59:12 +00:00
committed by GitHub
parent 134348bcfc
commit 96b21edf48
3 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qbittorrent/CHANGELOG.md
View File

@@ -1,5 +1,5 @@
## 5.2.0-17 (13-05-2026) ## 5.2.0-18 (13-05-2026)
- OpenVPN: fix "Recursive routing detected" by adding a host route for the VPN server endpoint via the physical gateway in the postup handler, preventing tunnel-bound sockets (qBittorrent on tun0) from sending traffic to the VPN server IP - OpenVPN: fix "Recursive routing detected" — previous fix added the VPN server host route only to the main routing table, which qBittorrent's traffic (policy-routed via `from <tun_ip> -> table 1000`) never consults; the route must also be added to table 1000 so the kernel selects the physical device, causing EHOSTUNREACH for the tun-bound qBittorrent socket
- Minor bugs fixed - Minor bugs fixed

2
qbittorrent/config.yaml
View File

@@ -143,4 +143,4 @@ schema:
slug: qbittorrent slug: qbittorrent
udev: true udev: true
url: https://github.com/alexbelgium/hassio-addons url: https://github.com/alexbelgium/hassio-addons
version: "5.2.0-17" version: "5.2.0-18"

42
qbittorrent/rootfs/usr/local/sbin/vpn
View File

@@ -535,41 +535,58 @@ _openvpn_down() {
pkill -f "openvpn --config ${config["ConfigFile"]}" || true pkill -f "openvpn --config ${config["ConfigFile"]}" || true
# Safety-net cleanup in case the --down callback was never invoked # Safety-net cleanup in case the --down callback was never invoked
_routing_del || true _routing_del || true
# Safety-net: remove host route for VPN server if postdown was never invoked # Safety-net: remove host routes for VPN server if postdown was never invoked
if [ -f "${OPENVPN_STATE_DIR}/server_ip" ]; then if [ -f "${OPENVPN_STATE_DIR}/server_ip" ]; then
local saved_ip local saved_ip
saved_ip=$(cat "${OPENVPN_STATE_DIR}/server_ip" 2>/dev/null || true) saved_ip=$(cat "${OPENVPN_STATE_DIR}/server_ip" 2>/dev/null || true)
if [ -n "${saved_ip}" ]; then if [ -n "${saved_ip}" ]; then
ip -4 route del "${saved_ip}/32" 2>/dev/null || true ip -4 route del "${saved_ip}/32" 2>/dev/null || true
ip -4 route del "${saved_ip}/32" table "${config["Table"]}" 2>/dev/null || true
fi fi
rm -f "${OPENVPN_STATE_DIR}/server_ip" rm -f "${OPENVPN_STATE_DIR}/server_ip"
fi fi
} }
_openvpn_postup() { _openvpn_postup() {
# Add explicit host route for VPN server endpoint to prevent recursive routing. # Add explicit host routes for VPN server endpoint to prevent recursive routing.
# With --route-noexec, OpenVPN skips adding its own host route for the remote # With --route-noexec, OpenVPN skips adding its own host route for the remote
# endpoint. Without it, sockets bound to the VPN interface (e.g. qBittorrent # endpoint. Without it, sockets bound to the VPN interface (e.g. qBittorrent
# bound to tun0) can send traffic destined for the VPN server IP through the # bound to tun0) can send traffic destined for the VPN server IP through the
# tunnel, which OpenVPN detects as recursive routing and logs as an error. # tunnel, which OpenVPN detects as recursive routing and logs as an error.
# Adding the /32 host route via the physical gateway makes the kernel reject #
# tunnel-bound sockets from sending to the VPN server IP (interface mismatch). # qBittorrent uses SO_BINDTODEVICE=tun0, so all its traffic matches the policy
# rule "from <tun_ip> -> table 1000". Table 1000 has "default dev tun0", so
# even a /32 host route for the VPN server in the *main* table is irrelevant –
# it is never consulted for qBittorrent's traffic. The /32 route must be added
# to table 1000 as well, pointing to the physical device. When the kernel
# selects the physical device as output but the socket is bound to tun0, it
# returns EHOSTUNREACH and the packet never reaches the tun device.
if [ -n "${trusted_ip:-}" ]; then if [ -n "${trusted_ip:-}" ]; then
# Validate that trusted_ip is a well-formed IPv4 address before using it # Validate that trusted_ip is a well-formed IPv4 address before using it
if ! ipcalc -c -4 "${trusted_ip}" >/dev/null 2>&1; then if ! ipcalc -c -4 "${trusted_ip}" >/dev/null 2>&1; then
bashio::log.warning "trusted_ip '${trusted_ip}' is not a valid IPv4 address; recursive routing protection skipped." bashio::log.warning "trusted_ip '${trusted_ip}' is not a valid IPv4 address; VPN server host route not added. Recursive routing may occur."
else else
local physical_gw local physical_gw physical_dev
# Exclude routes that use the VPN interface to find the physical gateway # Find physical default gateway and device, excluding the VPN interface.
# Field order from `ip route show default`: default via GW dev DEV ...
physical_gw=$(ip -4 route show default table main | awk -v iface="${config["Interface"]}" '$0 !~ iface && /via/ {print $3; exit}') physical_gw=$(ip -4 route show default table main | awk -v iface="${config["Interface"]}" '$0 !~ iface && /via/ {print $3; exit}')
if [ -n "${physical_gw}" ]; then physical_dev=$(ip -4 route show default table main | awk -v iface="${config["Interface"]}" '$0 !~ iface && /dev/ {for(i=1;i<=NF;i++) if($i=="dev") {print $(i+1); exit}}')
bashio::log.info "Adding host route for VPN server ${trusted_ip} via ${physical_gw} to prevent recursive routing." if [ -n "${physical_gw}" ] && [ -n "${physical_dev}" ]; then
bashio::log.info "Adding host route for VPN server ${trusted_ip} via ${physical_gw} (${physical_dev}) to prevent recursive routing."
local route_err local route_err
# Add to main routing table (belt)
route_err=$(ip -4 route add "${trusted_ip}/32" via "${physical_gw}" 2>&1) || \ route_err=$(ip -4 route add "${trusted_ip}/32" via "${physical_gw}" 2>&1) || \
bashio::log.warning "Could not add host route for VPN server ${trusted_ip}: ${route_err}" bashio::log.debug "Could not add main table route for ${trusted_ip} (may already exist): ${route_err}"
# Add to VPN routing table (suspenders): qBittorrent traffic from
# the tun IP is policy-routed into table 1000. Adding a /32 here
# for the VPN server overrides the "default dev tun0" catch-all and
# directs those packets to the physical device, causing EHOSTUNREACH
# for the tun-bound socket so no packet ever reaches the tunnel.
route_err=$(ip -4 route add "${trusted_ip}/32" via "${physical_gw}" dev "${physical_dev}" table "${config["Table"]}" 2>&1) || \
bashio::log.debug "Could not add VPN table route for ${trusted_ip} (may already exist): ${route_err}"
echo "${trusted_ip}" > "${OPENVPN_STATE_DIR}/server_ip" echo "${trusted_ip}" > "${OPENVPN_STATE_DIR}/server_ip"
else else
bashio::log.warning "Could not determine physical gateway; recursive routing protection skipped." bashio::log.warning "Could not determine physical gateway/device; VPN server host route not added. Recursive routing may occur."
fi fi
fi fi
fi fi
@@ -585,7 +602,7 @@ _openvpn_postup() {
} }
_openvpn_postdown() { _openvpn_postdown() {
# Remove host route for VPN server (added in postup to prevent recursive routing) # Remove host routes for VPN server (added in postup to prevent recursive routing)
local server_ip="" local server_ip=""
if [ -n "${trusted_ip:-}" ]; then if [ -n "${trusted_ip:-}" ]; then
server_ip="${trusted_ip}" server_ip="${trusted_ip}"
@@ -594,6 +611,7 @@ _openvpn_postdown() {
fi fi
if [ -n "${server_ip}" ]; then if [ -n "${server_ip}" ]; then
ip -4 route del "${server_ip}/32" 2>/dev/null || true ip -4 route del "${server_ip}/32" 2>/dev/null || true
ip -4 route del "${server_ip}/32" table "${config["Table"]}" 2>/dev/null || true
rm -f "${OPENVPN_STATE_DIR}/server_ip" rm -f "${OPENVPN_STATE_DIR}/server_ip"
fi fi