|
|
|
|
@@ -535,9 +535,32 @@ _openvpn_down() {
|
|
|
|
|
pkill -f "openvpn --config ${config["ConfigFile"]}" || true
|
|
|
|
|
# Safety-net cleanup in case the --down callback was never invoked
|
|
|
|
|
_routing_del || true
|
|
|
|
|
# Safety-net: remove blackhole route for VPN server if postdown was never invoked
|
|
|
|
|
if [ -f "${OPENVPN_STATE_DIR}/server_ip" ]; then
|
|
|
|
|
local saved_ip
|
|
|
|
|
saved_ip=$(cat "${OPENVPN_STATE_DIR}/server_ip" 2>/dev/null || true)
|
|
|
|
|
if [ -n "${saved_ip}" ]; then
|
|
|
|
|
ip -4 route del blackhole "${saved_ip}/32" table "${config["Table"]}" 2>/dev/null || true
|
|
|
|
|
fi
|
|
|
|
|
rm -f "${OPENVPN_STATE_DIR}/server_ip"
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_openpvn_postup() {
|
|
|
|
|
_openvpn_postup() {
|
|
|
|
|
# Prevent recursive routing: add a blackhole route for the VPN server IP in
|
|
|
|
|
# table 1000. qBittorrent is bound to tun0, so its traffic is policy-routed
|
|
|
|
|
# into table 1000 (rule: from <tun_ip> -> table 1000). Without this, packets
|
|
|
|
|
# destined for the VPN server go through tun0, OpenVPN detects the loop and
|
|
|
|
|
# drops them. The blackhole makes qBittorrent's traffic to the server IP fail
|
|
|
|
|
# immediately (EHOSTUNREACH) instead of looping. OpenVPN itself is not bound
|
|
|
|
|
# to tun0, so its traffic uses the main table and reaches the server normally.
|
|
|
|
|
if [ -n "${trusted_ip:-}" ]; then
|
|
|
|
|
bashio::log.info "Adding blackhole route for VPN server ${trusted_ip} in table ${config["Table"]} to prevent recursive routing."
|
|
|
|
|
ip -4 route add blackhole "${trusted_ip}/32" table "${config["Table"]}" 2>/dev/null \
|
|
|
|
|
&& echo "${trusted_ip}" > "${OPENVPN_STATE_DIR}/server_ip" \
|
|
|
|
|
|| bashio::log.warning "Could not add blackhole route for VPN server ${trusted_ip}."
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Add routing rules for VPN interface and DNS servers
|
|
|
|
|
_routing_add || return 1
|
|
|
|
|
# Add firewall rules for VPN interface (only when UPnP port mapping is enabled)
|
|
|
|
|
@@ -548,7 +571,19 @@ _openpvn_postup() {
|
|
|
|
|
_resolvconf "update" || return 1
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_openpvn_postdown() {
|
|
|
|
|
_openvpn_postdown() {
|
|
|
|
|
# Remove blackhole route for VPN server (added in postup to prevent recursive routing)
|
|
|
|
|
local server_ip=""
|
|
|
|
|
if [ -n "${trusted_ip:-}" ]; then
|
|
|
|
|
server_ip="${trusted_ip}"
|
|
|
|
|
elif [ -f "${OPENVPN_STATE_DIR}/server_ip" ]; then
|
|
|
|
|
server_ip=$(cat "${OPENVPN_STATE_DIR}/server_ip" 2>/dev/null || true)
|
|
|
|
|
fi
|
|
|
|
|
if [ -n "${server_ip}" ]; then
|
|
|
|
|
ip -4 route del blackhole "${server_ip}/32" table "${config["Table"]}" 2>/dev/null || true
|
|
|
|
|
rm -f "${OPENVPN_STATE_DIR}/server_ip"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Update resolv.conf to remove VPN DNS servers
|
|
|
|
|
_resolvconf "reset" || true
|
|
|
|
|
# Remove routing rules for VPN interface and DNS servers
|
|
|
|
|
@@ -604,10 +639,10 @@ openvpn() {
|
|
|
|
|
bashio::log.info "OpenVPN on interface ${config["Interface"]} is down."
|
|
|
|
|
bashio::exit.ok 'OpenVPN stopped.'
|
|
|
|
|
elif [ "${mode}" = "postup" ]; then
|
|
|
|
|
_openpvn_postup
|
|
|
|
|
_openvpn_postup
|
|
|
|
|
bashio::exit.ok 'OpenVPN routes added.'
|
|
|
|
|
elif [ "${mode}" = "postdown" ]; then
|
|
|
|
|
_openpvn_postdown
|
|
|
|
|
_openvpn_postdown
|
|
|
|
|
bashio::exit.ok 'OpenVPN routes deleted.'
|
|
|
|
|
else
|
|
|
|
|
bashio::log.error "Invalid OpenVPN mode specified. Use 'up', 'down', 'postup', or 'postdown'."
|
|
|
|
|
|