From: "cron2 (Code Review)" Date: Sat, 21 Jun 2025 12:30:35 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., heiko@...515..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <2efdd9d0dd3a461659f3ff67613082342fb93ee1-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="uVlvQ29elF4="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: dns: add updown script for macOS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: d12fk , plaisthos , flichtenheld Cc: openvpn-devel --uVlvQ29elF4= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#4) to the change originally created by= d12fk. ( http://gerrit.openvpn.net/c/openvpn/+/1062?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by plaisthos Change subject: dns: add updown script for macOS ...................................................................... dns: add updown script for macOS Change-Id: Iade06a8454ccf53668deef61f07217ead8ec6c63 Signed-off-by: Heiko Hund Acked-by: Arne Schwabe Message-Id: <20250621121301.27509-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31= 942.html Signed-off-by: Gert Doering --- M configure.ac M distro/dns-scripts/Makefile.am A distro/dns-scripts/macos-dns-updown.sh 3 files changed, 219 insertions(+), 2 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/62/1062/4 diff --git a/configure.ac b/configure.ac index 8bdec32..02b45f8 100644 --- a/configure.ac +++ b/configure.ac @@ -364,8 +364,7 @@ *-*-darwin*) AC_DEFINE([TARGET_DARWIN], [1], [Are we running on Mac OS X?]) AC_DEFINE_UNQUOTED([TARGET_PREFIX], ["M"], [Target prefix]) - AM_CONDITIONAL([ENABLE_DNS_UPDOWN], [false]) - AC_SUBST([DNS_UPDOWN_TYPE], ["resolvconf_file"]) + AC_SUBST([DNS_UPDOWN_TYPE], ["macos"]) have_tap_header=3D"yes" ac_cv_type_struct_in_pktinfo=3Dno ;; diff --git a/distro/dns-scripts/Makefile.am b/distro/dns-scripts/Makefile.am index 9fcd3f7..e3f9043 100644 --- a/distro/dns-scripts/Makefile.am +++ b/distro/dns-scripts/Makefile.am @@ -12,6 +12,7 @@ $(srcdir)/Makefile.in EXTRA_DIST =3D \ + macos-dns-updown.sh \ systemd-dns-updown.sh \ openresolv-dns-updown.sh \ haikuos_file-dns-updown.sh \ diff --git a/distro/dns-scripts/macos-dns-updown.sh b/distro/dns-scripts/ma= cos-dns-updown.sh new file mode 100644 index 0000000..89d6882 --- /dev/null +++ b/distro/dns-scripts/macos-dns-updown.sh @@ -0,0 +1,217 @@ +#!/bin/bash +# +# dns-updown - add/remove openvpn provided DNS information +# +# (C) Copyright 2025 OpenVPN Inc +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Example env from openvpn (most are not applied): +# +# dns_vars_file /tmp/openvpn_dvf_58b95c0c97b2db43afb5d745f986c53c.tmp +# +# or +# +# dev utun0 +# script_type dns-up +# dns_search_domain_1 mycorp.in +# dns_search_domain_2 eu.mycorp.com +# dns_server_1_address_1 192.168.99.254 +# dns_server_1_address_2 fd00::99:53 +# dns_server_1_port_2 53 +# dns_server_1_resolve_domain_1 mycorp.in +# dns_server_1_resolve_domain_2 eu.mycorp.com +# dns_server_1_dnssec true +# dns_server_1_transport DoH +# dns_server_1_sni dns.mycorp.in +# + +[ -z "${dns_vars_file}" ] || . "${dns_vars_file}" + +itf_dns_key=3D"State:/Network/Service/openvpn-${dev}/DNS" +dns_backup_key=3D"State:/Network/Service/openvpn-${dev}/DnsBackup" + +function primary_dns_key { + local uuid=3D$(echo "show State:/Network/Global/IPv4" | /usr/sbin/scut= il | grep "PrimaryService" | cut -d: -f2 | xargs) + echo "Setup:/Network/Service/${uuid}/DNS" +} + +function only_standard_server_ports { + local i=3D1 + while :; do + local addr_var=3Ddns_server_${n}_address_${i} + [ -n "${!addr_var}" ] || return 0 + + local port_var=3Ddns_server_${n}_port_${i} + [ -z "${!port_var}" -o "${!port_var}" =3D "53" ] || return 1 + + i=3D$((i+1)) + done +} + +function find_compat_profile { + local n=3D1 + while :; do + local addr_var=3Ddns_server_${n}_address_1 + [ -n "${!addr_var}" ] || { + echo "setting DNS failed, no compatible server profile" + exit 1 + } + + # Skip server profiles which require DNSSEC, + # secure transport or use a custom port + local dnssec_var=3Ddns_server_${n}_dnssec + local transport_var=3Ddns_server_${n}_transport + [ -z "${!transport_var}" -o "${!transport_var}" =3D "plain" ] \ + && [ -z "${!dnssec_var}" -o "${!dnssec_var}" =3D "no" ] \ + && only_standard_server_ports && break + + n=3D$((n+1)) + done + return $n +} + +function get_search_domains { + local search_domains=3D"" + local resolver=3D0 + /usr/sbin/scutil --dns | while read line; do + if [[ "$line" =3D~ resolver.# ]]; then + resolver=3D$((resolver+1)) + elif [ "$resolver" =3D 1 ] && [[ "$line" =3D~ search.domain ]]; th= en + search_domains+=3D"$(echo $line | cut -d: -f2 | xargs) " + elif [ "$resolver" -gt 1 ]; then + echo "$search_domains" + break + fi + done +} + +function set_search_domains { + [ -n "$1" ] || return + dns_key=3D$(primary_dns_key) + search_domains=3D"${1}$(get_search_domains)" + + local cmds=3D"" + cmds+=3D"get ${dns_key}\n" + cmds+=3D"d.add SearchDomains * ${search_domains}\n" + cmds+=3D"set ${dns_key}\n" + echo -e "${cmds}" | /usr/sbin/scutil +} + +function unset_search_domains { + [ -n "$1" ] || return + dns_key=3D$(primary_dns_key) + search_domains=3D"$(get_search_domains)" + search_domains=3D$(echo $search_domains | sed -e "s/$1//") + + local cmds=3D"" + cmds+=3D"get ${dns_key}\n" + cmds+=3D"d.add SearchDomains * ${search_domains}\n" + cmds+=3D"set ${dns_key}\n" + echo -e "${cmds}" | /usr/sbin/scutil +} + +function set_dns { + find_compat_profile + local n=3D$? + + local i=3D1 + local addrs=3D"" + while :; do + local addr_var=3Ddns_server_${n}_address_${i} + local addr=3D"${!addr_var}" + [ -n "$addr" ] || break + + local port_var=3Ddns_server_${n}_port_${i} + if [ -n "${!port_var}" ]; then + if [[ "$addr" =3D~ : ]]; then + addr=3D"[$addr]" + fi + addrs+=3D"${addr}:${!port_var}${sni} " + else + addrs+=3D"${addr}${sni} " + fi + i=3D$((i+1)) + done + + i=3D1 + local match_domains=3D"" + while :; do + domain_var=3Ddns_server_${n}_resolve_domain_${i} + [ -n "${!domain_var}" ] || break + # Add as match domain, if it doesn't already exist + [[ "$match_domains" =3D~ (^| )${!domain_var}( |$) ]] \ + || match_domains+=3D"${!domain_var} " + i=3D$((i+1)) + done + + i=3D1 + local search_domains=3D"" + while :; do + domain_var=3Ddns_search_domain_${i} + [ -n "${!domain_var}" ] || break + # Add as search domain, if it doesn't already exist + [[ "$search_domains" =3D~ (^| )${!domain_var}( |$) ]] \ + || search_domains+=3D"${!domain_var} " + i=3D$((i+1)) + done + + if [ -n "$match_domains" ]; then + local cmds=3D"" + cmds+=3D"d.init\n" + cmds+=3D"d.add ServerAddresses * ${addrs}\n" + cmds+=3D"d.add SupplementalMatchDomains * ${match_domains}\n" + cmds+=3D"d.add SupplementalMatchDomainsNoSearch # 1\n" + cmds+=3D"add ${itf_dns_key}\n" + echo -e "${cmds}" | /usr/sbin/scutil + set_search_domains "$search_domains" + else + local cmds=3D"" + cmds+=3D"get $(primary_dns_key)\n" + cmds+=3D"set ${dns_backup_key}\n" + cmds+=3D"d.init\n" + cmds+=3D"d.add ServerAddresses * ${addrs}\n" + cmds+=3D"d.add SearchDomains * ${search_domains}\n" + cmds+=3D"d.add SearchOrder # 5000\n" + cmds+=3D"set $(primary_dns_key)\n" + echo -e "${cmds}" | /usr/sbin/scutil + fi + + /usr/bin/dscacheutil -flushcache +} + +function unset_dns { + find_compat_profile + local n=3D$? + + local i=3D1 + local search_domains=3D"" + while :; do + domain_var=3Ddns_search_domain_${i} + [ -n "${!domain_var}" ] || break + # Add as search domain, if it doesn't already exist + [[ "$search_domains" =3D~ (^| )${!domain_var}( |$) ]] \ + || search_domains+=3D"${!domain_var} " + i=3D$((i+1)) + done + + domain_var=3Ddns_server_${n}_resolve_domain_1 + if [ -n "${!domain_var}" ]; then + echo "remove ${itf_dns_key}" | /usr/sbin/scutil + unset_search_domains "$search_domains" + else + local cmds=3D"" + cmds+=3D"get ${dns_backup_key}\n" + cmds+=3D"set $(primary_dns_key)\n" + cmds+=3D"remove ${dns_backup_key}\n" + echo -e "${cmds}" | /usr/sbin/scutil + fi + + /usr/bin/dscacheutil -flushcache +} + +if [ "$script_type" =3D "dns-up" ]; then + set_dns +else + unset_dns +fi -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1062?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Iade06a8454ccf53668deef61f07217ead8ec6c63 Gerrit-Change-Number: 1062 Gerrit-PatchSet: 4 Gerrit-Owner: d12fk Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --uVlvQ29elF4= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #4 to the change originally cr= eated by d12fk.

