From: "stipa (Code Review)" Date: Wed, 12 Mar 2025 11:54:45 +0000 References: Reply-To: lstipakov@...277..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <9128b360c98a50df91605a7af5b6cd0365d7f63d-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="d14SRrWASOE="; 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: plaisthos , flichtenheld Cc: openvpn-devel --d14SRrWASOE= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/906?usp=3Demail to review the following change. 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 --- 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, 26 insertions(+), 9 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/06/906/1 diff --git a/src/openvpnserv/common.c b/src/openvpnserv/common.c index 74bec6e..658e5cd 100644 --- a/src/openvpnserv/common.c +++ b/src/openvpnserv/common.c @@ -130,6 +130,14 @@ { goto out; } + + error =3D GetRegString(key, TEXT("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, TEXT("IDLE_PRIORITY_CLASS"))) { diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index d5a749a..2364c38 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -2497,7 +2497,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 c5f587b..c8c1005 100644 --- a/src/openvpnserv/service.h +++ b/src/openvpnserv/service.h @@ -71,6 +71,7 @@ TCHAR ext_string[16]; TCHAR log_dir[MAX_PATH]; TCHAR ovpn_admin_group[MAX_NAME]; + TCHAR ovpn_service_user[MAX_NAME]; DWORD priority; BOOL append; } settings_t; diff --git a/src/openvpnserv/validate.c b/src/openvpnserv/validate.c index 9563fa5..5b0b368 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, = TEXT("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 a9f1b9d..a68e564 100644 --- a/src/openvpnserv/validate.h +++ b/src/openvpnserv/validate.h @@ -29,11 +29,17 @@ /* Authorized groups who can use any options and config locations */ #define SYSTEM_ADMIN_GROUP TEXT("Administrators") -#define OVPN_ADMIN_GROUP TEXT("OpenVPN Administrators") -/* The last one may be reset in registry: HKLM\Software\OpenVPN\ovpn_admin= _group */ +#define OVPN_ADMIN_GROUP TEXT("OpenVPN Administrators") /* may be set in H= KLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_SERVICE_USER TEXT("OpenVPNService") /* may be set in HKLM\Sof= tware\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: 1 Gerrit-Owner: stipa Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --d14SRrWASOE= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

stipa would like plaisthos and flichtenheld to review t= his change.

Vi= ew Change

win: allow OpenVPN service account to use any command-line op=
tions

Since 2.7, OpenVPN service (used to start persistent connectio= ns)
runs under limited virtual service account NT SERVICE\OpenVPNService= .

Since it should be able to use all command-line options
and can= not be made member of "OpenVPN Administrators" group,
it has t= o be handled separately.

Change-Id: I44d308301dfb7c22600d8632a553288= f52b3068f
Signed-off-by: Lev Stipakov <lev@...515...>
---
M = src/openvpnserv/common.c
M src/openvpnserv/interactive.c
M src/openvp= nserv/service.h
M src/openvpnserv/validate.c
M src/openvpnserv/valida= te.h
5 files changed, 26 insertions(+), 9 deletions(-)

git pul= l ssh://gerrit.openvpn.net:29418/openvpn refs/changes/06/906/1
diff=
 --git a/src/openvpnserv/common.c b/src/openvpnserv/common.c
index 74bec6e..658e5cd 100644
--- a/src/openvpnserv/commo= n.c
+++ b/src/openvpnserv/common.c
@@ -130,= 6 +130,14 @@
{
goto out;

}
+<= /span>
+ error =3D GetReg= String(key, TEXT("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, TEXT("IDLE_PRIORITY_CLASS"= ;)))
{
diff --git a/src/openvpnserv/in= teractive.c b/src/openvpnserv/interactive.c
index d5a749a..= 2364c38 100644
--- a/src/openvpnserv/interactive.c+++ b/src/openvpnserv/interactive.c
@@ -2497,7 +249= 7,7 @@
* OR user is authorized to run any config.
*/
if (!ValidateOptions(pipe, sud.d= irectory, sud.options, errmsg, _countof(errmsg))
- && !IsAuthorizedUser(ovpn_user-&= gt;User.Sid, imp_token, settings.ovpn_admin_group))
+ && !IsAuthorizedUser(ovpn= _user->User.Sid, imp_token, settings.ovpn_admin_group, settings.ovpn_ser= vice_user))
{
ReturnError(pip= e, ERROR_STARTUP_DATA, errmsg, 1, &exit_event);
= goto out;
diff --git a/src/openvpnserv/service.h b/src/op= envpnserv/service.h
index c5f587b..c8c1005 100644--- a/src/openvpnserv/service.h
+++ b/src/openvpnser= v/service.h
@@ -71,6 +71,7 @@
TCHAR ex= t_string[16];
TCHAR log_dir[MAX_PATH];
TCHAR ovpn_admin_group[MAX_NAME];

+ TCHAR ovpn_service_user[MAX_NAME];
= DWORD priority;
BOOL append;
} s= ettings_t;
diff --git a/src/openvpnserv/validate.c b/src/op= envpnserv/validate.c
index 9563fa5..5b0b368 100644--- a/src/openvpnserv/validate.c
+++ b/src/openvpns= erv/validate.c
@@ -140,12 +140,8 @@
re= turn b;
}

-/*
- * Check whether user is a member of Administrators group or
= - * the group specified in ovpn_a= dmin_group
- */<= br> BOOL
-IsAutho= rizedUser(PSID sid, const HANDLE token, const WCHAR *ovpn_admin_group)
+IsAuthorizedUser(PSID si= d, const HANDLE token, const WCHAR *ovpn_admin_group, const WCHAR *ovpn_ser= vice_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, TEXT("NT SERVICE")) =3D=3D 0= ))
+ {
<= span style=3D"color: hsl(120, 100%, 40%);">+ return TRUE;

= + }
+
if (GetBuiltinAdminGro= upName(sysadmin_group, _countof(sysadmin_group)))
{
admin_group[0] =3D sysadmin_group;
d= iff --git a/src/openvpnserv/validate.h b/src/openvpnserv/validate.h<= br>index a9f1b9d..a68e564 100644
--- a/src/openvpnser= v/validate.h
+++ b/src/openvpnserv/validate.h
@@ -29,11 +29,17 @@


/* Authorized gro= ups who can use any options and config locations */
#defin= e SYSTEM_ADMIN_GROUP TEXT("Administrators")
-#define OVPN_ADMIN_GROUP TEXT("OpenVPN= Administrators")
= -/* The last one may be reset in registry: HKLM\Software\OpenVPN\ovpn_admin= _group */

+#define OVPN_ADMIN_GROUP TEXT("OpenVPN Administrators") /= * may be set in HKLM\Software\OpenVPN\ovpn_admin_group */
+#define OVPN_SERVICE_USER TEXT("= OpenVPNService") /* may be set in HKLM\Software\OpenVPN\ovpn_service_u= ser */
+
+/*

+ * Check whether user is a member of Administrato= rs group or
+ * the g= roup specified in ovpn_admin_group or
+ * OpenVPN Virtual Service Account user
+ */
BOOL
<= span style=3D"color: hsl(0, 100%, 40%);">-IsAuthorizedUser(PSID sid, const = HANDLE token, const WCHAR *ovpn_admin_group);

+IsAuthorizedUser(PSID sid, const HANDLE token, co= nst WCHAR *ovpn_admin_group, const WCHAR *ovpn_service_user);

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

To view, visit change 906. To unsubscribe, or for help writing mail f= ilters, visit settings.<= /p>

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I44d308301dfb7c22600d8632a55= 3288f52b3068f
Gerrit-Change-Number: 906
Gerrit-PatchSet: 1
Gerrit-Owner: stipa <lstipakov@...277...>= ;
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--d14SRrWASOE=--