- stevesk@cvs.openbsd.org 2001/05/19 19:43:57

[openssh.git] / readpass.c

diff --git a/readpass.c b/readpass.c
index b8f53734b5a1ea7d4f49d59b6934adc5e32a3488..d059272e74bb4827c1ec6d7c49848b2214e1e9b4 100644 (file)
--- a/readpass.c
+++ b/readpass.c
@@ -32,63 +32,93 @@
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: readpass.c,v 1.17 2001/05/06 17:52:07 mouring Exp $");
 
 #include "xmalloc.h"
+#include "cli.h"
+#include "readpass.h"
+#include "pathnames.h"
+#include "log.h"
+#include "atomicio.h"
 #include "ssh.h"
 
+char *
+ssh_askpass(char *askpass, const char *msg)
+{
+       pid_t pid;
+       size_t len;
+       char *nl, *pass;
+       int p[2], status;
+       char buf[1024];
+
+       if (fflush(stdout) != 0)
+               error("ssh_askpass: fflush: %s", strerror(errno));
+       if (askpass == NULL)
+               fatal("internal error: askpass undefined");
+       if (pipe(p) < 0)
+               fatal("ssh_askpass: pipe: %s", strerror(errno));
+       if ((pid = fork()) < 0)
+               fatal("ssh_askpass: fork: %s", strerror(errno));
+       if (pid == 0) {
+               seteuid(getuid());
+               setuid(getuid());
+               close(p[0]);
+               if (dup2(p[1], STDOUT_FILENO) < 0)
+                       fatal("ssh_askpass: dup2: %s", strerror(errno));
+               execlp(askpass, askpass, msg, (char *) 0);
+               fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno));
+       }
+       close(p[1]);
+       len = read(p[0], buf, sizeof buf);
+       close(p[0]);
+       while (waitpid(pid, &status, 0) < 0)
+               if (errno != EINTR)
+                       break;
+       if (len <= 1)
+               return xstrdup("");
+       nl = strchr(buf, '\n');
+       if (nl)
+               *nl = '\0';
+       pass = xstrdup(buf);
+       memset(buf, 0, sizeof(buf));
+       return pass;
+}
+
+
 /*
  * Reads a passphrase from /dev/tty with echo turned off.  Returns the
  * passphrase (allocated with xmalloc), being very careful to ensure that
  * no other userland buffer is storing the password.
  */
+/*
+ * Note:  the funcationallity of this routing has been moved to
+ * cli_read_passphrase().  This routing remains to maintain
+ * compatibility with existing code.
+ */
 char *
 read_passphrase(const char *prompt, int from_stdin)
 {
-       char buf[1024], *p, ch;
-       struct termios tio, saved_tio;
-       sigset_t oset, nset;
-       int input, output, echo = 0;
-  
-       if (from_stdin) {
-               input = STDIN_FILENO;
-               output = STDERR_FILENO;
-       } else
-               input = output = open("/dev/tty", O_RDWR);
-
-       if (input == -1)
-               fatal("You have no controlling tty.  Cannot read passphrase.\n");
+       char *askpass = NULL;
+       int use_askpass = 0, ttyfd;
 
-       /* block signals, get terminal modes and turn off echo */
-       sigemptyset(&nset);
-       sigaddset(&nset, SIGINT);
-       sigaddset(&nset, SIGTSTP);
-       (void) sigprocmask(SIG_BLOCK, &nset, &oset);
-
-       if (tcgetattr(input, &tio) == 0 && (tio.c_lflag & ECHO)) {
-               echo = 1;
-               saved_tio = tio;
-               tio.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL);
-               (void) tcsetattr(input, TCSANOW, &tio);
+       if (from_stdin) {
+               if (!isatty(STDIN_FILENO))
+                       use_askpass = 1;
+       } else {
+               ttyfd = open("/dev/tty", O_RDWR);
+               if (ttyfd >= 0)
+                       close(ttyfd);
+               else
+                       use_askpass = 1;
        }
 
-       fflush(stdout);
-
-       (void)write(output, prompt, strlen(prompt));
-       for (p = buf; read(input, &ch, 1) == 1 && ch != '\n';)
-               if (p < buf + sizeof(buf) - 1)
-                       *p++ = ch;
-       *p = '\0';
-       (void)write(output, "\n", 1);
-
-       /* restore terminal modes and allow signals */
-       if (echo)
-               tcsetattr(input, TCSANOW, &saved_tio);
-       (void) sigprocmask(SIG_SETMASK, &oset, NULL);
+       if (use_askpass && getenv("DISPLAY")) {
+               if (getenv(SSH_ASKPASS_ENV))
+                       askpass = getenv(SSH_ASKPASS_ENV);
+               else
+                       askpass = _PATH_SSH_ASKPASS_DEFAULT;
+               return ssh_askpass(askpass, prompt);
+       }
 
-       if (!from_stdin)
-               (void)close(input);
-       p = xstrdup(buf);
-       memset(buf, 0, sizeof(buf));
-       return (p);
+       return cli_read_passphrase(prompt, from_stdin, 0);
 }