From: "plaisthos (Code Review)" Date: Wed, 13 Dec 2023 14:07:04 +0000 References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="kh3ph3FkaMk="; 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 --kh3ph3FkaMk= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/481?usp=3Demail to review the following change. 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 4 files changed, 34 insertions(+), 29 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/481/1 diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 503e832..9863261 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) + { + /* Warn if we can't find a valid temporary directory, which should + * be 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) { -- 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: 1 Gerrit-Owner: plaisthos Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --kh3ph3FkaMk= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld.

plaisthos would like flichtenheld to review this change.

Vi= ew Change

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 toa null pointer. This will not be caught by check_file_access_chroot
eit= her since that ignores NULL pointers but other parts of OpenVPN
will ass= ume 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: I525ccf7872880367= b248ebebb0ddc83551498042
Signed-off-by: Arne Schwabe <arne@...1227...= >
---
M src/openvpn/options.c
M src/openvpn/win32-util.c
M s= rc/openvpn/win32-util.h
M src/openvpn/win32.c
4 files changed, 34 ins= ertions(+), 29 deletions(-)

git pull ssh://gerrit.openvpn.net:294=
18/openvpn refs/changes/81/481/1
diff --git a/src/openvpn/options.c=
 b/src/openvpn/options.c
index 503e832..9863261 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/o= ptions.c
@@ -885,7 +885,15 @@
#ifdef _WIN3= 2
/* On Windows, find temp dir via environment variabl= es */
o->tmp_dir =3D win_get_tempdir();
<= span style=3D"color: hsl(0, 100%, 40%);">-#else

+
+ if (!o->tmp_dir)
+ {
+ = /* Warn if we can't find a valid temporary directory, which shou= ld
+ * be unl= ikely. */
+ ms= g(M_USAGE, "Could not find a suitable temporary directory."
+ " (GetTe= mpPath() failed). Consider using --tmp-dir");
+ }
+#else /* ifdef _WIN32 */
/* Non-w= indows platforms use $TMPDIR, and if not set, default to '/tmp' */<= /span>
o->tmp_dir =3D getenv("TMPDIR"); if (!o->tmp_dir)
diff --git a/src/openvpn/w= in32-util.c b/src/openvpn/win32-util.c
index 81e504a..c5e75= 05 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) > si= zeof(tmpdir))
+ {<= /span>
+ msg(M_WARN, = "Could not get temporary directory. Path is too long."
= + " Consider u= sing --tmp-dir");
+ }
++ WideCharToMultiByte(CP_UT= F8, 0, wtmpdir, -1, tmpdir, sizeof(tmpdir), NULL, NULL);
+ return tmpdir;
+}
#endif /* _WIN32 */<= /span>
diff --git a/src/openvpn/win32-util.h b/src/openvpn/win32-u= til.h
index ac37979..98bf74b 100644
--- a/s= rc/openvpn/win32-util.h
+++ b/src/openvpn/win32-util.h
@@ -40,5 +40,8 @@
/* return true if filename i= s safe to be used on Windows */
bool win_safe_filename(con= st char *fn);

+/* Find temporary directory */
+const char *win_get_tempdir(void);
+
#endif /* OPENVPN_W= IN32_UTIL_H */
#endif /* ifdef _WIN32 */
d= iff --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 tempor= ary 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, &= quot;Could not get temporary directory. Path is too long."
<= span style=3D"color: hsl(0, 100%, 40%);">- " Consider usin= g --tmp-dir");

- = return NULL;
- = }
-
- WideCharToMultiByte(CP_UTF8, 0, wtmp= dir, -1, tmpdir, sizeof(tmpdir), NULL, NULL);
- return tmpdir;
-}
= -
static bool
win_block_dns_service(bool = add, int index, const HANDLE pipe)
{

To view, visit change 481. To unsubscribe, or for help writing ma= il filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I525ccf7872880367b248ebebb0d= dc83551498042
Gerrit-Change-Number: 481
Gerrit-PatchSet: 1
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: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--kh3ph3FkaMk=--