summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGert Doering <gert@greenie.muc.de>2015-07-13 21:10:07 +0200
committerGert Doering <gert@greenie.muc.de>2015-07-13 21:33:26 +0200
commit079e5b9c13bf81d7afc6f932b5417d2f08f8e64b (patch)
treeeae7c1e025e15b21961a24a4380d4ff271cfbf1d
parent315f6fbc7f657a7f1127628bd714f468709d5185 (diff)
downloadopenvpn-079e5b9c13bf81d7afc6f932b5417d2f08f8e64b.tar.gz
openvpn-079e5b9c13bf81d7afc6f932b5417d2f08f8e64b.tar.xz
openvpn-079e5b9c13bf81d7afc6f932b5417d2f08f8e64b.zip
Produce a meaningful error message if --daemon gets in the way of asking for passwords.
With the --daemon / SSL init reordering in da9b292733, we fail if we daemonize first and then try to ask for a private key passphrase (or, for that matter, username+password if --auth-nocache is set) - but no meaningful error message was printed, instead depending on operating system and library versions, either we looped around "ssl init failed" or died with an unspecified "fatal error". So: check if get_user_pass_cr() is called in a context that needs "from_stdin", but both stdin and stderr are not connected to a tty device (which getpass() needs). In that case, print a meaningful error message pointing to --askpass, and die. Trac #574 and #576 Signed-off-by: Gert Doering <gert@greenie.muc.de> Acked-by: Steffan Karger <steffan.karger@fox-it.com> Message-Id: <1436814607-16707-1-git-send-email-gert@greenie.muc.de> URL: http://article.gmane.org/gmane.network.openvpn.devel/9916
-rw-r--r--src/openvpn/misc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c
index 4fdbf17..c4438b6 100644
--- a/src/openvpn/misc.c
+++ b/src/openvpn/misc.c
@@ -1056,6 +1056,10 @@ get_user_pass_cr (struct user_pass *up,
*/
else if (from_stdin)
{
+ /* did we --daemon'ize before asking for passwords? */
+ if ( !isatty(0) && !isatty(2) )
+ { msg(M_FATAL, "neither stdin nor stderr are a tty device, can't ask for %s password. If you used --daemon, you need to use --askpass to make passphrase-protected keys work, and you can not use --auth-nocache.", prefix ); }
+
#ifdef ENABLE_CLIENT_CR
if (auth_challenge && (flags & GET_USER_PASS_DYNAMIC_CHALLENGE))
{