From: "cron2 (Code Review)" Date: Tue, 15 Apr 2025 18:18:42 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., heiko@...515..., selva.nair@...277..., openvpn-devel@lists.sourceforge.net, frank@...2641..., lstipakov@...277... Message-ID: <15ceb86bdcf5982daecc5a6610d75433c94258cb-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="BEn6XyzazWo="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: win: allow OpenVPN service account to use any command-line options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stipa , plaisthos , flichtenheld , d12fk , selvanair Cc: openvpn-devel --BEn6XyzazWo= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#5) to the change originally created by= stipa. ( http://gerrit.openvpn.net/c/openvpn/+/906?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+2 by cron2 Change subject: win: allow OpenVPN service account to use any command-line = options ...................................................................... win: allow OpenVPN service account to use any command-line options Since 2.7, OpenVPN service (used to start persistent connections) runs under limited virtual service account NT SERVICE\OpenVPNService. Since it should be able to use all command-line options and cannot be made member of "OpenVPN Administrators" group, it has to be handled separately. Change-Id: I44d308301dfb7c22600d8632a553288f52b3068f Signed-off-by: Lev Stipakov Acked-by: Gert Doering Message-Id: <20250415155131.12458-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg31= 435.html Signed-off-by: Gert Doering --- M src/openvpnserv/common.c M src/openvpnserv/interactive.c M src/openvpnserv/service.h M src/openvpnserv/validate.c M src/openvpnserv/validate.h 5 files changed, 25 insertions(+), 9 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/06/906/5 diff --git a/src/openvpnserv/common.c b/src/openvpnserv/common.c index 39b39aa..4a11e6c 100644 --- a/src/openvpnserv/common.c +++ b/src/openvpnserv/common.c @@ -130,6 +130,14 @@ { goto out; } + + error =3D GetRegString(key, L"ovpn_service_user", s->ovpn_service_user, + sizeof(s->ovpn_service_user), OVPN_SERVICE_USER); + if (error !=3D ERROR_SUCCESS) + { + goto out; + } + /* set process priority */ if (!_wcsicmp(priority, L"IDLE_PRIORITY_CLASS")) { diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index 3cefcc7..f06d386 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -3410,7 +3410,7 @@ * OR user is authorized to run any config. */ if (!ValidateOptions(pipe, sud.directory, sud.options, errmsg, _counto= f(errmsg)) - && !IsAuthorizedUser(ovpn_user->User.Sid, imp_token, settings.ovpn= _admin_group)) + && !IsAuthorizedUser(ovpn_user->User.Sid, imp_token, settings.ovpn= _admin_group, settings.ovpn_service_user)) { ReturnError(pipe, ERROR_STARTUP_DATA, errmsg, 1, &exit_event); goto out; diff --git a/src/openvpnserv/service.h b/src/openvpnserv/service.h index 7112f26..cbe213b 100644 --- a/src/openvpnserv/service.h +++ b/src/openvpnserv/service.h @@ -66,6 +66,7 @@ WCHAR ext_string[16]; WCHAR log_dir[MAX_PATH]; WCHAR ovpn_admin_group[MAX_NAME]; + WCHAR ovpn_service_user[MAX_NAME]; DWORD priority; BOOL append; } settings_t; diff --git a/src/openvpnserv/validate.c b/src/openvpnserv/validate.c index 23d78af..9f176c0 100644 --- a/src/openvpnserv/validate.c +++ b/src/openvpnserv/validate.c @@ -140,12 +140,8 @@ return b; } -/* - * Check whether user is a member of Administrators group or - * the group specified in ovpn_admin_group - */ BOOL -IsAuthorizedUser(PSID sid, const HANDLE token, const WCHAR *ovpn_admin_gro= up) +IsAuthorizedUser(PSID sid, const HANDLE token, const WCHAR *ovpn_admin_gro= up, const WCHAR *ovpn_service_user) { const WCHAR *admin_group[2]; WCHAR username[MAX_NAME]; @@ -164,6 +160,12 @@ domain[0] =3D '\0'; } + /* is this service account? */ + if ((wcscmp(username, ovpn_service_user) =3D=3D 0) && (wcscmp(domain, = L"NT SERVICE") =3D=3D 0)) + { + return TRUE; + } + if (GetBuiltinAdminGroupName(sysadmin_group, _countof(sysadmin_group))) { admin_group[0] =3D sysadmin_group; diff --git a/src/openvpnserv/validate.h b/src/openvpnserv/validate.h index 61a0ad6..5cd6d16 100644 --- a/src/openvpnserv/validate.h +++ b/src/openvpnserv/validate.h @@ -29,11 +29,16 @@ /* Authorized groups who can use any options and config locations */ #define SYSTEM_ADMIN_GROUP L"Administrators" -#define OVPN_ADMIN_GROUP L"OpenVPN Administrators" -/* The last one may be reset in registry: HKLM\Software\OpenVPN\ovpn_admin= _group */ +#define OVPN_ADMIN_GROUP L"OpenVPN Administrators" /* may be set in HKLM\S= oftware\OpenVPN\ovpn_admin_group */ +#define OVPN_SERVICE_USER L"OpenVPNService" /* may be set in HKLM\Software= \OpenVPN\ovpn_service_user */ +/* + * Check whether user is a member of Administrators group or + * the group specified in ovpn_admin_group or + * OpenVPN Virtual Service Account user + */ BOOL -IsAuthorizedUser(PSID sid, const HANDLE token, const WCHAR *ovpn_admin_gro= up); +IsAuthorizedUser(PSID sid, const HANDLE token, const WCHAR *ovpn_admin_gro= up, const WCHAR *ovpn_service_user); BOOL CheckOption(const WCHAR *workdir, int narg, WCHAR *argv[], const settings_= t *s); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/906?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: I44d308301dfb7c22600d8632a553288f52b3068f Gerrit-Change-Number: 906 Gerrit-PatchSet: 5 Gerrit-Owner: stipa Gerrit-Reviewer: cron2 Gerrit-Reviewer: d12fk Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-Reviewer: selvanair Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --BEn6XyzazWo= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #5 to the change originally cr= eated by stipa.

