From: "plaisthos (Code Review)" Date: Tue, 2 Jan 2024 16:52:28 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <5d03b05ed37ef2314d256872495c415ae916b85d-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="3lSPVyxLhKw="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: Move get_tmp_dir to win32-util.c and error out on failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld Cc: openvpn-devel --3lSPVyxLhKw= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello flichtenheld, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/481?usp=3Demail to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by flichtenheld Change subject: Move get_tmp_dir to win32-util.c and error out on failure ...................................................................... Move get_tmp_dir to win32-util.c and error out on failure Currently we only warn in get_tmp_dir fails and set o->tmp_dir to a null pointer. This will not be caught by check_file_access_chroot either since that ignores NULL pointers but other parts of OpenVPN will assume that tmp_dir is set to a non-NULL string. Also move get_tmp_dir to ssl-utils.c to use it in unit tests. Change-Id: I525ccf7872880367b248ebebb0ddc83551498042 Signed-off-by: Arne Schwabe --- M src/openvpn/options.c M src/openvpn/win32-util.c M src/openvpn/win32-util.h M src/openvpn/win32.c M src/openvpn/win32.h 5 files changed, 34 insertions(+), 32 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/481/2 diff --git a/src/openvpn/options.c b/src/openvpn/options.c index e498114..79958db 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -885,7 +885,15 @@ #ifdef _WIN32 /* On Windows, find temp dir via environment variables */ o->tmp_dir =3D win_get_tempdir(); -#else + + if (!o->tmp_dir) + { + /* Error out if we can't find a valid temporary directory, which s= hould + * be very unlikely. */ + msg(M_USAGE, "Could not find a suitable temporary directory." + " (GetTempPath() failed). Consider using --tmp-dir"); + } +#else /* ifdef _WIN32 */ /* Non-windows platforms use $TMPDIR, and if not set, default to '/tmp= ' */ o->tmp_dir =3D getenv("TMPDIR"); if (!o->tmp_dir) diff --git a/src/openvpn/win32-util.c b/src/openvpn/win32-util.c index 81e504a..c5e7505 100644 --- a/src/openvpn/win32-util.c +++ b/src/openvpn/win32-util.c @@ -147,4 +147,26 @@ } return true; } + +const char * +win_get_tempdir(void) +{ + static char tmpdir[MAX_PATH]; + WCHAR wtmpdir[MAX_PATH]; + + if (!GetTempPathW(_countof(wtmpdir), wtmpdir)) + { + return NULL; + } + + if (WideCharToMultiByte(CP_UTF8, 0, wtmpdir, -1, NULL, 0, NULL, NULL) = > sizeof(tmpdir)) + { + msg(M_WARN, "Could not get temporary directory. Path is too long." + " Consider using --tmp-dir"); + return NULL; + } + + WideCharToMultiByte(CP_UTF8, 0, wtmpdir, -1, tmpdir, sizeof(tmpdir), N= ULL, NULL); + return tmpdir; +} #endif /* _WIN32 */ diff --git a/src/openvpn/win32-util.h b/src/openvpn/win32-util.h index ac37979..98bf74b 100644 --- a/src/openvpn/win32-util.h +++ b/src/openvpn/win32-util.h @@ -40,5 +40,8 @@ /* return true if filename is safe to be used on Windows */ bool win_safe_filename(const char *fn); +/* Find temporary directory */ +const char *win_get_tempdir(void); + #endif /* OPENVPN_WIN32_UTIL_H */ #endif /* ifdef _WIN32 */ diff --git a/src/openvpn/win32.c b/src/openvpn/win32.c index e998d90..6b7ba5e 100644 --- a/src/openvpn/win32.c +++ b/src/openvpn/win32.c @@ -1137,34 +1137,6 @@ set_win_sys_path(buf, es); } - -const char * -win_get_tempdir(void) -{ - static char tmpdir[MAX_PATH]; - WCHAR wtmpdir[MAX_PATH]; - - if (!GetTempPathW(_countof(wtmpdir), wtmpdir)) - { - /* Warn if we can't find a valid temporary directory, which should - * be unlikely. - */ - msg(M_WARN, "Could not find a suitable temporary directory." - " (GetTempPath() failed). Consider using --tmp-dir"); - return NULL; - } - - if (WideCharToMultiByte(CP_UTF8, 0, wtmpdir, -1, NULL, 0, NULL, NULL) = > sizeof(tmpdir)) - { - msg(M_WARN, "Could not get temporary directory. Path is too long." - " Consider using --tmp-dir"); - return NULL; - } - - WideCharToMultiByte(CP_UTF8, 0, wtmpdir, -1, tmpdir, sizeof(tmpdir), N= ULL, NULL); - return tmpdir; -} - static bool win_block_dns_service(bool add, int index, const HANDLE pipe) { diff --git a/src/openvpn/win32.h b/src/openvpn/win32.h index 3605966..aa8513b 100644 --- a/src/openvpn/win32.h +++ b/src/openvpn/win32.h @@ -286,9 +286,6 @@ /* call self in a subprocess */ void fork_to_self(const char *cmdline); -/* Find temporary directory */ -const char *win_get_tempdir(void); - bool win_wfp_block_dns(const NET_IFINDEX index, const HANDLE msg_channel); bool win_wfp_uninit(const NET_IFINDEX index, const HANDLE msg_channel); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/481?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: I525ccf7872880367b248ebebb0ddc83551498042 Gerrit-Change-Number: 481 Gerrit-PatchSet: 2 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --3lSPVyxLhKw= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

