From 985f4eaeccf0d3f9d833f3271d88634e237d7cd5 Mon Sep 17 00:00:00 2001 From: Heiko Hund Date: Sun, 9 Nov 2025 16:44:31 +0100 Subject: [PATCH] iservice: make sure directories have trailing backslash At least in the case of the config dir this matters, since the value is used to validate input data for the interactive service. A missing \ at the end would allow a string compare to succeed, if the last element of the path to compare starts with the same substring. The trailing slash ensures that the last element of a path must match completely. Change-Id: If28e66fcc3493821f78fd14d432b22b996918e8f Signed-off-by: Heiko Hund Acked-by: Lev Stipakov Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1336 Message-Id: <20251109154438.15464-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg34285.html Signed-off-by: Gert Doering --- src/openvpnserv/common.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/openvpnserv/common.c b/src/openvpnserv/common.c index d25d9c0e9..b1c89c9ed 100644 --- a/src/openvpnserv/common.c +++ b/src/openvpnserv/common.c @@ -24,6 +24,8 @@ #include "validate.h" #include "eventmsg.h" +#include + LPCWSTR service_instance = L""; static wchar_t win_sys_path[MAX_PATH]; @@ -54,6 +56,22 @@ GetRegString(HKEY key, LPCWSTR value, LPWSTR data, DWORD size, LPCWSTR default_v } +/** + * Make sure that a dir path ends with a backslash. + * If it doesn't, a \ is added to the end of the path, if there's room in the buffer. + * + * @param dir pointer to the wide dir path string buffer + * @param size maximum number of wide chars the dir path buffer + * @return BOOL to indicate success or failure + */ +static BOOL +ensure_trailing_backslash(PWSTR dir, size_t size) +{ + HRESULT res = PathCchAddBackslash(dir, size); + return (res == S_OK || res == S_FALSE) ? TRUE : FALSE; +} + + DWORD GetOpenvpnSettings(settings_t *s) { @@ -90,16 +108,16 @@ GetOpenvpnSettings(settings_t *s) goto out; } - swprintf(default_value, _countof(default_value), L"%ls\\config", install_path); + swprintf(default_value, _countof(default_value), L"%ls\\config\\", install_path); error = GetRegString(key, L"config_dir", s->config_dir, sizeof(s->config_dir), default_value); - if (error != ERROR_SUCCESS) + if (error != ERROR_SUCCESS || !ensure_trailing_backslash(s->config_dir, _countof(s->config_dir))) { goto out; } - swprintf(default_value, _countof(default_value), L"%ls\\bin", install_path); + swprintf(default_value, _countof(default_value), L"%ls\\bin\\", install_path); error = GetRegString(key, L"bin_dir", s->bin_dir, sizeof(s->bin_dir), default_value); - if (error != ERROR_SUCCESS) + if (error != ERROR_SUCCESS || !ensure_trailing_backslash(s->bin_dir, _countof(s->bin_dir))) { goto out; } @@ -110,9 +128,9 @@ GetOpenvpnSettings(settings_t *s) goto out; } - swprintf(default_value, _countof(default_value), L"%ls\\log", install_path); + swprintf(default_value, _countof(default_value), L"%ls\\log\\", install_path); error = GetRegString(key, L"log_dir", s->log_dir, sizeof(s->log_dir), default_value); - if (error != ERROR_SUCCESS) + if (error != ERROR_SUCCESS || !ensure_trailing_backslash(s->log_dir, _countof(s->log_dir))) { goto out; } -- 2.47.3