X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tgetpass.c;h=62faead2345f6c3d38cbbde484c0f6b42fde99f5;hb=06a67e2a5850f36c627b46f330c988e031536ab3;hp=62f73da6ca6852e924efa58f16e93f2bc153b985;hpb=ca3ab12a66fc683cabf546fd405cfbf39ef9fb6f;p=debian%2Fsudo diff --git a/tgetpass.c b/tgetpass.c index 62f73da..62faead 100644 --- a/tgetpass.c +++ b/tgetpass.c @@ -1,47 +1,35 @@ /* - * Copyright (c) 1996, 1998-2001 Todd C. Miller - * All rights reserved. + * Copyright (c) 1996, 1998-2005, 2007-2008 + * Todd C. Miller * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 4. Products derived from this software may not be called "Sudo" nor - * may "Sudo" appear in their names without specific prior written - * permission from the author. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Sponsored in part by the Defense Advanced Research Projects + * Agency (DARPA) and Air Force Research Laboratory, Air Force + * Materiel Command, USAF, under agreement number F39502-99-1-0512. */ -#include "config.h" +#ifdef __TANDEM +# include +#endif + +#include #include #include #ifdef HAVE_SYS_BSDTYPES_H # include #endif /* HAVE_SYS_BSDTYPES_H */ -#ifdef HAVE_SYS_SELECT_H -# include -#endif /* HAVE_SYS_SELECT_H */ #include #include #ifdef STDC_HEADERS @@ -83,7 +71,7 @@ #include "sudo.h" #ifndef lint -static const char rcsid[] = "$Sudo: tgetpass.c,v 1.103 2001/12/17 23:56:47 millert Exp $"; +__unused static const char rcsid[] = "$Sudo: tgetpass.c,v 1.126 2008/12/09 20:55:49 millert Exp $"; #endif /* lint */ #ifndef TCSASOFT @@ -102,33 +90,32 @@ static const char rcsid[] = "$Sudo: tgetpass.c,v 1.103 2001/12/17 23:56:47 mille #endif /* - * Abstract method of getting at the term flags. + * Compat macros for non-termios systems. */ -#undef TERM -#undef tflags -#ifdef HAVE_TERMIOS_H -# define TERM termios -# define tflags c_lflag -# define term_getattr(f, t) tcgetattr(f, t) -# define term_setattr(f, t) tcsetattr(f, TCSAFLUSH|TCSASOFT, t) -#else +#ifndef HAVE_TERMIOS_H # ifdef HAVE_TERMIO_H -# define TERM termio -# define tflags c_lflag -# define term_getattr(f, t) ioctl(f, TCGETA, t) -# define term_setattr(f, t) ioctl(f, TCSETAF, t) +# undef termios +# define termios termio +# define tcgetattr(f, t) ioctl(f, TCGETA, t) +# define tcsetattr(f, a, t) ioctl(f, a, t) +# undef TCSAFLUSH +# define TCSAFLUSH TCSETAF # else -# define TERM sgttyb -# define tflags sg_flags -# define term_getattr(f, t) ioctl(f, TIOCGETP, t) -# define term_setattr(f, t) ioctl(f, TIOCSETP, t) +# undef termios +# define termios sgttyb +# define c_lflag sg_flags +# define tcgetattr(f, t) ioctl(f, TIOCGETP, t) +# define tcsetattr(f, a, t) ioctl(f, a, t) +# undef TCSAFLUSH +# define TCSAFLUSH TIOCSETP # endif /* HAVE_TERMIO_H */ #endif /* HAVE_TERMIOS_H */ static volatile sig_atomic_t signo; -static char *tgetline __P((int, char *, size_t, int)); static void handler __P((int)); +static char *getln __P((int, char *, size_t)); +static char *sudo_askpass __P((const char *)); /* * Like getpass(3) but with timeout and echo flags. @@ -139,32 +126,39 @@ tgetpass(prompt, timeout, flags) int timeout; int flags; { - sigaction_t sa, saveint, savehup, savequit, saveterm; + sigaction_t sa, savealrm, saveint, savehup, savequit, saveterm; sigaction_t savetstp, savettin, savettou; + struct termios term, oterm; + char *pass; static char buf[SUDO_PASS_MAX + 1]; int input, output, save_errno; - struct TERM term, oterm; - char *pass; + + (void) fflush(stdout); + + /* If using a helper program to get the password, run it instead. */ + if (ISSET(flags, TGP_ASKPASS) && user_askpass) + return(sudo_askpass(prompt)); restart: + signo = 0; + pass = NULL; + save_errno = 0; /* Open /dev/tty for reading/writing if possible else use stdin/stderr. */ - if ((flags & TGP_STDIN) || + if (ISSET(flags, TGP_STDIN) || (input = output = open(_PATH_TTY, O_RDWR|O_NOCTTY)) == -1) { input = STDIN_FILENO; output = STDERR_FILENO; } - if (prompt) - (void) write(output, prompt, strlen(prompt)); - /* * Catch signals that would otherwise cause the user to end - * up with echo turned off in the shell. Don't worry about - * things like SIGALRM and SIGPIPE for now. + * up with echo turned off in the shell. */ + zero_bytes(&sa, sizeof(sa)); sigemptyset(&sa.sa_mask); - sa.sa_flags = 0; /* don't restart system calls */ + sa.sa_flags = SA_INTERRUPT; /* don't restart system calls */ sa.sa_handler = handler; + (void) sigaction(SIGALRM, &sa, &savealrm); (void) sigaction(SIGINT, &sa, &saveint); (void) sigaction(SIGHUP, &sa, &savehup); (void) sigaction(SIGQUIT, &sa, &savequit); @@ -174,28 +168,41 @@ restart: (void) sigaction(SIGTTOU, &sa, &savettou); /* Turn echo off/on as specified by flags. */ - if (term_getattr(input, &oterm) == 0) { + if (tcgetattr(input, &oterm) == 0) { (void) memcpy(&term, &oterm, sizeof(term)); - if (!(flags & TGP_ECHO)) - term.tflags &= ~(ECHO | ECHONL); + if (!ISSET(flags, TGP_ECHO)) + CLR(term.c_lflag, ECHO|ECHONL); #ifdef VSTATUS term.c_cc[VSTATUS] = _POSIX_VDISABLE; #endif - (void) term_setattr(input, &term); + (void) tcsetattr(input, TCSAFLUSH|TCSASOFT, &term); } else { - memset(&term, 0, sizeof(term)); - memset(&oterm, 0, sizeof(oterm)); + zero_bytes(&term, sizeof(term)); + zero_bytes(&oterm, sizeof(oterm)); } - pass = tgetline(input, buf, sizeof(buf), timeout); - save_errno = errno; + /* No output if we are already backgrounded. */ + if (signo != SIGTTOU && signo != SIGTTIN) { + if (prompt) + (void) write(output, prompt, strlen(prompt)); - if (!(term.tflags & ECHO)) - (void) write(output, "\n", 1); + if (timeout > 0) + alarm(timeout); + pass = getln(input, buf, sizeof(buf)); + alarm(0); + save_errno = errno; + + if (!ISSET(term.c_lflag, ECHO)) + (void) write(output, "\n", 1); + } /* Restore old tty settings and signals. */ - if (memcmp(&term, &oterm, sizeof(term)) != 0) - (void) term_setattr(input, &oterm); + if (memcmp(&term, &oterm, sizeof(term)) != 0) { + while (tcsetattr(input, TCSAFLUSH|TCSASOFT, &oterm) == -1 && + errno == EINTR) + continue; + } + (void) sigaction(SIGALRM, &savealrm, NULL); (void) sigaction(SIGINT, &saveint, NULL); (void) sigaction(SIGHUP, &savehup, NULL); (void) sigaction(SIGQUIT, &savequit, NULL); @@ -211,90 +218,104 @@ restart: * now that we have restored the signal handlers. */ if (signo) { - kill(getpid(), signo); + kill(getpid(), signo); switch (signo) { case SIGTSTP: case SIGTTIN: case SIGTTOU: - signo = 0; goto restart; } } - errno = save_errno; + if (save_errno) + errno = save_errno; return(pass); } /* - * Get a line of input (optionally timing out) and place it in buf. + * Fork a child and exec sudo-askpass to get the password from the user. */ static char * -tgetline(fd, buf, bufsiz, timeout) +sudo_askpass(prompt) + const char *prompt; +{ + static char buf[SUDO_PASS_MAX + 1], *pass; + sigaction_t sa, saved_sa_pipe; + int pfd[2]; + pid_t pid; + + if (pipe(pfd) == -1) + error(1, "unable to create pipe"); + + if ((pid = fork()) == -1) + error(1, "unable to fork"); + + if (pid == 0) { + /* child, point stdout to output side of the pipe and exec askpass */ + (void) dup2(pfd[1], STDOUT_FILENO); + set_perms(PERM_FULL_USER); + closefrom(STDERR_FILENO + 1); + execl(user_askpass, user_askpass, prompt, (char *)NULL); + warning("unable to run %s", user_askpass); + _exit(255); + } + + /* Ignore SIGPIPE in case child exits prematurely */ + zero_bytes(&sa, sizeof(sa)); + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + sa.sa_handler = SIG_IGN; + (void) sigaction(SIGPIPE, &sa, &saved_sa_pipe); + + /* Get response from child (askpass) and restore SIGPIPE handler */ + (void) close(pfd[1]); + pass = getln(pfd[0], buf, sizeof(buf)); + (void) close(pfd[0]); + (void) sigaction(SIGPIPE, &saved_sa_pipe, NULL); + + return(pass); +} + +static char * +getln(fd, buf, bufsiz) int fd; char *buf; size_t bufsiz; - int timeout; { - fd_set *readfds = NULL; - struct timeval tv; - size_t left; - char *cp; - char c; - int n; + ssize_t nr = -1; + char *cp = buf; + char c = '\0'; if (bufsiz == 0) { errno = EINVAL; return(NULL); /* sanity */ } - cp = buf; - left = bufsiz; - - /* - * Timeout of <= 0 means no timeout. - */ - if (timeout > 0) { - /* Setup for select(2) */ - n = howmany(fd + 1, NFDBITS) * sizeof(fd_mask); - readfds = (fd_set *) emalloc(n); - (void) memset((VOID *)readfds, 0, n); - - /* Set timeout for select */ - tv.tv_sec = timeout; - tv.tv_usec = 0; - - while (--left) { - FD_SET(fd, readfds); - - /* Make sure there is something to read (or timeout) */ - while ((n = select(fd + 1, readfds, 0, 0, &tv)) == -1 && - errno == EAGAIN) - ; - if (n <= 0) { - free(readfds); - return(NULL); /* timeout or interrupt */ - } - - /* Read a character, exit loop on error, EOF or EOL */ - n = read(fd, &c, 1); - if (n != 1 || c == '\n' || c == '\r') - break; - *cp++ = c; - } - free(readfds); - } else { - /* Keep reading until out of space, EOF, error, or newline */ - n = -1; - while (--left && (n = read(fd, &c, 1)) == 1 && c != '\n' && c != '\r') - *cp++ = c; + while (--bufsiz) { + nr = read(fd, &c, 1); + if (nr != 1 || c == '\n' || c == '\r') + break; + *cp++ = c; } *cp = '\0'; - return(n == -1 ? NULL : buf); + return(nr == 1 ? buf : NULL); } -static void handler(s) +static void +handler(s) int s; { - signo = s; + if (s != SIGALRM) + signo = s; +} + +int +tty_present() +{ + int fd; + + if ((fd = open(_PATH_TTY, O_RDWR|O_NOCTTY)) != -1) + close(fd); + return(fd != -1); }