plaisthos uploaded patch set #2 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/481?usp=3Demail">View Chang= e

The following approvals got outdated and were removed: Code-Review-1 by flichtenheld

Move get_tmp_dir to win32-util.c and error ou=
t on failure

Currently we only warn in get_tmp_dir fails and set o-&= gt;tmp_dir to
a null pointer. This will not be caught by check_file_acce= ss_chroot
either since that ignores NULL pointers but other parts of Ope= nVPN
will assume that tmp_dir is set to a non-NULL string.

Also m= ove get_tmp_dir to ssl-utils.c to use it in unit tests.

Change-Id: I= 525ccf7872880367b248ebebb0ddc83551498042
Signed-off-by: Arne Schwabe <= ;arne@...1227...>
---
M src/openvpn/options.c
M src/openvpn/win= 32-util.c
M src/openvpn/win32-util.h
M src/openvpn/win32.c
M src/o= penvpn/win32.h
5 files changed, 34 insertions(+), 32 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/481/2
diff --git a/src/openvpn/options.c b/src/openvpn/options.cindex e498114..79958db 100644
--- a/src/openvpn/opti= ons.c
+++ b/src/openvpn/options.c
@@ -885,7= +885,15 @@
#ifdef _WIN32
/* On Windo= ws, find temp dir via environment variables */
o->t= mp_dir =3D win_get_tempdir();
-#else
+
+ if (!o->tmp_dir)
+ {
+ /* Error out if we can'= t find a valid temporary directory, which should

+ * be very unlikely. */
+ msg(M_USAGE, "Could n= ot find a suitable temporary directory."

+ " (GetTempPath() failed). Consi= der using --tmp-dir");
+ }
+#else = /* ifdef _WIN32 */
/* Non-windows platforms use $TMPD= IR, and if not set, default to '/tmp' */
o->= ;tmp_dir =3D getenv("TMPDIR");
if (!o->tm= p_dir)
diff --git a/src/openvpn/win32-util.c b/src/openvpn/= win32-util.c
index 81e504a..c5e7505 100644
= --- a/src/openvpn/win32-util.c
+++ b/src/openvpn/win32-util= .c
@@ -147,4 +147,26 @@
}
return true;
}
+
+const char *
+win_g= et_tempdir(void)
+{
+ static char tmpdi= r[MAX_PATH];
+ WCH= AR wtmpdir[MAX_PATH];
+
+ if (!GetTempP= athW(_countof(wtmpdir), wtmpdir))
+ {
+= return NULL;
= + }
+
+ if (WideCharToMultiByte(CP_U= TF8, 0, wtmpdir, -1, NULL, 0, NULL, NULL) > sizeof(tmpdir))

+ {
+ msg(M_WARN, "Could not get tempor= ary directory. Path is too long."
+ " Consider using --tmp-dir");
+ return NULL;

+ }
+
+ WideCharToMultiByte(CP_UTF8, 0, wtmpdir, -1, tmpdir= , sizeof(tmpdir), NULL, NULL);
+ return tmpdir;
+}
#endif /* _WIN32 */
diff --git= a/src/openvpn/win32-util.h b/src/openvpn/win32-util.h
inde= x ac37979..98bf74b 100644
--- a/src/openvpn/win32-util.h