View Change

The following approvals got outdated an= d were removed: Code-Review+2 by plaisthos

dns: add updown script for macOS

Change-I= d: Iade06a8454ccf53668deef61f07217ead8ec6c63
Signed-off-by: Heiko Hund &= lt;heiko@...2662...>
Acked-by: Arne Schwabe <arne-openvpn@...2639...= ..>
Message-Id: <20250621121301.27509-1-gert@...1296...>
URL= : https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31942= .html
Signed-off-by: Gert Doering <gert@...1296...>
---
M co= nfigure.ac
M distro/dns-scripts/Makefile.am
A distro/dns-scripts/maco= s-dns-updown.sh
3 files changed, 219 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/62/1062/4=
diff --git a/configure.ac b/configure.ac
index 8bd= ec32..02b45f8 100644
--- a/configure.ac
+++= b/configure.ac
@@ -364,8 +364,7 @@
*-*-d= arwin*)
AC_DEFINE([TARGET_DARWIN], [1], [Are we running = on Mac OS X?])
AC_DEFINE_UNQUOTED([TARGET_PREFIX], [&quo= t;M"], [Target prefix])
- AM_CONDITIONAL([ENABLE_DNS_UPDOWN], [false])
- AC_SUBST([DNS_UPDOWN_TYPE], ["resolv= conf_file"])
+ = AC_SUBST([DNS_UPDOWN_TYPE], ["macos"])
have_ta= p_header=3D"yes"
ac_cv_type_struct_in_pktinfo= =3Dno
;;
diff --git a/distro/dns-scripts= /Makefile.am b/distro/dns-scripts/Makefile.am
index 9fcd3f7= ..e3f9043 100644
--- a/distro/dns-scripts/Makefile.am
+++ b/distro/dns-scripts/Makefile.am
@@ -12,6 +1= 2,7 @@
$(srcdir)/Makefile.in

= EXTRA_DIST =3D \
+ macos-dns-updown.sh \
systemd-dns-updown.sh \=
openresolv-dns-updown.sh \
haikuos_file-dns-u= pdown.sh \
diff --git a/distro/dns-scripts/macos-dns-updown= .sh b/distro/dns-scripts/macos-dns-updown.sh
new file mode = 100644
index 0000000..89d6882
--- /dev/null=
+++ b/distro/dns-scripts/macos-dns-updown.sh
@@ -0,0 +1,217 @@

= +#!/bin/bash
+#
+# dns-updown - add/remove= openvpn provided DNS information
+#
+# (C= ) Copyright 2025 OpenVPN Inc <sales@...515...>
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Example env from openvpn (most are not applied):=
+#
+# dns_vars_file /tmp/openvpn_dvf_58b95c0c9= 7b2db43afb5d745f986c53c.tmp
+#
+# or<= /span>
+#
+# dev utun0
+# script_type dns-up
+# dns_search_domain_1 mycorp.in<= br>+# dns_search_domain_2 eu.= mycorp.com
+# dns_s= erver_1_address_1 192.168.99.254
+# dns_server_1_address_2 fd00::99:53
+# dns_server_1_port_2 53
+# dns_server_1_resolve_domain_1 = mycorp.in

+# dns_se= rver_1_resolve_domain_2 eu.mycorp.com
+# dns_server_1_dnssec true
+# dns_server_1_transport DoH
+# dns_server_1_sni dns.mycorp.in
+#
+
+[ -z "${dns_vars_file}" ] || . "${dns_vars_f= ile}"
++itf_dns_key=3D"State:/N= etwork/Service/openvpn-${dev}/DNS"
+dns_backup_key=3D"State:/Network/Service/openvpn-$= {dev}/DnsBackup"
+
+function primary_= dns_key {
+ local = uuid=3D$(echo "show State:/Network/Global/IPv4" | /usr/sbin/scuti= l | grep "PrimaryService" | cut -d: -f2 | xargs)
+ echo "Setup:/Network/Servic= e/${uuid}/DNS"
+= }
+
+function only_standard_server_ports {=
+ local i=3D1
+ while :; do<= br>+ local addr_var=3Ddn= s_server_${n}_address_${i}
+ [ -n "${!addr_var}" ] || return 0
+
+ local port_var=3Ddns_server_${n}_port_${i}
+ [ -z "${!po= rt_var}" -o "${!port_var}" =3D "53" ] || return 1<= /span>
+
+ i=3D$((i+1))
+ done
+}
+
+function fi= nd_compat_profile {
+= local n=3D1
+ = while :; do
+ = local addr_var=3Ddns_server_${n}_address_1
+ [ -n "${!addr_var}" ] || {<= br>+ echo "sett= ing DNS failed, no compatible server profile"
+ exit 1
+ }
+
= + # Skip server profiles which require DNSSEC,
+ # secure transport or use a custo= m port
+ local= dnssec_var=3Ddns_server_${n}_dnssec
+ local transport_var=3Ddns_server_${n}_transport
+ [ -z "${!= transport_var}" -o "${!transport_var}" =3D "plain"= ] \
+ &am= p;& [ -z "${!dnssec_var}" -o "${!dnssec_var}" =3D &= quot;no" ] \
+ = && only_standard_server_ports && break
= +
+ n=3D$((n+1))
+ done
+ return $n
+}
+<= br>+function get_search_domains= {
+ local search_= domains=3D""
+ /usr/sbin/scutil --dns | while read line; do
+ if [[ "$line" =3D~ res= olver.# ]]; then
+ = resolver=3D$((resolver+1))
+ elif [ "$resolver" =3D 1 ] && [[ = "$line" =3D~ search.domain ]]; then
+ search_domains+=3D"$(echo $line = | cut -d: -f2 | xargs) "
+ elif [ "$resolver" -gt 1 ]; then
+ echo "$search_dom= ains"

+ = break
+ fi<= /span>
+ done
<= span style=3D"color: hsl(120, 100%, 40%);">+}

+
+function set_search_domains {
+ [ -n "$1" ] || return
+ dns_key=3D$(primary_dns_key)+ search_domains=3D"$= {1}$(get_search_domains)"
+
+ loca= l cmds=3D""
+ cmds+=3D"get ${dns_key}\n"
+ cmds+=3D"d.add SearchDomains * ${search_dom= ains}\n"
+ cm= ds+=3D"set ${dns_key}\n"
+ echo -e "${cmds}" | /usr/sbin/scutil+}
+
+function unset_search_domains {
+ [ -n "$1" ] || return
+ dns_key=3D$(primary_dns_key)
+ search_domains=3D&quo= t;$(get_search_domains)"
+ search_domains=3D$(echo $search_domains | sed -e "s/$1//= ")
+
<= span style=3D"color: hsl(120, 100%, 40%);">+ local cmds=3D""
+ cmds+=3D"get= ${dns_key}\n"
+= cmds+=3D"d.add SearchDomains * ${search_domains}\n"+ cmds+=3D"set ${dns_k= ey}\n"
+ echo= -e "${cmds}" | /usr/sbin/scutil
+}
+
+function set_d= ns {
+ find_compat= _profile
+ local n= =3D$?
+
+ local i=3D1

+ local addrs=3D""=
+ while :; do
= + local addr_var=3Ddns_s= erver_${n}_address_${i}
+ local addr=3D"${!addr_var}"
+ [ -n "$addr" ] || break
+
+ local port_var=3Ddns_server_${n}_= port_${i}
+ if= [ -n "${!port_var}" ]; then
+ if [[ "$addr" =3D~ : ]]; then
+ addr=3D&= quot;[$addr]"
+ = fi
+ = addrs+=3D"${addr}:${!port_var}${sni} "
+ else
+ addrs+=3D"${addr}${sni} "=
+ fi+ i=3D$((i+1))<= br>+ done
+
+ i=3D1
+ local match_domains=3D""
+ while :; do
+ domain_var=3Ddns_server_${n}_resolve_domain_= ${i}
+ [ -n &q= uot;${!domain_var}" ] || break
+ # Add as match domain, if it doesn't already ex= ist
+ [[ "= ;$match_domains" =3D~ (^| )${!domain_var}( |$) ]] \
+ || match_domains+=3D"= ${!domain_var} "
+ i=3D$((i+1))
+<= br>+ i=3D1
+ local search_domains=3D"&quo= t;
+ while :; do
+ domain_var=3D= dns_search_domain_${i}
+ # Add as search domain, if it doe= sn't already exist
+ || sea= rch_domains+=3D"${!domain_var} "
+ i=3D$((i+1))
+ done
+
+ if= [ -n "$match_domains" ]; then
+ local cmds=3D""
+ cmds+=3D"d.init\n"
+ cmds+=3D"d= .add ServerAddresses * ${addrs}\n"
+ cmds+=3D"d.add SupplementalMatchDomains * = ${match_domains}\n"
+ cmds+=3D"d.add SupplementalMatchDomainsNoSearch # 1\n&quo= t;
+ cmds+=3D&= quot;add ${itf_dns_key}\n"
+ echo -e "${cmds}" | /usr/sbin/scutil+ set_search_domains &= quot;$search_domains"
+ else
+ = local cmds=3D""
+ cmds+=3D"get $(primary_dns_key)\n"
+ cmds+=3D"set ${dns_= backup_key}\n"

+= cmds+=3D"d.init\n"
+ cmds+=3D"d.add ServerAddresses * ${addrs}\n&q= uot;
+ cmds+= =3D"d.add SearchDomains * ${search_domains}\n"
+ cmds+=3D"d.add SearchOrde= r # 5000\n"
+ = cmds+=3D"set $(primary_dns_key)\n"
+ echo -e "${cmds}" | /usr/sb= in/scutil
+ fi
+
+ /usr/bin/dscacheutil -flushcache
+}
+
+function unset_dns {
+ find_compat_profile
+ local n=3D$?
+
+ = local i=3D1
+ lo= cal search_domains=3D""
+ while :; do
+ domain_var=3Ddns_search_domain_${i}
+ [ -n "${!domain_var}" ]= || break
+ # = Add as search domain, if it doesn't already exist
+ [[ "$search_domains" = =3D~ (^| )${!domain_var}( |$) ]] \
+ || search_domains+=3D"${!domain_var} "=
+ i=3D$((i+1)= )
+ done+
+ domain_var=3Ddns_server_${n}_resolve_domain_= 1
+ if [ -n "= ${!domain_var}" ]; then
+ echo "remove ${itf_dns_key}" | /usr/sbin/scutil<= /span>
+ unset_search= _domains "$search_domains"
+ else
+ local cmds=3D""
+ cmds+=3D"get ${dns_backup_key}\n"
+ cmds+=3D"s= et $(primary_dns_key)\n"
+ cmds+=3D"remove ${dns_backup_key}\n"
= + echo -e "${cmds}&= quot; | /usr/sbin/scutil
+ fi
+<= br>+ /usr/bin/dscacheutil -f= lushcache
+}+
+if [ "$script_type" =3D "dns-up&= quot; ]; then
+ se= t_dns
+else+ unset_dns
+fi


To view, visit change 1062. To unsubscribe, or for help writing mail filter= s, visit settings.

<= meta itemprop=3D"name" content=3D"View Change"/>
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iade06a8454ccf53668deef61f07= 217ead8ec6c63
Gerrit-Change-Number: 1062
Gerrit-PatchSet: 4
Gerrit-Owner: d12fk <heiko@...515...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--uVlvQ29elF4=--