Validate DNS domain name before powershell invocation

Starting from commit

  d383d6e ("win: replace wmic invocation with powershell")

we pass --dhcp-option DOMAIN value to a powershell command
to set DNS domain. Without validation this opens the door
to a command injection atack.

This only allows domain names with characters:

  [A-Za-z0-9.-_\x80-\0xff]

Change-Id: I7a57d7b4e84aa2b9c9e71e30520ed468b0e3c278
Signed-off-by: Lev Stipakov <lev@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1198
Message-Id: <20250918173447.32466-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg33071.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Lev Stipakov 2025-09-18 19:34:40 +02:00 committed by Gert Doering
parent cabbf49ba2
commit 6c3afe508b
3 changed files with 59 additions and 0 deletions

View file

@ -0,0 +1,45 @@
/*
* OpenVPN -- An application to securely tunnel IP networks
* over a single UDP port, with support for SSL/TLS-based
* session authentication and key exchange,
* packet encryption, packet authentication, and
* packet compression.
*
* Copyright (C) 2025 Lev Stipakov <lev@openvpn.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
static inline bool
is_allowed_domain_ascii(unsigned char c)
{
return (c >= 'A' && c <= 'Z')
|| (c >= 'a' && c <= 'z')
|| (c >= '0' && c <= '9')
|| c == '.' || c == '-' || c == '_' || c >= 0x80;
}
static inline bool
validate_domain(const char *domain)
{
for (const char *ch = domain; *ch; ++ch)
{
if (!is_allowed_domain_ascii((unsigned char)*ch))
{
return false;
}
}
return true;
}

View file

@ -46,6 +46,7 @@
#include "win32.h"
#include "block_dns.h"
#include "networking.h"
#include "domain_helper.h"
#include "memdbg.h"
@ -390,6 +391,12 @@ do_dns_domain_pwsh(bool add, const struct tuntap *tt)
return;
}
if (add && !validate_domain(tt->options.domain))
{
msg(M_WARN, "Failed to set DNS domain '%s' because it contains invalid characters", tt->options.domain);
return;
}
struct argv argv = argv_new();
argv_printf(&argv,
"%s%s -NoProfile -NonInteractive -Command Set-DnsClient -InterfaceIndex %lu -ConnectionSpecificSuffix '%s'",

View file

@ -40,6 +40,7 @@
#include "validate.h"
#include "block_dns.h"
#include "ring_buffer.h"
#include "domain_helper.h"
#define IO_TIMEOUT 2000 /*ms*/
@ -1216,6 +1217,12 @@ SetDNSDomain(const wchar_t *if_name, const char *domain, undo_lists_t *lists)
{
NET_IFINDEX if_index;
if (!validate_domain(domain))
{
MsgToEventLog(MSG_FLAGS_ERROR, TEXT("Failed to set DNS domain '%hs' because it contains invalid characters"), domain);
return ERROR_INVALID_DATA;
}
DWORD err = ConvertInterfaceNameToIndex(if_name, &if_index);
if (err != ERROR_SUCCESS)
{