Fix file checks when --chroot is being used
PATCH 1/1 Fix file checks when --chroot is being used
In reply to a message not in the archiveFrom: David Sommerseth <[email protected]...>
Commit 0f2bc0dd92f43c9 started to introduce some file sanity checking before OpenVPN started to avoid harder to explain issues due to missing files or directories later on. But that commit did not consider --chroot at all. Which would basically cause OpenVPN to complain on non-missing files, because it would not consider that the files where inside a chroot.
This patch is based on the thoughts in a patch by Josh Cepek [1], but trying to simplify it at bit.
[1] <http://thread.gmane.org/gmane.network.openvpn.devel/7873>,
(Message-ID: [email protected]...)
Trac-ticket: 330
--- src/openvpn/options.c | 89 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 21 deletions(-)
src/openvpn/options.c +68 -21
@@ -5,7 +5,7 @@* packet encryption, packet authentication, and * packet compression. * -* Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <[email protected]...> +* Copyright (C) 2002-2013 OpenVPN Technologies, Inc. <[email protected]...> * Copyright (C) 2008-2013 David Sommerseth <[email protected]...> * * This program is free software; you can redistribute it and/or modify
@@ -2626,6 +2626,44 @@ check_file_access(const int type, const char *file, const int mode, const char *return (errcode !=0 ? true : false); } +/* A wrapper for check_file_access() which also takes a chroot directory. +* If chroot is NULL, behaviour is exactly the same as calling check_file_access() directly, +* otherwise it will look for the file inside the given chroot directory instead. +*/ +static bool +check_file_access_chroot (const char *chroot,const int type,const char *file,const int mode,const char *opt) +{ +bool ret = false; + +/* If no file configured, no errors to look for */ +if (!file) +return false; + +/* If chroot is set, look for the file/directory inside the chroot */ +if ( chroot ) + { +struct gc_arena gc =gc_new (); +struct buffer chroot_file; +int len =0 ; + +/* Build up a new full path including chroot directory */ + len =strlen (chroot) +strlen (PATH_SEPARATOR_STR ) +strlen (file) +1 ; + chroot_file =alloc_buf_gc (len, &gc); +buf_printf (&chroot_file,"%s%s%s" , chroot,PATH_SEPARATOR_STR , file); +ASSERT (chroot_file.len >0 ); + + ret =check_file_access (type,BSTR (&chroot_file), mode, opt); +gc_free (&gc); + } +else + { +/* No chroot in play, just call core file check function */ + ret =check_file_access (type, file, mode, opt); + } +return ret; +} + +/* * Verifies that the path in the "command" that comes after certain script options (e.g., --up) is a * valid file with appropriate permissions.
@@ -2643,7 +2681,7 @@ check_file_access(const int type, const char *file, const int mode, const char ** check_file_access() arguments. */ static bool -check_cmd_access (const char *command,const char *opt) +check_cmd_access (const char *command,const char *opt,const char *chroot) {struct argv argv;bool return_code;
@@ -2662,7 +2700,14 @@ check_cmd_access(const char *command, const char *opt)* only requires X_OK to function on Unix - a scenario not unlikely to * be seen on suid binaries. */ - return_code =check_file_access (CHKACC_FILE , argv.argv[0 ],X_OK , opt); +if (chroot) + { + return_code =check_file_access_chroot (chroot,CHKACC_FILE , argv.argv[0 ],X_OK , opt); + } +else + { + return_code =check_file_access (CHKACC_FILE , argv.argv[0 ],X_OK , opt); + } else { msg (M_NOPREFIX|M_OPTERR, "%s fails with '%s': No path to executable.",
@@ -2688,7 +2733,7 @@ options_postprocess_filechecks (struct options *options)#ifdef ENABLE_SSL errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->dh_file,R_OK ,"--dh" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->ca_file,R_OK ,"--ca" ); - errs |=check_file_access (CHKACC_FILE , options->ca_path,R_OK ,"--capath" ); + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->ca_path,R_OK ,"--capath" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->cert_file,R_OK ,"--cert" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->extra_certs_file,R_OK ,"--extra-certs" );
@@ -2701,10 +2746,10 @@ options_postprocess_filechecks (struct options *options) "--pkcs12");if (options->ssl_flags &SSLF_CRL_VERIFY_DIR ) - errs |=check_file_access (CHKACC_FILE , options->crl_file,R_OK |X_OK , + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->crl_file,R_OK |X_OK ,"--crl-verify directory" );else - errs |=check_file_access (CHKACC_FILE , options->crl_file,R_OK , + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->crl_file,R_OK ,"--crl-verify" ); errs |= check_file_access (CHKACC_FILE|CHKACC_INLINE, options->tls_auth_file, R_OK,
@@ -2746,13 +2791,13 @@ options_postprocess_filechecks (struct options *options)/* ** Config related ** */ #ifdef ENABLE_SSL - errs |=check_file_access (CHKACC_FILE , options->tls_export_cert, + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->tls_export_cert,R_OK |W_OK |X_OK ,"--tls-export-cert" );#endif /* ENABLE_SSL */ #if P2MP_SERVER - errs |=check_file_access (CHKACC_FILE , options->client_config_dir, + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->client_config_dir,R_OK |X_OK ,"--client-config-dir" ); - errs |=check_file_access (CHKACC_FILE , options->tmp_dir, + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->tmp_dir,R_OK |W_OK |X_OK ,"Temporary directory (--tmp-dir)" );#endif /* P2MP_SERVER */
@@ -4017,7 +4062,8 @@ static void set_user_script (struct options *options, const char **script, const char *new_script, - const char *type) + const char *type, + bool in_chroot) { if (*script) { msg (M_WARN, "Multiple --%s scripts defined. "
@@ -4032,8 +4078,9 @@ set_user_script (struct options *options,openvpn_snprintf (script_name,sizeof (script_name),"--%s script" , type); -if (check_cmd_access (*script, script_name)) +if (check_cmd_access (*script, script_name, (in_chroot ? options->chroot_dir :NULL ))) msg (M_USAGE, "Please correct this error."); + }#endif }
@@ -4551,7 +4598,7 @@ add_option (struct options *options,set_user_script (options, &options->ipchange,string_substitute (p[1 ],',' ,' ' , &options->gc), -"ipchange" ); +"ipchange" , true); }else if (streq (p[0 ],"float" )) {
@@ -4597,14 +4644,14 @@ add_option (struct options *options,VERIFY_PERMISSION (OPT_P_SCRIPT );if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err; -set_user_script (options, &options->up_script, p[1 ],"up" ); +set_user_script (options, &options->up_script, p[1 ],"up" , false); }else if (streq (p[0 ],"down" ) && p[1 ]) {VERIFY_PERMISSION (OPT_P_SCRIPT );if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err; -set_user_script (options, &options->down_script, p[1 ],"down" ); +set_user_script (options, &options->down_script, p[1 ],"down" , true); }else if (streq (p[0 ],"down-pre" )) {
@@ -5312,7 +5359,7 @@ add_option (struct options *options,VERIFY_PERMISSION (OPT_P_SCRIPT );if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err; -set_user_script (options, &options->route_script, p[1 ],"route-up" ); +set_user_script (options, &options->route_script, p[1 ],"route-up" , false); }else if (streq (p[0 ],"route-pre-down" ) && p[1 ]) {
@@ -5322,7 +5369,7 @@ add_option (struct options *options,set_user_script (options, &options->route_predown_script, p[1 ], -"route-pre-down" ); +"route-pre-down" , true); }else if (streq (p[0 ],"route-noexec" )) {
@@ -5691,7 +5738,7 @@ add_option (struct options *options, }set_user_script (options, &options->auth_user_pass_verify_script, - p[1 ],"auth-user-pass-verify" ); + p[1 ],"auth-user-pass-verify" , true); }else if (streq (p[0 ],"client-connect" ) && p[1 ]) {
@@ -5699,7 +5746,7 @@ add_option (struct options *options,if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err;set_user_script (options, &options->client_connect_script, - p[1 ],"client-connect" ); + p[1 ],"client-connect" , true); }else if (streq (p[0 ],"client-disconnect" ) && p[1 ]) {
@@ -5707,7 +5754,7 @@ add_option (struct options *options,if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err;set_user_script (options, &options->client_disconnect_script, - p[1 ],"client-disconnect" ); + p[1 ],"client-disconnect" , true); }else if (streq (p[0 ],"learn-address" ) && p[1 ]) {
@@ -5715,7 +5762,7 @@ add_option (struct options *options,if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err;set_user_script (options, &options->learn_address_script, - p[1 ],"learn-address" ); + p[1 ],"learn-address" , true); }else if (streq (p[0 ],"tmp-dir" ) && p[1 ]) {
@@ -6675,7 +6722,7 @@ add_option (struct options *options, goto err;set_user_script (options, &options->tls_verify,string_substitute (p[1 ],',' ,' ' , &options->gc), -"tls-verify" ); +"tls-verify" , true); }#ifndef ENABLE_CRYPTO_POLARSSL else if (streq (p[0], "tls-export-cert") && p[1])
Signature · 1 line
1.8.3.1
Hi David,
This solution looks good. I did not test, but I do have one minor comment after glancing at the code:
@@ -2662,7 +2700,14 @@ check_cmd_access(const char *command, const char
Quoted 13 lines
*opt)
* only requiresX_OKto function on Unix - a scenario not unlikely to
* be seen on suid binaries.
*/src/openvpn/options.c +3
-1- return_code =check_file_access (CHKACC_FILE , argv.argv[0 ],X_OK , opt); +if (chroot) + { + return_code = check_file_access_chroot(chroot, CHKACC_FILE,argv.argv[0],
X_OK, opt);src/openvpn/options.c +4
-0+ } +else + { + return_code = check_file_access(CHKACC_FILE, argv.argv[0], X_OK,
Quoted 3 lines
opt);
+ }
This if seems redundant here, as chroot is checked by check_file_access_chroot itself. Furthermore, for the other occurences of check_file_access you stick to just replacing it with check_file_acess_chroot. I would suggest to do that here too.
-Steffan
PATCH 1/1 Fix file checks when --chroot is being used
From: David Sommerseth <[email protected]...>
Commit 0f2bc0dd92f43c9 started to introduce some file sanity checking before OpenVPN started to avoid harder to explain issues due to missing files or directories later on. But that commit did not consider --chroot at all. Which would basically cause OpenVPN to complain on non-missing files, because it would not consider that the files where inside a chroot.
This patch is based on the thoughts in a patch by Josh Cepek [1], but trying to simplify it at bit.
[1] <http://thread.gmane.org/gmane.network.openvpn.devel/7873>,
(Message-ID: [email protected]...)
[v2 - Simplify the changes in check_cmd_access(), let the chroot
tackling happen only in check_file_access_chroot() only]
Trac-ticket: 330
--- src/openvpn/options.c | 82 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 21 deletions(-)
src/openvpn/options.c +61 -21
@@ -5,7 +5,7 @@* packet encryption, packet authentication, and * packet compression. * -* Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <[email protected]...> +* Copyright (C) 2002-2013 OpenVPN Technologies, Inc. <[email protected]...> * Copyright (C) 2008-2013 David Sommerseth <[email protected]...> * * This program is free software; you can redistribute it and/or modify
@@ -2626,6 +2626,44 @@ check_file_access(const int type, const char *file, const int mode, const char *return (errcode !=0 ? true : false); } +/* A wrapper for check_file_access() which also takes a chroot directory. +* If chroot is NULL, behaviour is exactly the same as calling check_file_access() directly, +* otherwise it will look for the file inside the given chroot directory instead. +*/ +static bool +check_file_access_chroot (const char *chroot,const int type,const char *file,const int mode,const char *opt) +{ +bool ret = false; + +/* If no file configured, no errors to look for */ +if (!file) +return false; + +/* If chroot is set, look for the file/directory inside the chroot */ +if ( chroot ) + { +struct gc_arena gc =gc_new (); +struct buffer chroot_file; +int len =0 ; + +/* Build up a new full path including chroot directory */ + len =strlen (chroot) +strlen (PATH_SEPARATOR_STR ) +strlen (file) +1 ; + chroot_file =alloc_buf_gc (len, &gc); +buf_printf (&chroot_file,"%s%s%s" , chroot,PATH_SEPARATOR_STR , file); +ASSERT (chroot_file.len >0 ); + + ret =check_file_access (type,BSTR (&chroot_file), mode, opt); +gc_free (&gc); + } +else + { +/* No chroot in play, just call core file check function */ + ret =check_file_access (type, file, mode, opt); + } +return ret; +} + +/* * Verifies that the path in the "command" that comes after certain script options (e.g., --up) is a * valid file with appropriate permissions.
@@ -2643,7 +2681,7 @@ check_file_access(const int type, const char *file, const int mode, const char ** check_file_access() arguments. */ static bool -check_cmd_access (const char *command,const char *opt) +check_cmd_access (const char *command,const char *opt,const char *chroot) {struct argv argv;bool return_code;
@@ -2662,7 +2700,7 @@ check_cmd_access(const char *command, const char *opt)* only requires X_OK to function on Unix - a scenario not unlikely to * be seen on suid binaries. */ - return_code =check_file_access (CHKACC_FILE , argv.argv[0 ],X_OK , opt); + return_code =check_file_access_chroot (chroot,CHKACC_FILE , argv.argv[0 ],X_OK , opt); else { msg (M_NOPREFIX|M_OPTERR, "%s fails with '%s': No path to executable.",
@@ -2688,7 +2726,7 @@ options_postprocess_filechecks (struct options *options)#ifdef ENABLE_SSL errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->dh_file,R_OK ,"--dh" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->ca_file,R_OK ,"--ca" ); - errs |=check_file_access (CHKACC_FILE , options->ca_path,R_OK ,"--capath" ); + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->ca_path,R_OK ,"--capath" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->cert_file,R_OK ,"--cert" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->extra_certs_file,R_OK ,"--extra-certs" );
@@ -2701,10 +2739,10 @@ options_postprocess_filechecks (struct options *options) "--pkcs12");if (options->ssl_flags &SSLF_CRL_VERIFY_DIR ) - errs |=check_file_access (CHKACC_FILE , options->crl_file,R_OK |X_OK , + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->crl_file,R_OK |X_OK ,"--crl-verify directory" );else - errs |=check_file_access (CHKACC_FILE , options->crl_file,R_OK , + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->crl_file,R_OK ,"--crl-verify" ); errs |= check_file_access (CHKACC_FILE|CHKACC_INLINE, options->tls_auth_file, R_OK,
@@ -2746,13 +2784,13 @@ options_postprocess_filechecks (struct options *options)/* ** Config related ** */ #ifdef ENABLE_SSL - errs |=check_file_access (CHKACC_FILE , options->tls_export_cert, + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->tls_export_cert,R_OK |W_OK |X_OK ,"--tls-export-cert" );#endif /* ENABLE_SSL */ #if P2MP_SERVER - errs |=check_file_access (CHKACC_FILE , options->client_config_dir, + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->client_config_dir,R_OK |X_OK ,"--client-config-dir" ); - errs |=check_file_access (CHKACC_FILE , options->tmp_dir, + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->tmp_dir,R_OK |W_OK |X_OK ,"Temporary directory (--tmp-dir)" );#endif /* P2MP_SERVER */
@@ -4017,7 +4055,8 @@ static void set_user_script (struct options *options, const char **script, const char *new_script, - const char *type) + const char *type, + bool in_chroot) { if (*script) { msg (M_WARN, "Multiple --%s scripts defined. "
@@ -4032,8 +4071,9 @@ set_user_script (struct options *options,openvpn_snprintf (script_name,sizeof (script_name),"--%s script" , type); -if (check_cmd_access (*script, script_name)) +if (check_cmd_access (*script, script_name, (in_chroot ? options->chroot_dir :NULL ))) msg (M_USAGE, "Please correct this error."); + }#endif }
@@ -4551,7 +4591,7 @@ add_option (struct options *options,set_user_script (options, &options->ipchange,string_substitute (p[1 ],',' ,' ' , &options->gc), -"ipchange" ); +"ipchange" , true); }else if (streq (p[0 ],"float" )) {
@@ -4597,14 +4637,14 @@ add_option (struct options *options,VERIFY_PERMISSION (OPT_P_SCRIPT );if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err; -set_user_script (options, &options->up_script, p[1 ],"up" ); +set_user_script (options, &options->up_script, p[1 ],"up" , false); }else if (streq (p[0 ],"down" ) && p[1 ]) {VERIFY_PERMISSION (OPT_P_SCRIPT );if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err; -set_user_script (options, &options->down_script, p[1 ],"down" ); +set_user_script (options, &options->down_script, p[1 ],"down" , true); }else if (streq (p[0 ],"down-pre" )) {
@@ -5312,7 +5352,7 @@ add_option (struct options *options,VERIFY_PERMISSION (OPT_P_SCRIPT );if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err; -set_user_script (options, &options->route_script, p[1 ],"route-up" ); +set_user_script (options, &options->route_script, p[1 ],"route-up" , false); }else if (streq (p[0 ],"route-pre-down" ) && p[1 ]) {
@@ -5322,7 +5362,7 @@ add_option (struct options *options,set_user_script (options, &options->route_predown_script, p[1 ], -"route-pre-down" ); +"route-pre-down" , true); }else if (streq (p[0 ],"route-noexec" )) {
@@ -5691,7 +5731,7 @@ add_option (struct options *options, }set_user_script (options, &options->auth_user_pass_verify_script, - p[1 ],"auth-user-pass-verify" ); + p[1 ],"auth-user-pass-verify" , true); }else if (streq (p[0 ],"client-connect" ) && p[1 ]) {
@@ -5699,7 +5739,7 @@ add_option (struct options *options,if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err;set_user_script (options, &options->client_connect_script, - p[1 ],"client-connect" ); + p[1 ],"client-connect" , true); }else if (streq (p[0 ],"client-disconnect" ) && p[1 ]) {
@@ -5707,7 +5747,7 @@ add_option (struct options *options,if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err;set_user_script (options, &options->client_disconnect_script, - p[1 ],"client-disconnect" ); + p[1 ],"client-disconnect" , true); }else if (streq (p[0 ],"learn-address" ) && p[1 ]) {
@@ -5715,7 +5755,7 @@ add_option (struct options *options,if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err;set_user_script (options, &options->learn_address_script, - p[1 ],"learn-address" ); + p[1 ],"learn-address" , true); }else if (streq (p[0 ],"tmp-dir" ) && p[1 ]) {
@@ -6675,7 +6715,7 @@ add_option (struct options *options, goto err;set_user_script (options, &options->tls_verify,string_substitute (p[1 ],',' ,' ' , &options->gc), -"tls-verify" ); +"tls-verify" , true); }#ifndef ENABLE_CRYPTO_POLARSSL else if (streq (p[0], "tls-export-cert") && p[1])
Signature · 1 line
1.8.3.1
Quoted 15 lines · Steffan Karger
Hi David,
This solution looks good. I did not test, but I do have one minor comment after glancing at the code:
(quoted diff) +0
-0@@ -2662,7 +2700,14 @@ check_cmd_access(const char *command, constchar *opt) * only requires
X_OKto function on Unix - a scenario
not unlikely to * be seen on suid binaries. */ -return_code=check_file_access(CHKACC_FILE, argv.argv[0], X_OK, opt); + if
(chroot) + { +return_code=
check_file_access_chroot(chroot,CHKACC_FILE, argv.argv[0],X_OK,
opt); + } + else + { +return_code=check_file_access(CHKACC_FILE, argv.argv[0], X_OK, opt); + }
Quoted 4 lines
This if seems redundant here, as chroot is checked by
check_file_access_chrootitself. Furthermore, for the other occurences ofcheck_file_accessyou stick to just replacing it withcheck_file_acess_chroot. I would suggest to do that here too.
Thanks a lot for the review, Steffan!
Yeah, you're absolutely right. I have no strong feelings for either approaches. But the initial reason I did it in this explicit way, was to be, well, explicit about that we do something different when chroot is used - instead of burying it one level deeper down. On the other hand, simplicity can also be just the better approach.
I hold no grudges ;-) I've mailed a v2 version of this patch implementing it the way you suggest. And, surely, this change is even slightly less intrusive than my first approach.
So I'll let it be up to you, Josh and the rest of the ML to decide which approach you prefer more ... and Gert will apply whatever gets an ACK I presume :)
David S.
Signature · 3 lines
kind regards, David Sommerseth
Hi,
Quoted 1 line · David Sommerseth
and Gert will apply whatever gets an ACK I presume :)
ACK! :)
(On that statement, not on the patch, all my brains are focused on the dual-stack patch set)
gert
Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany [email protected]...
fax: +49-89-35655025 [email protected]...Sorry for the late response, but better late then never. So, ACK to this patch!
-Steffan
Quoted 250 lines · David Sommerseth
From: David Sommerseth <[email protected]...>
Commit
0f2bc0dd92f43c9started to introduce some file sanity checking before OpenVPN started to avoid harder to explain issues due to missing files or directories later on. But that commit did not consider --chroot at all. Which would basically cause OpenVPN to complain on non-missing files, because it would not consider that the files where inside a chroot.This patch is based on the thoughts in a patch by Josh Cepek [1], but trying to simplify it at bit.
[1] <http://thread.gmane.org/gmane.network.openvpn.devel/7873>,
(Message-ID: [email protected]...)[v2 - Simplify the changes in
check_cmd_access(), let the chroot
tackling happen only incheck_file_access_chroot()only]Trac-ticket: 330
Signed-off-by David Sommerseth <[email protected]...>--- src/openvpn/options.c | 82 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 21 deletions(-)src/openvpn/options.c +61
-21@@ -5,7 +5,7 @@* packet encryption, packet authentication, and * packet compression. * -* Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <[email protected]...> +* Copyright (C) 2002-2013 OpenVPN Technologies, Inc. <[email protected]...> * Copyright (C) 2008-2013 David Sommerseth <[email protected]...> * * This program is free software; you can redistribute it and/or modify @@ -2626,6 +2626,44 @@ check_file_access(const int type, const char *file, const int mode, const char *return (errcode !=0 ? true : false); } +/* A wrapper for check_file_access() which also takes a chroot directory. +* If chroot is NULL, behaviour is exactly the same as calling check_file_access() directly, +* otherwise it will look for the file inside the given chroot directory instead. +*/ +static bool +check_file_access_chroot (const char *chroot,const int type,const char *file,const int mode,const char *opt) +{ +bool ret = false; + +/* If no file configured, no errors to look for */ +if (!file) +return false; + +/* If chroot is set, look for the file/directory inside the chroot */ +if ( chroot ) + { +struct gc_arena gc =gc_new (); +struct buffer chroot_file; +int len =0 ; + +/* Build up a new full path including chroot directory */ + len =strlen (chroot) +strlen (PATH_SEPARATOR_STR ) +strlen (file) +1 ; + chroot_file =alloc_buf_gc (len, &gc); +buf_printf (&chroot_file,"%s%s%s" , chroot,PATH_SEPARATOR_STR , file); +ASSERT (chroot_file.len >0 ); + + ret =check_file_access (type,BSTR (&chroot_file), mode, opt); +gc_free (&gc); + } +else + { +/* No chroot in play, just call core file check function */ + ret =check_file_access (type, file, mode, opt); + } +return ret; +} + +/* * Verifies that the path in the "command" that comes after certain script options (e.g., --up) is a * valid file with appropriate permissions. @@ -2643,7 +2681,7 @@ check_file_access(const int type, const char *file, const int mode, const char ** check_file_access() arguments. */ static bool -check_cmd_access (const char *command,const char *opt) +check_cmd_access (const char *command,const char *opt,const char *chroot) {struct argv argv;bool return_code;@@ -2662,7 +2700,7 @@ check_cmd_access(const char *command, const char *opt)* only requires X_OK to function on Unix - a scenario not unlikely to * be seen on suid binaries. */ - return_code =check_file_access (CHKACC_FILE , argv.argv[0 ],X_OK , opt); + return_code =check_file_access_chroot (chroot,CHKACC_FILE , argv.argv[0 ],X_OK , opt); else { msg (M_NOPREFIX|M_OPTERR, "%s fails with '%s': No path to executable.",@@ -2688,7 +2726,7 @@ options_postprocess_filechecks (struct options *options)#ifdef ENABLE_SSL errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->dh_file,R_OK ,"--dh" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->ca_file,R_OK ,"--ca" ); - errs |=check_file_access (CHKACC_FILE , options->ca_path,R_OK ,"--capath" ); + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->ca_path,R_OK ,"--capath" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->cert_file,R_OK ,"--cert" ); errs |=check_file_access (CHKACC_FILE |CHKACC_INLINE , options->extra_certs_file,R_OK ,"--extra-certs" );@@ -2701,10 +2739,10 @@ options_postprocess_filechecks (struct options *options) "--pkcs12");if (options->ssl_flags &SSLF_CRL_VERIFY_DIR ) - errs |=check_file_access (CHKACC_FILE , options->crl_file,R_OK |X_OK , + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->crl_file,R_OK |X_OK ,"--crl-verify directory" );else - errs |=check_file_access (CHKACC_FILE , options->crl_file,R_OK , + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->crl_file,R_OK ,"--crl-verify" ); errs |= check_file_access (CHKACC_FILE|CHKACC_INLINE, options->tls_auth_file, R_OK,@@ -2746,13 +2784,13 @@ options_postprocess_filechecks (struct options *options)/* ** Config related ** */ #ifdef ENABLE_SSL - errs |=check_file_access (CHKACC_FILE , options->tls_export_cert, + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->tls_export_cert,R_OK |W_OK |X_OK ,"--tls-export-cert" );#endif /* ENABLE_SSL */ #if P2MP_SERVER - errs |=check_file_access (CHKACC_FILE , options->client_config_dir, + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->client_config_dir,R_OK |X_OK ,"--client-config-dir" ); - errs |=check_file_access (CHKACC_FILE , options->tmp_dir, + errs |=check_file_access_chroot (options->chroot_dir,CHKACC_FILE , options->tmp_dir,R_OK |W_OK |X_OK ,"Temporary directory (--tmp-dir)" );#endif /* P2MP_SERVER */ @@ -4017,7 +4055,8 @@ static void set_user_script (struct options *options, const char **script, const char *new_script, - const char *type) + const char *type, + bool in_chroot) { if (*script) { msg (M_WARN, "Multiple --%s scripts defined. "@@ -4032,8 +4071,9 @@ set_user_script (struct options *options,openvpn_snprintf (script_name,sizeof (script_name),"--%s script" , type); -if (check_cmd_access (*script, script_name)) +if (check_cmd_access (*script, script_name, (in_chroot ? options->chroot_dir :NULL ))) msg (M_USAGE, "Please correct this error."); + }#endif }@@ -4551,7 +4591,7 @@ add_option (struct options *options,set_user_script (options, &options->ipchange,string_substitute (p[1 ],',' ,' ' , &options->gc), -"ipchange" ); +"ipchange" , true); }else if (streq (p[0 ],"float" )) {@@ -4597,14 +4637,14 @@ add_option (struct options *options,VERIFY_PERMISSION (OPT_P_SCRIPT );if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err; -set_user_script (options, &options->up_script, p[1 ],"up" ); +set_user_script (options, &options->up_script, p[1 ],"up" , false); }else if (streq (p[0 ],"down" ) && p[1 ]) {VERIFY_PERMISSION (OPT_P_SCRIPT );if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err; -set_user_script (options, &options->down_script, p[1 ],"down" ); +set_user_script (options, &options->down_script, p[1 ],"down" , true); }else if (streq (p[0 ],"down-pre" )) {@@ -5312,7 +5352,7 @@ add_option (struct options *options,VERIFY_PERMISSION (OPT_P_SCRIPT );if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err; -set_user_script (options, &options->route_script, p[1 ],"route-up" ); +set_user_script (options, &options->route_script, p[1 ],"route-up" , false); }else if (streq (p[0 ],"route-pre-down" ) && p[1 ]) {@@ -5322,7 +5362,7 @@ add_option (struct options *options,set_user_script (options, &options->route_predown_script, p[1 ], -"route-pre-down" ); +"route-pre-down" , true); }else if (streq (p[0 ],"route-noexec" )) {@@ -5691,7 +5731,7 @@ add_option (struct options *options, }set_user_script (options, &options->auth_user_pass_verify_script, - p[1 ],"auth-user-pass-verify" ); + p[1 ],"auth-user-pass-verify" , true); }else if (streq (p[0 ],"client-connect" ) && p[1 ]) {@@ -5699,7 +5739,7 @@ add_option (struct options *options,if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err;set_user_script (options, &options->client_connect_script, - p[1 ],"client-connect" ); + p[1 ],"client-connect" , true); }else if (streq (p[0 ],"client-disconnect" ) && p[1 ]) {@@ -5707,7 +5747,7 @@ add_option (struct options *options,if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err;set_user_script (options, &options->client_disconnect_script, - p[1 ],"client-disconnect" ); + p[1 ],"client-disconnect" , true); }else if (streq (p[0 ],"learn-address" ) && p[1 ]) {@@ -5715,7 +5755,7 @@ add_option (struct options *options,if (!no_more_than_n_args (msglevel, p,2 ,NM_QUOTE_HINT )) goto err;set_user_script (options, &options->learn_address_script, - p[1 ],"learn-address" ); + p[1 ],"learn-address" , true); }else if (streq (p[0 ],"tmp-dir" ) && p[1 ]) {@@ -6675,7 +6715,7 @@ add_option (struct options *options, goto err;set_user_script (options, &options->tls_verify,string_substitute (p[1 ],',' ,' ' , &options->gc), -"tls-verify" ); +"tls-verify" , true); }#ifndef ENABLE_CRYPTO_POLARSSL else if (streq (p[0], "tls-export-cert") && p[1])
Your patch has been applied to the master and release/2.3 branches.
commit b77bffe8186647c6fd1f2f76aac41fd45719edb8 (master) commit c79fa3b0bb63bf7833f5a1c163bd30433c213b6a (release/2.3)
Author: David Sommerseth Date: Mon Nov 25 13:32:58 2013 +0100
Fix file checks when --chroot is being used
Signed-off-by: David Sommerseth <[email protected]...>
Acked-by: Steffan Karger <[email protected]...>
Message-Id: <[email protected]...>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8060
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering