avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-06-09 00:55:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve validation and error handling in svc-qbittorrent

Browse Source 
Refactor validation and error handling in WireGuard setup.
This commit is contained in:
Alexandre
2025-11-24 09:02:35 +01:00
committed by GitHub
parent 7ee0c3785e
commit b3be37640e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run
View File

@@ -30,9 +30,8 @@ _fetch_public_ip() {
resp=$(curl -fsS --max-time 5 "${url}" 2>/dev/null || true) resp=$(curl -fsS --max-time 5 "${url}" 2>/dev/null || true)
resp="${resp//[[:space:]]/}" resp="${resp//[[:space:]]/}"
# Validation (IPv4 or IPv6 regex) # Validate IPv4 or IPv6
if [[ "${resp}" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]] || \ if [[ "${resp}" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]] || [[ "${resp}" =~ ^[0-9a-fA-F:]+$ ]]; then
[[ "${resp}" =~ ^[0-9a-fA-F:]+$ ]]; then
printf '%s\n' "${resp}" printf '%s\n' "${resp}"
return 0 return 0
fi fi
@@ -134,7 +133,7 @@ _setup_wireguard() {
local wireguard_interface local wireguard_interface
wireguard_interface="$(cat "${WIREGUARD_STATE_DIR}/interface" 2>/dev/null || echo 'wg0')" wireguard_interface="$(cat "${WIREGUARD_STATE_DIR}/interface" 2>/dev/null || echo 'wg0')"
if ip link show "${wireguard_interface}" &> /dev/null; then if ip link show "${wireguard_interface}" >/dev/null 2>&1; then
bashio::log.warning "WireGuard interface ${wireguard_interface} already exists. Resetting." bashio::log.warning "WireGuard interface ${wireguard_interface} already exists. Resetting."
wg-quick down "${wireguard_config}" >/dev/null 2>&1 || true wg-quick down "${wireguard_config}" >/dev/null 2>&1 || true
fi fi
@@ -247,7 +246,8 @@ if bashio::config.true 'openvpn_enabled'; then
--pull-filter ignore "ifconfig-ipv6" \ --pull-filter ignore "ifconfig-ipv6" \
--pull-filter ignore "tun-ipv6" \ --pull-filter ignore "tun-ipv6" \
--pull-filter ignore "redirect-gateway ipv6" \ --pull-filter ignore "redirect-gateway ipv6" \
--pull-filter ignore "dhcp-option DNS6" --pull-filter ignore "dhcp-option DNS6" \
&
elif bashio::config.true 'wireguard_enabled'; then elif bashio::config.true 'wireguard_enabled'; then