--- rxvt-unicode/src/ptytty.C 2004/04/02 20:41:01 1.10 +++ rxvt-unicode/src/ptytty.C 2006/01/17 15:41:33 1.41 @@ -1,9 +1,10 @@ /*--------------------------------*-C-*---------------------------------* - * File: ptytty.c + * File: ptytty.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. * Copyright (c) 1999-2001 Geoff Wing + * Copyright (c) 2004-2006 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,49 +22,42 @@ *---------------------------------------------------------------------*/ #include "../config.h" /* NECESSARY */ +#include "rxvt.h" -/* - * Try to be self-contained except for the above autoconfig'd defines - */ +#include +#include -#if 0 -#ifdef HAVE_GETPT -# define _GNU_SOURCE -#endif -#endif +#include +#include +#include +#include -#include -#ifdef HAVE_STDLIB_H -# include -#endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif -#if defined(HAVE_STRING_H) -# include -#endif -#ifdef HAVE_FCNTL_H -# include -#endif #ifdef HAVE_SYS_IOCTL_H # include #endif -#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__) +#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) # include /* for I_PUSH */ #endif #ifdef HAVE_ISASTREAM # include #endif - -#ifdef DEBUG_TTY -# define D_TTY(x) fprintf x ; fputc('\n', stderr) ; fflush(stderr) -#else -# define D_TTY(x) +#if defined(HAVE_PTY_H) +# include +#elif defined(HAVE_LIBUTIL_H) +# include +#elif defined(HAVE_UTIL_H) +# include #endif +#include +#include + +#include "rxvtutil.h" +#include "fdpass.h" +#include "ptytty.h" + +///////////////////////////////////////////////////////////////////////////// + /* ------------------------------------------------------------------------- * * GET PSEUDO TELETYPE - MASTER AND SLAVE * * ------------------------------------------------------------------------- */ @@ -72,17 +66,17 @@ * If successful, ttydev is set to the name of the slave device. * fd_tty _may_ also be set to an open fd to the slave device */ -/* EXTPROTO */ -int -rxvt_get_pty (int *fd_tty, const char **ttydev) +static int +get_pty (int *fd_tty, char **ttydev) { int pfd; #ifdef PTYS_ARE_OPENPTY - char tty_name[sizeof "/dev/pts/????\0"]; - if (openpty (&pfd, fd_tty, tty_name, NULL, NULL) != -1) + int res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); + + if (res != -1) { *ttydev = strdup (tty_name); return pfd; @@ -95,35 +89,26 @@ return pfd; #endif -#ifdef PTYS_ARE_GETPTY - - char *ptydev; - - while ((ptydev = getpty ()) != NULL) - if ((pfd = open (ptydev, O_RDWR | O_NOCTTY, 0)) >= 0) - { - *ttydev = ptydev; - return pfd; - } -#endif - #if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) -# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) +# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX) { # ifdef PTYS_ARE_GETPT - pfd = getpt (); + pfd = getpt(); +# else +# ifdef PTYS_ARE_POSIX + pfd = posix_openpt (O_RDWR); # else - pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); # endif +# endif if (pfd >= 0) { if (grantpt (pfd) == 0 /* change slave permissions */ && unlockpt (pfd) == 0) { /* slave now unlocked */ - *ttydev = ptsname (pfd); /* get slave's name */ + *ttydev = strdup (ptsname (pfd)); /* get slave's name */ return pfd; } close (pfd); @@ -135,7 +120,7 @@ #ifdef PTYS_ARE_PTC if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) { - *ttydev = ttyname (pfd); + *ttydev = strdup (ttyname (pfd)); return pfd; } #endif @@ -143,20 +128,20 @@ #ifdef PTYS_ARE_CLONE if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) { - *ttydev = ptsname (pfd); + *ttydev = strdup (ptsname (pfd)); return pfd; } #endif #ifdef PTYS_ARE_NUMERIC { - int idx; - char *c1, *c2; - char pty_name[] = "/dev/ptyp???"; - char tty_name[] = "/dev/ttyp???"; + int idx; + char *c1, *c2; + char pty_name[] = "/dev/ptyp???"; + char tty_name[] = "/dev/ttyp???"; - c1 = & (pty_name[sizeof (pty_name) - 4]); - c2 = & (tty_name[sizeof (tty_name) - 4]); + c1 = &(pty_name[sizeof (pty_name) - 4]); + c2 = &(tty_name[sizeof (tty_name) - 4]); for (idx = 0; idx < 256; idx++) { sprintf (c1, "%d", idx); @@ -166,6 +151,7 @@ idx = 256; break; } + if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) { if (access (tty_name, R_OK | W_OK) == 0) @@ -173,16 +159,18 @@ *ttydev = strdup (tty_name); return pfd; } + close (pfd); } } } #endif + #ifdef PTYS_ARE_SEARCHED { - const char *c1, *c2; - char pty_name[] = "/dev/pty??"; - char tty_name[] = "/dev/tty??"; + const char *c1, *c2; + char pty_name[] = "/dev/pty??"; + char tty_name[] = "/dev/tty??"; # ifndef PTYCHAR1 # define PTYCHAR1 "pqrstuvwxyz" @@ -206,12 +194,14 @@ *ttydev = strdup (tty_name); return pfd; } + close (pfd); } } } } #endif + return -1; } @@ -219,9 +209,8 @@ /* * Returns tty file descriptor, or -1 on failure */ -/* EXTPROTO */ -int -rxvt_get_tty (const char *ttydev) +static int +get_tty (char *ttydev) { return open (ttydev, O_RDWR | O_NOCTTY, 0); } @@ -230,41 +219,16 @@ /* * Make our tty a controlling tty so that /dev/tty points to us */ -/* EXTPROTO */ -int -rxvt_control_tty (int fd_tty, const char *ttydev) +static int +control_tty (int fd_tty) { -#ifndef __QNX__ int fd; - D_TTY ((stderr, "rxvt_control_tty (): pid: %d, tty fd: %d, dev: %s", getpid (), fd_tty, ttydev)); /* ---------------------------------------- */ -# ifdef HAVE_SETSID setsid (); -# endif -# if defined(HAVE_SETPGID) - setpgid (0, 0); -# elif defined(HAVE_SETPGRP) - setpgrp (0, 0); -# endif - /* ---------------------------------------- */ -# ifdef TIOCNOTTY - fd = open ("/dev/tty", O_RDWR | O_NOCTTY); - D_TTY ((stderr, "rxvt_control_tty (): Voiding tty associations: previous=%s", fd < 0 ? "no" : "yes")); - if (fd >= 0) - { - ioctl (fd, TIOCNOTTY, NULL); /* void tty associations */ - close (fd); - } -# endif - /* ---------------------------------------- */ - fd = open ("/dev/tty", O_RDWR | O_NOCTTY); - D_TTY ((stderr, "rxvt_control_tty (): /dev/tty has controlling tty? %s", fd < 0 ? "no (good)" : "yes (bad)")); - if (fd >= 0) - close (fd); /* ouch: still have controlling tty */ /* ---------------------------------------- */ -#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) +# if defined(PTYS_ARE_PTMX) && defined(I_PUSH) /* * Push STREAMS modules: * ptem: pseudo-terminal hardware emulation module. @@ -282,40 +246,373 @@ * close () - on the master side which causes a hang up to be sent * through - Geoff Wing */ -# ifdef HAVE_ISASTREAM +# ifdef HAVE_ISASTREAM if (isastream (fd_tty) == 1) -# endif +# endif { - D_TTY ((stderr, "rxvt_control_tty (): Pushing STREAMS modules")); ioctl (fd_tty, I_PUSH, "ptem"); ioctl (fd_tty, I_PUSH, "ldterm"); ioctl (fd_tty, I_PUSH, "ttcompat"); } -#endif +# endif /* ---------------------------------------- */ -# if defined(TIOCSCTTY) fd = ioctl (fd_tty, TIOCSCTTY, NULL); - D_TTY ((stderr, "rxvt_control_tty (): ioctl (..,TIOCSCTTY): %d", fd)); -# elif defined(TIOCSETCTTY) - fd = ioctl (fd_tty, TIOCSETCTTY, NULL); - D_TTY ((stderr, "rxvt_control_tty (): ioctl (..,TIOCSETCTTY): %d", fd)); -# else - fd = open (ttydev, O_RDWR); - D_TTY ((stderr, "rxvt_control_tty (): tty open%s", fd < 0 ? " failure" : "ed OK")); - if (fd >= 0) - close (fd); -# endif /* ---------------------------------------- */ fd = open ("/dev/tty", O_WRONLY); - D_TTY ((stderr, "rxvt_control_tty (): do we have controlling tty now: %s", fd < 0 ? "no (fatal)" : "yes (good)")); if (fd < 0) return -1; /* fatal */ close (fd); /* ---------------------------------------- */ - D_TTY ((stderr, "rxvt_control_tty (): tcgetpgrp (): %d getpgrp (): %d", tcgetpgrp (fd_tty), getpgrp ())); - /* ---------------------------------------- */ -#endif /* ! __QNX__ */ return 0; } + +void +rxvt_ptytty::close_tty () +{ + if (tty < 0) + return; + + close (tty); + tty = -1; +} + +bool +rxvt_ptytty::make_controlling_tty () +{ + return control_tty (tty) >= 0; +} + +void +rxvt_ptytty::set_utf8_mode (bool on) +{ +#ifdef IUTF8 + if (pty < 0) + return; + + struct termios tio; + + if (tcgetattr (pty, &tio) != -1) + { + tcflag_t new_cflag = tio.c_iflag; + + if (on) + new_cflag |= IUTF8; + else + new_cflag &= ~IUTF8; + + if (new_cflag != tio.c_iflag) + { + tio.c_iflag = new_cflag; + tcsetattr (pty, TCSANOW, &tio); + } + } +#endif +} + +///////////////////////////////////////////////////////////////////////////// + +#ifndef NO_SETOWNER_TTYDEV +static struct ttyconf { + gid_t gid; + mode_t mode; + + ttyconf () + { +#ifdef TTY_GID_SUPPORT + struct group *gr = getgrnam ("tty"); + + if (gr) + { /* change group ownership of tty to "tty" */ + mode = S_IRUSR | S_IWUSR | S_IWGRP; + gid = gr->gr_gid; + } + else +#endif /* TTY_GID_SUPPORT */ + { + mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; + gid = getgid (); + } + } +} ttyconf; + +///////////////////////////////////////////////////////////////////////////// + +void +rxvt_ptytty_unix::privileges (rxvt_privaction action) +{ + if (!name || !*name) + return; + + if (action == SAVE) + { +# ifndef RESET_TTY_TO_COMMON_DEFAULTS + /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ + if (lstat (name, &savestat) < 0) /* you lose out */ + ; + else +# endif + { + saved = true; + chown (name, getuid (), ttyconf.gid); /* fail silently */ + chmod (name, ttyconf.mode); +# ifdef HAVE_REVOKE + revoke (name); +# endif + } + } + else + { /* action == RESTORE */ +# ifndef RESET_TTY_TO_COMMON_DEFAULTS + if (saved) + { + chmod (name, savestat.st_mode); + chown (name, savestat.st_uid, savestat.st_gid); + } +# else + chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); + chown (name, 0, 0); +# endif + + } +} +#endif + +rxvt_ptytty_unix::rxvt_ptytty_unix () +{ + pty = tty = -1; + name = 0; +#ifndef NO_SETOWNER_TTYDEV + saved = false; +#endif +#if UTMP_SUPPORT + cmd_pid = 0; +#endif +} + +rxvt_ptytty_unix::~rxvt_ptytty_unix () +{ + logout (); + put (); +} + +void +rxvt_ptytty_unix::put () +{ +#ifndef NO_SETOWNER_TTYDEV + privileges (RESTORE); +#endif + + if (pty >= 0) close (pty); + close_tty (); + free (name); + + pty = tty = -1; + name = 0; +} + +bool +rxvt_ptytty_unix::get () +{ + /* get master (pty) */ + if ((pty = get_pty (&tty, &name)) < 0) + return false; + + fcntl (pty, F_SETFL, O_NONBLOCK); + + /* get slave (tty) */ + if (tty < 0) + { +#ifndef NO_SETOWNER_TTYDEV + privileges (SAVE); +#endif + + if ((tty = get_tty (name)) < 0) + { + put (); + return false; + } + } + + return true; +} + +#if PTYTTY_HELPER + +static int sock_fd; +static int pid; + +struct command +{ + enum { get, login, destroy } type; + + rxvt_ptytty *id; + + bool login_shell; + int cmd_pid; + char hostname[512]; // arbitrary, but should be plenty +}; + +struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty +{ + rxvt_ptytty *id; + + ~rxvt_ptytty_proxy (); + + bool get (); + void login (int cmd_pid, bool login_shell, const char *hostname); +}; + +bool +rxvt_ptytty_proxy::get () +{ + command cmd; + + cmd.type = command::get; + + write (sock_fd, &cmd, sizeof (cmd)); + + if (read (sock_fd, &id, sizeof (id)) != sizeof (id)) + rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n"); + + if (!id) + return false; + + if ((pty = rxvt_recv_fd (sock_fd)) < 0 + || (tty = rxvt_recv_fd (sock_fd)) < 0) + rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n"); + + return true; +} + +void +rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname) +{ + command cmd; + + cmd.type = command::login; + cmd.id = id; + cmd.cmd_pid = cmd_pid; + cmd.login_shell = login_shell; + strncpy (cmd.hostname, hostname, sizeof (cmd.hostname)); + + write (sock_fd, &cmd, sizeof (cmd)); +} + +rxvt_ptytty_proxy::~rxvt_ptytty_proxy () +{ + command cmd; + + cmd.type = command::destroy; + cmd.id = id; + + write (sock_fd, &cmd, sizeof (cmd)); +} + +static +void serve () +{ + command cmd; + vector ptys; + + while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command)) + { + if (cmd.type == command::get) + { + // -> id ptyfd ttyfd + cmd.id = new rxvt_ptytty_unix; + + if (cmd.id->get ()) + { + write (sock_fd, &cmd.id, sizeof (cmd.id)); + ptys.push_back (cmd.id); + + rxvt_send_fd (sock_fd, cmd.id->pty); + rxvt_send_fd (sock_fd, cmd.id->tty); + } + else + { + delete cmd.id; + cmd.id = 0; + write (sock_fd, &cmd.id, sizeof (cmd.id)); + } + } + else if (cmd.type == command::login) + { + if (find (ptys.begin (), ptys.end (), cmd.id)) + { + cmd.hostname[sizeof (cmd.hostname) - 1] = 0; + cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname); + } + } + else if (cmd.type == command::destroy) + { + rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); + + if (*pty) + { + ptys.erase (pty); + delete *pty; + } + } + else + break; + } + + // destroy all ptys + for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); ) + delete *i; +} + +void rxvt_ptytty_server () +{ + int sv[2]; + + if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv)) + rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n"); + + pid = fork (); + + if (pid < 0) + rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n"); + + if (pid) + { + // client, urxvt + sock_fd = sv[0]; + close (sv[1]); + fcntl (sock_fd, F_SETFD, FD_CLOEXEC); + } + else + { + setgid (getegid ()); + setuid (geteuid ()); + + // server, pty-helper + sock_fd = sv[1]; + + for (int fd = 0; fd < 1023; fd++) + if (fd != sock_fd) + close (fd); + + serve (); + _exit (EXIT_SUCCESS); + } +} +#endif + +// a "factory" *g* +rxvt_ptytty * +rxvt_new_ptytty () +{ +#if PTYTTY_HELPER + if (pid > 0) + // use helper process + return new rxvt_ptytty_proxy; + else +#endif + return new rxvt_ptytty_unix; +} + /*----------------------- end-of-file (C source) -----------------------*/ +