OpenVPN/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2025-05-09 05:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change the default --tmp-dir path to a more suitable path

Browse Source 
In commit 4e1cc5f6dda22e9 the create_temp_filename() function was
reviewed and hardened, which in the end renamed this function to
create_temp_file() in commit 495e3cec5d156.

With these changes it became more evident that OpenVPN needs a directory
where it can create temporary files.  The create_temp_file() will create
such files f.ex. if --client-connect or --plugin which makes use of
the OPENVPN_PLUGIN_AUTH_USER_PASS_VERIFY hook, such as openvpn-auth-pam.so.

When this happens, OpenVPN will normally create these files in the directory
OpenVPN was started.  In many cases, this will fail due to restricted access.
By using --tmp-dir and pointing it to a directory writeable to the user
running OpenVPN, it works again.

This patch makes OpenVPN use a more suitable temproary directory by default,
instead of the current working directory.  On non-Windows platforms this
default value is set to '/tmp', but can be modified at compile-time by
running ./configure --with-tmp-dir-path=<TEMP DIR PATH>.  On Windows, it
will use GetTempPath() to find temporary paths recommended by the OS.  If
this fails, it will fallback to the old behaviour, using the directory
where OpenVPN was started.

In any cases, this default value can be overridden in the configuration
file by using the --tmp-dir option, as before.

To check what the default is at runime, you can see this easily by doing
this:

      $ ./openvpn --verb 4 --dev tun | grep tmp_dir

Signed-off-by: David Sommerseth <davids@redhat.com>
Tested-by: Jan Just Keijser <janjust@nikhef.nl>
Acked-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit ca4c6d618d743ec4a3b6f7ef8003d891603ec1a6)
This commit is contained in:
David Sommerseth 2011-04-14 16:21:16 +02:00
parent c7dd80cf45
commit eb4b1bb6ad
Notes: David Sommerseth 2011-04-15 09:58:13 +02:00 
(copy of note ca4c6d618d)

This commit message falsely states that the default '/tmp' path can be
modified at compile time.  This is not true anymore.  This patch restricts
fallback on non-Windows to '/tmp' and the start-up directory for OpenVPN
on Windows.  On all POSIX platforms '/tmp' should exist anyway and it can
be modified by setting $TMPDIR at runtime, or via --tmp-dir.

This patch also includes a two comments to the #ifdef blocks in the same
area.  These lines were not removed as they were considered helpful and it
does not change the running code in any way.  It was initially added to
make sure the changes needed in this patch came on the right place.  It
should probably have been mentioned in the commit log anyhow though.

David Sommerseth
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
options.c
View File

@ -766,11 +766,23 @@ init_options (struct options *o, const bool init_gc)
#ifdef ENABLE_X509ALTUSERNAME
o->x509_username_field = X509_USERNAME_FIELD_DEFAULT;
#endif
#endif
#endif
#endif /* USE_SSL */
#endif /* USE_CRYPTO */
#ifdef ENABLE_PKCS11
o->pkcs11_pin_cache_period = -1;
#endif /* ENABLE_PKCS11 */
/* Set default --tmp-dir */
#ifdef WIN32
/* On Windows, find temp dir via enviroment variables */
o->tmp_dir = win_get_tempdir();
#else
/* Non-windows platforms use $TMPDIR, and if not set, default to '/tmp' */
o->tmp_dir = getenv("TMPDIR");
if( !o->tmp_dir ) {
o->tmp_dir = "/tmp";
}
#endif /* WIN32 */
}
void
@ -1916,8 +1928,6 @@ options_postprocess_verify_ce (const struct options *options, const struct conne
msg (M_USAGE, "--client-connect requires --mode server");
if (options->client_disconnect_script)
msg (M_USAGE, "--client-disconnect requires --mode server");
if (options->tmp_dir)
msg (M_USAGE, "--tmp-dir requires --mode server");
if (options->client_config_dir || options->ccd_exclusive)
msg (M_USAGE, "--client-config-dir/--ccd-exclusive requires --mode server");
if (options->enable_c2c)

19
win32.c
View File

@ -1093,4 +1093,23 @@ env_set_add_win32 (struct env_set *es)
set_win_sys_path (DEFAULT_WIN_SYS_PATH, es);
}
const char *
win_get_tempdir()
{
static char buf[MAX_PATH];
char *tmpdir = buf;
CLEAR(buf);
if (!GetTempPath(sizeof(buf),buf)) {
/* 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 to use --tmp-dir");
tmpdir = NULL;
}
return tmpdir;
}
#endif

3
win32.h
View File

@ -270,5 +270,8 @@ char *get_win_sys_path (void);
/* call self in a subprocess */
void fork_to_self (const char *cmdline);
/* Find temporary directory */
const char *win_get_tempdir();
#endif
#endif