+++ b/src/openvpn/win32-util.h
@@ -40,5 +40,8= @@
/* return true if filename is safe to be used on Windo= ws */
bool win_safe_filename(const char *fn);

+/* Find tempor= ary directory */
+con= st char *win_get_tempdir(void);
+
#endif /* OPENVPN_WIN32_UTIL_H */
<= span> #endif /* ifdef _WIN32 */
diff --git a/src/openvpn/wi= n32.c b/src/openvpn/win32.c
index e998d90..6b7ba5e 100644
--- a/src/openvpn/win32.c
+++ b/src/openvpn/= win32.c
@@ -1137,34 +1137,6 @@
set_win= _sys_path(buf, es);
}

-
-const char *
-win_get_tempdir(void)
-{
- static char= tmpdir[MAX_PATH];
- = WCHAR wtmpdir[MAX_PATH];
-
- if (!GetTempP= athW(_countof(wtmpdir), wtmpdir))
- {
- = /* Warn if we can't find a valid temporary directory, which should<= /span>
- * be unlikely= .
- */- msg(M_WARN, "Coul= d not find a suitable temporary directory."
- " (GetTempPath() failed). Cons= ider using --tmp-dir");
- return NULL;
- }
-- if (WideCharToMultiByte(CP_= UTF8, 0, wtmpdir, -1, NULL, 0, NULL, NULL) > sizeof(tmpdir))
<= span style=3D"color: hsl(0, 100%, 40%);">- {

- msg(M_WARN, "Could not get temporary= directory. Path is too long."
- " Consider using --tmp-dir");- return NULL;- }
-
- WideCharToMultiByte(CP_UTF8, 0, wtmpdir, -1, tmpdir, sizeof(tmpd= ir), NULL, NULL);
- = return tmpdir;
-}
-
static bo= ol
win_block_dns_service(bool add, int index, const HANDLE= pipe)
{
diff --git a/src/openvpn/win32.h = b/src/openvpn/win32.h
index 3605966..aa8513b 100644<= br>--- a/src/openvpn/win32.h
+++ b/src/openvpn/win32.= h
@@ -286,9 +286,6 @@
/* call self in a su= bprocess */
void fork_to_self(const char *cmdline);=

-/* Find te= mporary directory */
-c= onst char *win_get_tempdir(void);
-
bool win_wfp_block_dns(const NET_IFINDEX inde= x, const HANDLE msg_channel);

bool win_w= fp_uninit(const NET_IFINDEX index, const HANDLE msg_channel);

To view, visit change 481. To unsubscribe, or for help wr= iting mail filters, visit se= ttings.

<= div itemscope itemprop=3D"action" itemtype=3D"http://schema.org/ViewAction"= >
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I525ccf7872880367b248ebebb0d= dc83551498042
Gerrit-Change-Number: 481
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
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
--3lSPVyxLhKw=--