View Change

The following approvals got outdated and= were removed: Code-Review+2 by cron2

win: allow OpenVPN service account to use any comman=
d-line options

Since 2.7, OpenVPN service (used to start persistent = connections)
runs under limited virtual service account NT SERVICE\OpenV= PNService.

Since it should be able to use all command-line optionsand cannot be made member of "OpenVPN Administrators" group,it has to be handled separately.

Change-Id: I44d308301dfb7c22600d86= 32a553288f52b3068f
Signed-off-by: Lev Stipakov <lev@...515...>
= Acked-by: Gert Doering <gert@...1296...>
Message-Id: <202504151= 55131.12458-1-gert@...1296...>
URL: https://www.mail-archive.com/open= vpn-devel@lists.sourceforge.net/msg31435.html
Signed-off-by: Gert Doerin= g <gert@...1296...>
---
M src/openvpnserv/common.c
M src/ope= nvpnserv/interactive.c
M src/openvpnserv/service.h
M src/openvpnserv/= validate.c
M src/openvpnserv/validate.h
5 files changed, 25 insertion= s(+), 9 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/open=
vpn refs/changes/06/906/5
diff --git a/src/openvpnserv/common.c b/s=
rc/openvpnserv/common.c
index 39b39aa..4a11e6c 100644
--- a/src/openvpnserv/common.c
+++ b/src/openvpn= serv/common.c
@@ -130,6 +130,14 @@
{
goto out;
}
+
+ error =3D GetRegString(key, L"ovpn_service_user&= quot;, s->ovpn_service_user,
+ sizeof(s->ovpn_service_user), OVPN_= SERVICE_USER);
+ i= f (error !=3D ERROR_SUCCESS)
+ {
+ = goto out;
+ }
+
= /* set process priority */
if (!_wcsicmp(priority, L&= quot;IDLE_PRIORITY_CLASS"))
{
dif= f --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index 3cefcc7..f06d386 100644
--- a/src/openvp= nserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -3410,7 +3410,7 @@
* OR user is autho= rized to run any config.
*/
if (= !ValidateOptions(pipe, sud.directory, sud.options, errmsg, _countof(errmsg)= )
- && != IsAuthorizedUser(ovpn_user->User.Sid, imp_token, settings.ovpn_admin_gro= up))
+ &&a= mp; !IsAuthorizedUser(ovpn_user->User.Sid, imp_token, settings.ovpn_admi= n_group, settings.ovpn_service_user))
{
ReturnError(pipe, ERROR_STARTUP_DATA, errmsg, 1, &exit_event= );

goto out;
diff --git a/src/open= vpnserv/service.h b/src/openvpnserv/service.h
index 7112f26= ..cbe213b 100644
--- a/src/openvpnserv/service.h
= +++ b/src/openvpnserv/service.h
@@ -66,6 +66,7 @@
WCHAR ext_string[16];
WCHAR log_dir[= MAX_PATH];
WCHAR ovpn_admin_group[MAX_NAME];+ WCHAR ovpn_service_user[M= AX_NAME];
DWORD priority;
BOOL ap= pend;
} settings_t;
diff --git a/src/openv= pnserv/validate.c b/src/openvpnserv/validate.c
index 23d78a= f..9f176c0 100644
--- a/src/openvpnserv/validate.c+++ b/src/openvpnserv/validate.c
@@ -140,12 +140,8 = @@
return b;
}

-/*
- * Check whether user is a member of Admini= strators group or
- * t= he group specified in ovpn_admin_group
- */
BOOL
-IsAuthorizedUser(PSID sid, const HANDLE token, const W= CHAR *ovpn_admin_group)
+IsAuthorizedUser(PSID sid, const HANDLE token, const WCHAR *ovpn_admin_= group, const WCHAR *ovpn_service_user)
{
= const WCHAR *admin_group[2];
WCHAR username[MAX_NA= ME];
@@ -164,6 +160,12 @@
domain[0= ] =3D '\0';
}

+ /* is this service account? */=

+ if ((wcscmp(use= rname, ovpn_service_user) =3D=3D 0) && (wcscmp(domain, L"NT SE= RVICE") =3D=3D 0))
+ {
+ re= turn TRUE;
+ }
+
i= f (GetBuiltinAdminGroupName(sysadmin_group, _countof(sysadmin_group)))
{
admin_group[0] =3D sysadmin_gro= up;
diff --git a/src/openvpnserv/validate.h b/src/openvpnse= rv/validate.h
index 61a0ad6..5cd6d16 100644
--- a/src/openvpnserv/validate.h

+++ b/src/openvpnserv/val= idate.h
@@ -29,11 +29,16 @@

/* Authorized groups who can use any options and config locations */
#define SYSTEM_ADMIN_GROUP L"Administrators"
-#define OVPN_ADMIN_GROUP L&= quot;OpenVPN Administrators"
-/* The last one may be reset in registry: HKLM\Software\OpenVPN= \ovpn_admin_group */
= +#define OVPN_ADMIN_GROUP L"OpenVPN Administrators" /* may be set= in HKLM\Software\OpenVPN\ovpn_admin_group */
+#define OVPN_SERVICE_USER L"OpenVPNService&q= uot; /* may be set in HKLM\Software\OpenVPN\ovpn_service_user */
=
+/*+ * Check whether user is a me= mber of Administrators group or
+ * the group specified in ovpn_admin_group or
+ * OpenVPN Virtual Service Account us= er
+ */
BOOL

-IsAuthorizedU= ser(PSID sid, const HANDLE token, const WCHAR *ovpn_admin_group);+IsAuthorizedUser(PSID sid, co= nst HANDLE token, const WCHAR *ovpn_admin_group, const WCHAR *ovpn_service_= user);

BOOL
CheckOption= (const WCHAR *workdir, int narg, WCHAR *argv[], const settings_t *s);

To view, visit change 906. To unsubscribe, or for= help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I44d308301dfb7c22600d8632a55= 3288f52b3068f
Gerrit-Change-Number: 906
Gerrit-PatchSet: 5
Gerrit-Owner: stipa <lstipakov@...277...>= ;
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: d12fk <heiko@...515...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-Reviewer: selvanair <selva.nair@...1665...= 77...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--BEn6XyzazWo=--