tun.c: enclose DNS domain in single quotes in WMIC call
PATCH 1/1 tun.c: enclose DNS domain in single quotes in WMIC call
From: Lev Stipakov <[email protected]...>
This is needed to support domains with hyphens.
Not using double quotes here, since our code replaces them with underbars (see
https://github.com/OpenVPN/openvpn/blob/master/src/openvpn/win32.c#L980).
Fixes https://github.com/OpenVPN/openvpn/issues/363
--- src/openvpn/tun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/tun.c +1 -1
@@ -333,7 +333,7 @@ do_dns_domain_wmic(bool add, const struct tuntap *tt) }struct argv argv =argv_new (); -argv_printf (&argv,"%s%s nicconfig where (InterfaceIndex=%ld) call SetDNSDomain %s" , +argv_printf (&argv,"%s%s nicconfig where (InterfaceIndex=%ld) call SetDNSDomain '%s'" ,get_win_sys_path (),WMIC_PATH_SUFFIX , tt->adapter_index, add ? tt->options.domain :"" );exec_command ("WMIC" , &argv,1 ,M_WARN );
Signature · 1 line
2.38.1.windows.1
PATCH 1/1 tun.c: enclose DNS domain in single quotes in WMIC call
In reply to a message not in the archiveHi,
Quoted 31 lines · Lev Stipakov
From: Lev Stipakov <[email protected]...>
This is needed to support domains with hyphens.
Not using double quotes here, since our code replaces them with underbars (see
https://github.com/OpenVPN/openvpn/blob/master/src/openvpn/win32.c#L980).Fixes https://github.com/OpenVPN/openvpn/issues/363
Change-Id Iab536922d0731635cef529b5caf542f637b8d491Signed-off-by Lev Stipakov <[email protected]...>--- src/openvpn/tun.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)src/openvpn/tun.c +1
-1@@ -333,7 +333,7 @@ do_dns_domain_wmic(bool add, const struct tuntap *tt) }struct argv argv =argv_new (); - argv_printf(&argv, "%s%s nicconfig where (InterfaceIndex=%ld) call SetDNSDomain %s", + argv_printf(&argv, "%s%s nicconfig where (InterfaceIndex=%ld) call SetDNSDomain '%s'", get_win_sys_path(), WMIC_PATH_SUFFIX, tt->adapter_index,
Quoted 3 lines
add ? tt->options.domain : "");
exec_command("WMIC", &argv, 1, M_WARN);Quoting is required as wmic interprets characters such as hyphen and /. Double quotes would have been better (as in interactive.c) as there are some cases where characters within single quotes get interpreted special (like 'foo>bar' vs "foo>bar").
That said, for valid domain names, the only expected characters are alpha-numeric, hyphen and period, and single quotes should work. I have only tested this using wmic command line, not the resulting openvpn.exe.
P.S.
We probably need to sanitize the user-supplied domain name before passing it to wmic.
I have not tested this beyond "does it still compile?" (it does) - the whole concept of "how do quotation marks work in windows, and when and why do we need them?" is a bit fuzzy to me - but I fully trust Selva and Lev on this.
On Selva's comment "do we need to sanitize this?" - I tried to figure out how tt->options.domain is populated, and gave up - for "dhcp-option", we start with o->domain, for "--dns" we start with something else, and I couldn't find where this moves over to tt->options.domain, and whether there is a check at this place.
In the "dhcp-option DOMAIN" block, we just do
if ((streq(p[1], "DOMAIN") || streq(p[1], "ADAPTER_DOMAIN_SUFFIX"))
&& p[2] && !p[3])
{
o->domain = p[2];.. so indeed, depending on how windows exec_command() "does things", this might or might not be a problem.
Your patch has been applied to the master and release/2.6 branch (bugfix).
commit 4057814a8a783d4fb1475f49f073f6b3a7797677 (master) commit aceecaef79cd2dae5265e328874ee8263ac79492 (release/2.6)
Author: Lev Stipakov Date: Mon Jul 10 14:21:22 2023 +0300
tun.c: enclose DNS domain in single quotes in WMIC call
Signed-off-by: Lev Stipakov <[email protected]...>
Acked-by: Selva Nair <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg26841.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering