From: "stipa (Code Review)" Date: Tue, 15 Apr 2025 08:20:52 +0000 In-Reply-To: References: Reply-To: lstipakov@...277..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <8f28f780b789b4d3f57e17360c35ef8e65af5102-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="IaCZoSzKI/E="; 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 --IaCZoSzKI/E= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/906?usp=3Demail to look at the new patch set (#2). 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, 25 insertions(+), 9 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/06/906/2 diff --git a/src/openvpnserv/common.c b/src/openvpnserv/common.c index 39b39aa..4156686 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, L"IDLE_PRIORITY_CLASS")) { diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c index c6963b3..871dc6a 100644 --- a/src/openvpnserv/interactive.c +++ b/src/openvpnserv/interactive.c @@ -2491,7 +2491,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..98c96c8 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 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: 2 Gerrit-Owner: stipa Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --IaCZoSzKI/E= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

stipa uploaded patch set #2 to this change.

View Change

git pull ssh://gerr=
it.openvpn.net:29418/openvpn refs/changes/06/906/2
diff --git a/src=
/openvpnserv/common.c b/src/openvpnserv/common.c
index 39b3= 9aa..4156686 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, L"IDLE_PRIORITY_CLASS"))
{
diff --git a/src/openvpnserv/interactive.c b/src= /openvpnserv/interactive.c
index c6963b3..871dc6a 100644

--- a/src/openvpnserv/interactive.c
+++ b/src= /openvpnserv/interactive.c
@@ -2491,7 +2491,7 @@
= * OR user is authorized to run any config.
= */
if (!ValidateOptions(pipe, sud.directory, sud.opt= ions, errmsg, _countof(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))<= br> {
ReturnError(pipe, ERROR_STARTUP_DA= TA, errmsg, 1, &exit_event);
goto out;<= br>diff --git a/src/openvpnserv/service.h b/src/openvpnserv/service.h=
index 7112f26..cbe213b 100644
--- a/src/op= envpnserv/service.h
+++ b/src/openvpnserv/service.h<= br>@@ -66,6 +66,7 @@
WCHAR ext_string[16];
WCHAR log_dir[MAX_PATH];
WCHAR ovpn_ad= min_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..98c96c8 100644
--- a/src/o= penvpnserv/validate.c
+++ b/src/openvpnserv/validate.c
@@ -140,12 +140,8 @@
return b;
<= span> }


-/*
- * Check whethe= r 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_group)
+IsAuthorizedUser(PSID sid, const HANDLE t= oken, const WCHAR *ovpn_admin_group, 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_gro= up, _countof(sysadmin_group)))
{
= admin_group[0] =3D sysadmin_group;
diff --git a/src/ope= nvpnserv/validate.h b/src/openvpnserv/validate.h
index 61a0= ad6..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_GROU= P 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\Software\OpenVPN\ovpn_admin_gro= up */
+#define OVPN_S= ERVICE_USER L"OpenVPNService" /* may be set in HKLM\Software\Open= VPN\ovpn_service_user */

+/*
+ * Check whether user is a member of Administrators group or+ * the group specified in ov= pn_admin_group or
+ *= OpenVPN Virtual Service Account user
+ */
BOOL
-IsAuthorizedUser(PSID sid, const HANDLE token, const = WCHAR *ovpn_admin_group);
+IsAuthorizedUser(PSID sid, const HANDLE token, const WCHAR *ovpn_admi= n_group, const WCHAR *ovpn_service_user);

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

To view, = visit cha= nge 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: 2
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: newpatchset
--IaCZoSzKI/E=--