diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-05-08 23:15:50 -0600 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-05-09 00:29:53 -0600 |
commit | 7f236c79570642d466c5acab890b26c3a07f4f7a (patch) | |
tree | efae9b46fc54a72fb408e56a0fb11960f0ebfb97 /src/wg-quick/darwin.bash | |
parent | systemd: add wg-quick.target (diff) | |
download | wireguard-tools-7f236c79570642d466c5acab890b26c3a07f4f7a.tar.xz wireguard-tools-7f236c79570642d466c5acab890b26c3a07f4f7a.zip |
wg-quick: support dns search domains
If DNS= has an IP in it, treat it as a DNS server. If DNS= has a non-IP
in it, treat it as a DNS search domain.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/wg-quick/darwin.bash')
-rwxr-xr-x | src/wg-quick/darwin.bash | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/src/wg-quick/darwin.bash b/src/wg-quick/darwin.bash index d9d07cf..cde1b54 100755 --- a/src/wg-quick/darwin.bash +++ b/src/wg-quick/darwin.bash @@ -18,6 +18,7 @@ INTERFACE="" ADDRESSES=( ) MTU="" DNS=( ) +DNS_SEARCH=( ) TABLE="" PRE_UP=( ) POST_UP=( ) @@ -43,7 +44,7 @@ die() { CONFIG_SEARCH_PATHS=( /etc/wireguard /usr/local/etc/wireguard ) parse_options() { - local interface_section=0 line key value stripped path + local interface_section=0 line key value stripped path v CONFIG_FILE="$1" if [[ $CONFIG_FILE =~ ^[a-zA-Z0-9_=+.-]{1,15}$ ]]; then for path in "${CONFIG_SEARCH_PATHS[@]}"; do @@ -67,7 +68,9 @@ parse_options() { case "$key" in Address) ADDRESSES+=( ${value//,/ } ); continue ;; MTU) MTU="$value"; continue ;; - DNS) DNS+=( ${value//,/ } ); continue ;; + DNS) for v in ${value//,/ }; do + [[ $v =~ (^[0-9.]+$)|(^.*:.*$) ]] && DNS+=( $v ) || DNS_SEARCH+=( $v ) + done; continue ;; Table) TABLE="$value"; continue ;; PreUp) PRE_UP+=( "$value" ); continue ;; PreDown) PRE_DOWN+=( "$value" ); continue ;; @@ -213,6 +216,7 @@ collect_endpoints() { } declare -A SERVICE_DNS +declare -A SERVICE_DNS_SEARCH collect_new_service_dns() { local service get_response local -A found_services @@ -223,10 +227,16 @@ collect_new_service_dns() { get_response="$(cmd networksetup -getdnsservers "$service")" [[ $get_response == *" "* ]] && get_response="Empty" [[ -n $get_response ]] && SERVICE_DNS["$service"]="$get_response" + get_response="$(cmd networksetup -getsearchdomains "$service")" + [[ $get_response == *" "* ]] && get_response="Empty" + [[ -n $get_response ]] && SERVICE_DNS_SEARCH["$service"]="$get_response" done; } < <(networksetup -listallnetworkservices) for service in "${!SERVICE_DNS[@]}"; do - [[ -n ${found_services["$service"]} ]] || unset SERVICE_DNS["$service"] + if ! [[ -n ${found_services["$service"]} ]]; then + unset SERVICE_DNS["$service"] + unset SERVICE_DNS_SEARCH["$service"] + fi done } @@ -287,7 +297,14 @@ set_dns() { for service in "${!SERVICE_DNS[@]}"; do while read -r response; do [[ $response == *Error* ]] && echo "$response" >&2 - done < <(cmd networksetup -setdnsservers "$service" "${DNS[@]}") + done < <( + cmd networksetup -setdnsservers "$service" "${DNS[@]}" + if [[ ${#DNS_SEARCH[@]} -eq 0 ]]; then + cmd networksetup -setsearchdomains "$service" Empty + else + cmd networksetup -setsearchdomains "$service" "${DNS_SEARCH[@]}" + fi + ) done } @@ -296,7 +313,10 @@ del_dns() { for service in "${!SERVICE_DNS[@]}"; do while read -r response; do [[ $response == *Error* ]] && echo "$response" >&2 - done < <(cmd networksetup -setdnsservers "$service" ${SERVICE_DNS["$service"]} || true) + done < <( + cmd networksetup -setdnsservers "$service" ${SERVICE_DNS["$service"]} || true + cmd networksetup -setsearchdomains "$service" ${SERVICE_DNS_SEARCH["$service"]} || true + ) done } |