ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/ptytty.C
(Generate patch)

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.47 by root, Thu Jan 19 10:27:27 2006 UTC vs.
Revision 1.59 by root, Mon Jan 23 12:05:12 2006 UTC

1// This file is part of libptytty. Do not make local modifications.
2// http://software.schmorp.de/pkg/libptytty
3
1/*--------------------------------*-C-*---------------------------------* 4/*----------------------------------------------------------------------*
2 * File: ptytty.C 5 * File: ptytty.C
3 *----------------------------------------------------------------------* 6 *----------------------------------------------------------------------*
4 * 7 *
5 * All portions of code are copyright by their respective author/s. 8 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 9 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
7 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com> 10 * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
11 * Copyright (c) 2006 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 * 12 *
9 * This program is free software; you can redistribute it and/or modify 13 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by 14 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or 15 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 16 * (at your option) any later version.
… …
19 * You should have received a copy of the GNU General Public License 23 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 24 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 25 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 26 *---------------------------------------------------------------------*/
23 27
24#include "../config.h" /* NECESSARY */ 28#include "../config.h"
29
25#include "rxvt.h" 30#include "ptytty.h"
26 31
27#include <cstdlib> 32#include <cstdlib>
28#include <cstring> 33#include <cstring>
34#include <csignal>
29 35
30#include <sys/types.h> 36#include <sys/types.h>
31#include <sys/socket.h> 37#include <sys/socket.h>
32#include <unistd.h> 38#include <unistd.h>
33#include <fcntl.h> 39#include <fcntl.h>
34 40
35#ifdef HAVE_SYS_IOCTL_H 41#ifdef HAVE_SYS_IOCTL_H
36# include <sys/ioctl.h> 42# include <sys/ioctl.h>
37#endif 43#endif
38#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) 44#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
39# include <sys/stropts.h> /* for I_PUSH */ 45# include <sys/stropts.h> /* for I_PUSH */
40#endif 46#endif
41#ifdef HAVE_ISASTREAM 47#ifdef HAVE_ISASTREAM
42# include <stropts.h> 48# include <stropts.h>
43#endif 49#endif
… …
46#elif defined(HAVE_LIBUTIL_H) 52#elif defined(HAVE_LIBUTIL_H)
47# include <libutil.h> 53# include <libutil.h>
48#elif defined(HAVE_UTIL_H) 54#elif defined(HAVE_UTIL_H)
49# include <util.h> 55# include <util.h>
50#endif 56#endif
57#ifdef TTY_GID_SUPPORT
58#include <grp.h>
59#endif
51 60
52#include <cstdio> 61#include <cstdio>
53#include <grp.h>
54
55#include "rxvtutil.h"
56#include "fdpass.h"
57#include "ptytty.h"
58 62
59///////////////////////////////////////////////////////////////////////////// 63/////////////////////////////////////////////////////////////////////////////
60 64
61/* ------------------------------------------------------------------------- * 65/* ------------------------------------------------------------------------- *
62 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 66 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
… …
64/* 68/*
65 * Returns pty file descriptor, or -1 on failure 69 * Returns pty file descriptor, or -1 on failure
66 * If successful, ttydev is set to the name of the slave device. 70 * If successful, ttydev is set to the name of the slave device.
67 * fd_tty _may_ also be set to an open fd to the slave device 71 * fd_tty _may_ also be set to an open fd to the slave device
68 */ 72 */
69static inline int 73#if defined(UNIX98_PTY)
74static int
70get_pty_streams (int *fd_tty, char **ttydev) 75get_pty (int *fd_tty, char **ttydev)
71{ 76{
72#ifdef NO_SETOWNER_TTYDEV
73 int pfd; 77 int pfd;
74 78
75# if defined(PTYS_ARE_GETPT) 79# if defined(HAVE_GETPT)
76 pfd = getpt(); 80 pfd = getpt();
77# elif defined(PTYS_ARE_POSIX) 81# elif defined(HAVE_POSIX_OPENPT)
78 pfd = posix_openpt (O_RDWR); 82 pfd = posix_openpt (O_RDWR);
79# else 83# else
80 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 84 pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0);
81# endif 85# endif
82 if (pfd >= 0) 86 if (pfd >= 0)
83 { 87 {
84 if (grantpt (pfd) == 0 /* change slave permissions */ 88 if (grantpt (pfd) == 0 /* change slave permissions */
85 && unlockpt (pfd) == 0) 89 && unlockpt (pfd) == 0)
… …
88 return pfd; 92 return pfd;
89 } 93 }
90 94
91 close (pfd); 95 close (pfd);
92 } 96 }
93#endif
94 97
95 return -1; 98 return -1;
96} 99}
97 100#elif defined(HAVE_OPENPTY)
98static inline int 101static int
99get_pty_openpty (int *fd_tty, char **ttydev) 102get_pty (int *fd_tty, char **ttydev)
100{ 103{
101#ifdef PTYS_ARE_OPENPTY
102 int pfd; 104 int pfd;
103 int res; 105 int res;
104 char tty_name[sizeof "/dev/pts/????\0"]; 106 char tty_name[32];
105 107
106 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 108 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
107 if (res != -1) 109 if (res != -1)
108 { 110 {
109 *ttydev = strdup (tty_name); 111 *ttydev = strdup (tty_name);
110 return pfd; 112 return pfd;
111 } 113 }
112#endif
113 114
114 return -1; 115 return -1;
115} 116}
116 117#elif defined(HAVE__GETPTY)
117static inline int 118static int
118get_pty__getpty (int *fd_tty, char **ttydev) 119get_pty (int *fd_tty, char **ttydev)
119{ 120{
120#ifdef PTYS_ARE__GETPTY
121 int pfd; 121 int pfd;
122 122
123 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 123 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
124 if (*ttydev != NULL) 124 if (*ttydev != NULL)
125 return pfd; 125 return pfd;
126#endif
127 126
128 return -1; 127 return -1;
129} 128}
130 129#elif defined(HAVE_DEV_PTC)
131static inline int 130static int
132get_pty_ptc (int *fd_tty, char **ttydev) 131get_pty (int *fd_tty, char **ttydev)
133{ 132{
134#ifdef PTYS_ARE_PTC
135 int pfd; 133 int pfd;
136 134
137 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) 135 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
138 { 136 {
139 *ttydev = strdup (ttyname (pfd)); 137 *ttydev = strdup (ttyname (pfd));
140 return pfd; 138 return pfd;
141 } 139 }
142#endif
143 140
144 return -1; 141 return -1;
145} 142}
146 143#elif defined(HAVE_DEV_CLONE)
147static inline int 144static int
148get_pty_clone (int *fd_tty, char **ttydev) 145get_pty (int *fd_tty, char **ttydev)
149{ 146{
150#ifdef PTYS_ARE_CLONE
151 int pfd; 147 int pfd;
152 148
153 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) 149 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
154 { 150 {
155 *ttydev = strdup (ptsname (pfd)); 151 *ttydev = strdup (ptsname (pfd));
156 return pfd; 152 return pfd;
157 } 153 }
158#endif
159 154
160 return -1; 155 return -1;
161} 156}
162 157#else
163static inline int 158/* Based on the code in openssh/openbsd-compat/bsd-openpty.c */
164get_pty_numeric (int *fd_tty, char **ttydev)
165{
166#ifdef PTYS_ARE_NUMERIC
167 int pfd;
168 int idx;
169 char *c1, *c2;
170 char pty_name[] = "/dev/ptyp???";
171 char tty_name[] = "/dev/ttyp???";
172
173 c1 = &(pty_name[sizeof (pty_name) - 4]);
174 c2 = &(tty_name[sizeof (tty_name) - 4]);
175
176 for (idx = 0; idx < 256; idx++)
177 {
178 sprintf (c1, "%d", idx);
179 sprintf (c2, "%d", idx);
180
181 if (access (tty_name, F_OK) < 0)
182 {
183 idx = 256;
184 break;
185 }
186
187 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
188 {
189 if (access (tty_name, R_OK | W_OK) == 0)
190 {
191 *ttydev = strdup (tty_name);
192 return pfd;
193 }
194
195 close (pfd);
196 }
197 }
198#endif
199
200 return -1;
201}
202
203static inline int
204get_pty_searched (int *fd_tty, char **ttydev)
205{
206#ifdef PTYS_ARE_SEARCHED
207# ifndef PTYCHAR1
208# define PTYCHAR1 "pqrstuvwxyz"
209# endif
210# ifndef PTYCHAR2
211# define PTYCHAR2 "0123456789abcdef"
212# endif
213 int pfd;
214 const char *c1, *c2;
215 char pty_name[] = "/dev/pty??";
216 char tty_name[] = "/dev/tty??";
217
218 for (c1 = PTYCHAR1; *c1; c1++)
219 {
220 pty_name[ (sizeof (pty_name) - 3)] =
221 tty_name[ (sizeof (pty_name) - 3)] = *c1;
222
223 for (c2 = PTYCHAR2; *c2; c2++)
224 {
225 pty_name[ (sizeof (pty_name) - 2)] =
226 tty_name[ (sizeof (pty_name) - 2)] = *c2;
227
228 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
229 {
230 if (access (tty_name, R_OK | W_OK) == 0)
231 {
232 *ttydev = strdup (tty_name);
233 return pfd;
234 }
235
236 close (pfd);
237 }
238 }
239 }
240#endif
241
242 return -1;
243}
244
245static int 159static int
246get_pty (int *fd_tty, char **ttydev) 160get_pty (int *fd_tty, char **ttydev)
247{ 161{
248 int pfd; 162 int pfd;
249 163 int i;
250 if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1 164 char pty_name[32];
251 || (pfd = get_pty_openpty (fd_tty, ttydev)) != -1 165 char tty_name[32];
252 || (pfd = get_pty__getpty (fd_tty, ttydev)) != -1 166 const char *majors = "pqrstuvwxyzabcde";
253 || (pfd = get_pty_ptc (fd_tty, ttydev)) != -1 167 const char *minors = "0123456789abcdef";
254 || (pfd = get_pty_clone (fd_tty, ttydev)) != -1 168 for (i = 0; i < 256; i++)
255 || (pfd = get_pty_numeric (fd_tty, ttydev)) != -1 169 {
256 || (pfd = get_pty_searched (fd_tty, ttydev)) != -1) 170 snprintf(pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]);
171 snprintf(tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]);
172 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
173 {
174 snprintf(pty_name, 32, "/dev/ptyp%d", i);
175 snprintf(tty_name, 32, "/dev/ttyp%d", i);
176 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
177 continue;
178 }
179 if (access (tty_name, R_OK | W_OK) == 0)
180 {
181 *ttydev = strdup (tty_name);
257 return pfd; 182 return pfd;
183 }
258 184
259 return -1; 185 close (pfd);
186 }
260} 187}
188#endif
261 189
262/*----------------------------------------------------------------------*/ 190/*----------------------------------------------------------------------*/
263/* 191/*
264 * Returns tty file descriptor, or -1 on failure 192 * Returns tty file descriptor, or -1 on failure
265 */ 193 */
… …
276static int 204static int
277control_tty (int fd_tty) 205control_tty (int fd_tty)
278{ 206{
279 setsid (); 207 setsid ();
280 208
281#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 209#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
282 /* 210 /*
283 * Push STREAMS modules: 211 * Push STREAMS modules:
284 * ptem: pseudo-terminal hardware emulation module. 212 * ptem: pseudo-terminal hardware emulation module.
285 * ldterm: standard terminal line discipline. 213 * ldterm: standard terminal line discipline.
286 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 214 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
308 236
309 ioctl (fd_tty, TIOCSCTTY, NULL); 237 ioctl (fd_tty, TIOCSCTTY, NULL);
310 238
311 int fd = open ("/dev/tty", O_WRONLY); 239 int fd = open ("/dev/tty", O_WRONLY);
312 if (fd < 0) 240 if (fd < 0)
313 return -1; /* fatal */ 241 return -1; /* fatal */
314 242
315 close (fd); 243 close (fd);
316 244
317 return 0; 245 return 0;
318} 246}
319 247
320void 248void
321rxvt_ptytty::close_tty () 249ptytty::close_tty ()
322{ 250{
323 if (tty < 0) 251 if (tty < 0)
324 return; 252 return;
325 253
326 close (tty); 254 close (tty);
327 tty = -1; 255 tty = -1;
328} 256}
329 257
330bool 258bool
331rxvt_ptytty::make_controlling_tty () 259ptytty::make_controlling_tty ()
332{ 260{
333 return control_tty (tty) >= 0; 261 return control_tty (tty) >= 0;
334} 262}
335 263
336void 264void
337rxvt_ptytty::set_utf8_mode (bool on) 265ptytty::set_utf8_mode (bool on)
338{ 266{
339#ifdef IUTF8 267#ifdef IUTF8
340 if (pty < 0) 268 if (pty < 0)
341 return; 269 return;
342 270
… …
358 } 286 }
359 } 287 }
360#endif 288#endif
361} 289}
362 290
363/////////////////////////////////////////////////////////////////////////////
364
365#ifndef NO_SETOWNER_TTYDEV
366static struct ttyconf { 291static struct ttyconf {
367 gid_t gid; 292 gid_t gid;
368 mode_t mode; 293 mode_t mode;
369 294
370 ttyconf () 295 ttyconf ()
… …
379 } 304 }
380 else 305 else
381#endif /* TTY_GID_SUPPORT */ 306#endif /* TTY_GID_SUPPORT */
382 { 307 {
383 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 308 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
384 gid = getgid (); 309 gid = 0;
385 } 310 }
386 } 311 }
387} ttyconf; 312} ttyconf;
388 313
389///////////////////////////////////////////////////////////////////////////// 314ptytty_unix::ptytty_unix ()
315{
316 name = 0;
317#if UTMP_SUPPORT
318 cmd_pid = 0;
319#endif
320}
321
322ptytty_unix::~ptytty_unix ()
323{
324#if UTMP_SUPPORT
325 logout ();
326#endif
327 put ();
328}
390 329
391void 330void
392rxvt_ptytty_unix::privileges (rxvt_privaction action) 331ptytty_unix::put ()
393{ 332{
394 if (!name || !*name) 333 chmod (name, RESTORE_TTY_MODE);
395 return; 334 chown (name, 0, ttyconf.gid);
396 335
397 if (action == SAVE) 336 close_tty ();
398 {
399# ifndef RESET_TTY_TO_COMMON_DEFAULTS
400 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
401 if (lstat (name, &savestat) < 0) /* you lose out */
402 ;
403 else
404# endif
405 {
406 saved = true;
407 chown (name, getuid (), ttyconf.gid); /* fail silently */
408 chmod (name, ttyconf.mode);
409# ifdef HAVE_REVOKE
410 revoke (name);
411# endif
412 }
413 }
414 else
415 { /* action == RESTORE */
416# ifndef RESET_TTY_TO_COMMON_DEFAULTS
417 if (saved)
418 {
419 chmod (name, savestat.st_mode);
420 chown (name, savestat.st_uid, savestat.st_gid);
421 }
422# else
423 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
424 chown (name, 0, 0);
425# endif
426 }
427}
428#endif
429 337
430rxvt_ptytty_unix::rxvt_ptytty_unix () 338 if (pty >= 0)
431{ 339 close (pty);
340
341 free (name);
342
432 pty = tty = -1; 343 pty = tty = -1;
433 name = 0; 344 name = 0;
434#ifndef NO_SETOWNER_TTYDEV
435 saved = false;
436#endif
437#if UTMP_SUPPORT
438 cmd_pid = 0;
439#endif
440}
441
442rxvt_ptytty_unix::~rxvt_ptytty_unix ()
443{
444#if UTMP_SUPPORT
445 logout ();
446#endif
447 put ();
448}
449
450void
451rxvt_ptytty_unix::put ()
452{
453#ifndef NO_SETOWNER_TTYDEV
454 privileges (RESTORE);
455#endif
456
457 if (pty >= 0) close (pty);
458 close_tty ();
459 free (name);
460
461 pty = tty = -1;
462 name = 0;
463} 345}
464 346
465bool 347bool
466rxvt_ptytty_unix::get () 348ptytty_unix::get ()
467{ 349{
468 /* get master (pty) */ 350 /* get master (pty) */
469 if ((pty = get_pty (&tty, &name)) < 0) 351 if ((pty = get_pty (&tty, &name)) < 0)
470 return false; 352 return false;
471 353
… …
473 355
474 /* get slave (tty) */ 356 /* get slave (tty) */
475 if (tty < 0) 357 if (tty < 0)
476 { 358 {
477#ifndef NO_SETOWNER_TTYDEV 359#ifndef NO_SETOWNER_TTYDEV
478 privileges (SAVE); 360 chown (name, getuid (), ttyconf.gid); /* fail silently */
361 chmod (name, ttyconf.mode);
362# ifdef HAVE_REVOKE
363 revoke (name);
364# endif
479#endif 365#endif
480 366
481 if ((tty = get_tty (name)) < 0) 367 if ((tty = get_tty (name)) < 0)
482 { 368 {
483 put (); 369 put ();
… …
486 } 372 }
487 373
488 return true; 374 return true;
489} 375}
490 376
377/////////////////////////////////////////////////////////////////////////////
378// helper/proxy support
379
491#if PTYTTY_HELPER 380#if PTYTTY_HELPER
492 381
493static int sock_fd; 382static int sock_fd = -1, lock_fd = -1;
494static int pid; 383static int helper_pid, owner_pid;
495 384
496struct command 385struct command
497{ 386{
498 enum { get, login, destroy } type; 387 enum { get, login, destroy } type;
499 388
500 rxvt_ptytty *id; 389 ptytty *id;
501 390
502 bool login_shell; 391 bool login_shell;
503 int cmd_pid; 392 int cmd_pid;
504 char hostname[512]; // arbitrary, but should be plenty 393 char hostname[512]; // arbitrary, but should be plenty
505}; 394};
506 395
507struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty 396struct ptytty_proxy : ptytty
508{ 397{
509 rxvt_ptytty *id; 398 ptytty *id;
510 399
400 ptytty_proxy ()
401 : id(0)
402 {
403 }
404
511 ~rxvt_ptytty_proxy (); 405 ~ptytty_proxy ();
512 406
513 bool get (); 407 bool get ();
514 void login (int cmd_pid, bool login_shell, const char *hostname); 408 void login (int cmd_pid, bool login_shell, const char *hostname);
515}; 409};
516 410
411#if PTYTTY_REENTRANT
412# define NEED_TOKEN do { char ch; read (lock_fd, &ch, 1); } while (0)
413# define GIVE_TOKEN do { char ch; write (lock_fd, &ch, 1); } while (0)
414#else
415# define NEED_TOKEN (void)0
416# define GIVE_TOKEN (void)0
417#endif
418
517bool 419bool
518rxvt_ptytty_proxy::get () 420ptytty_proxy::get ()
519{ 421{
422 NEED_TOKEN;
423
520 command cmd; 424 command cmd;
521 425
522 cmd.type = command::get; 426 cmd.type = command::get;
523 427
524 write (sock_fd, &cmd, sizeof (cmd)); 428 write (sock_fd, &cmd, sizeof (cmd));
525 429
526 if (read (sock_fd, &id, sizeof (id)) != sizeof (id)) 430 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
527 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n"); 431 ptytty_fatal ("protocol error while creating pty using helper process, aborting.\n");
528 432
529 if (!id) 433 if (!id)
434 {
435 GIVE_TOKEN;
530 return false; 436 return false;
437 }
531 438
532 if ((pty = rxvt_recv_fd (sock_fd)) < 0 439 if ((pty = recv_fd (sock_fd)) < 0
533 || (tty = rxvt_recv_fd (sock_fd)) < 0) 440 || (tty = recv_fd (sock_fd)) < 0)
534 rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n"); 441 ptytty_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
535 442
443 GIVE_TOKEN;
536 return true; 444 return true;
537} 445}
538 446
539void 447void
540rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname) 448ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
541{ 449{
450 NEED_TOKEN;
451
542 command cmd; 452 command cmd;
543 453
544 cmd.type = command::login; 454 cmd.type = command::login;
545 cmd.id = id; 455 cmd.id = id;
546 cmd.cmd_pid = cmd_pid; 456 cmd.cmd_pid = cmd_pid;
547 cmd.login_shell = login_shell; 457 cmd.login_shell = login_shell;
548 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname)); 458 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
549 459
550 write (sock_fd, &cmd, sizeof (cmd)); 460 write (sock_fd, &cmd, sizeof (cmd));
551}
552 461
462 GIVE_TOKEN;
463}
464
553rxvt_ptytty_proxy::~rxvt_ptytty_proxy () 465ptytty_proxy::~ptytty_proxy ()
554{ 466{
467 if (id)
468 {
469 NEED_TOKEN;
470
555 command cmd; 471 command cmd;
556 472
557 cmd.type = command::destroy; 473 cmd.type = command::destroy;
558 cmd.id = id; 474 cmd.id = id;
559 475
560 write (sock_fd, &cmd, sizeof (cmd)); 476 write (sock_fd, &cmd, sizeof (cmd));
477
478 GIVE_TOKEN;
479 }
561} 480}
562 481
563static 482static
564void serve () 483void serve ()
565{ 484{
566 command cmd; 485 command cmd;
567 vector<rxvt_ptytty *> ptys; 486 vector<ptytty *> ptys;
568 487
488 for (;;)
489 {
490 GIVE_TOKEN;
491
569 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command)) 492 if (read (sock_fd, &cmd, sizeof (command)) != sizeof (command))
570 { 493 break;
494
571 if (cmd.type == command::get) 495 if (cmd.type == command::get)
572 { 496 {
573 // -> id ptyfd ttyfd 497 // -> id ptyfd ttyfd
574 cmd.id = new rxvt_ptytty_unix; 498 cmd.id = new ptytty_unix;
575 499
576 if (cmd.id->get ()) 500 if (cmd.id->get ())
577 { 501 {
578 write (sock_fd, &cmd.id, sizeof (cmd.id)); 502 write (sock_fd, &cmd.id, sizeof (cmd.id));
579 ptys.push_back (cmd.id); 503 ptys.push_back (cmd.id);
580 504
581 rxvt_send_fd (sock_fd, cmd.id->pty); 505 ptytty::send_fd (sock_fd, cmd.id->pty);
582 rxvt_send_fd (sock_fd, cmd.id->tty); 506 ptytty::send_fd (sock_fd, cmd.id->tty);
583 } 507 }
584 else 508 else
585 { 509 {
586 delete cmd.id; 510 delete cmd.id;
587 cmd.id = 0; 511 cmd.id = 0;
… …
589 } 513 }
590 } 514 }
591 else if (cmd.type == command::login) 515 else if (cmd.type == command::login)
592 { 516 {
593#if UTMP_SUPPORT 517#if UTMP_SUPPORT
594 if (find (ptys.begin (), ptys.end (), cmd.id)) 518 if (find (ptys.begin (), ptys.end (), cmd.id) != ptys.end ())
595 { 519 {
596 cmd.hostname[sizeof (cmd.hostname) - 1] = 0; 520 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
597 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname); 521 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
598 } 522 }
599#endif 523#endif
600 } 524 }
601 else if (cmd.type == command::destroy) 525 else if (cmd.type == command::destroy)
602 { 526 {
603 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); 527 vector<ptytty *>::iterator pty = find (ptys.begin (), ptys.end (), cmd.id);
604 528
605 if (pty) 529 if (pty != ptys.end ())
606 { 530 {
607 delete *pty; 531 delete *pty;
608 ptys.erase (pty); 532 ptys.erase (pty);
609 } 533 }
610 } 534 }
611 else 535 else
612 break; 536 break;
537
538 NEED_TOKEN;
613 } 539 }
614 540
615 // destroy all ptys 541 // destroy all ptys
616 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); ) 542 for (vector<ptytty *>::iterator i = ptys.end (); i-- > ptys.begin (); )
617 delete *i; 543 delete *i;
618} 544}
619 545
620void rxvt_ptytty_server () 546void
547ptytty::use_helper ()
621{ 548{
549#ifndef PTYTTY_NO_PID_CHECK
550 int pid = getpid ();
551#endif
552
553 if (sock_fd >= 0
554#ifndef PTYTTY_NO_PID_CHECK
555 && pid == owner_pid
556#endif
557 )
558 return;
559
560#ifndef PTYTTY_NO_PID_CHECK
561 owner_pid = pid;
562#endif
563
622 int sv[2]; 564 int sv[2];
623 565
624 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv)) 566 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
625 rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n"); 567 ptytty_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
626 568
569#ifdef PTYTTY_REENTRANT
570 int lv[2];
571
572 if (socketpair (AF_UNIX, SOCK_STREAM, 0, lv))
573 ptytty_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
574#endif
575
627 pid = fork (); 576 helper_pid = fork ();
628 577
629 if (pid < 0) 578 if (helper_pid < 0)
630 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n"); 579 ptytty_fatal ("could not create pty/sessiondb helper process, aborting.\n");
631 580
632 if (pid) 581 if (helper_pid)
633 { 582 {
634 // client, urxvt 583 // client, process
635 sock_fd = sv[0]; 584 sock_fd = sv[0];
636 close (sv[1]); 585 close (sv[1]);
637 fcntl (sock_fd, F_SETFD, FD_CLOEXEC); 586 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
587#ifdef PTYTTY_REENTRANT
588 lock_fd = lv[0];
589 close (lv[1]);
590 fcntl (lock_fd, F_SETFD, FD_CLOEXEC);
591#endif
638 } 592 }
639 else 593 else
640 { 594 {
641 // server, pty-helper 595 // server, pty-helper
642 sock_fd = sv[1]; 596 sock_fd = sv[1];
597#ifdef PTYTTY_REENTRANT
598 lock_fd = lv[1];
599#endif
600
601 chdir ("/");
602
603 signal (SIGHUP, SIG_IGN);
604 signal (SIGTERM, SIG_IGN);
605 signal (SIGINT, SIG_IGN);
606 signal (SIGPIPE, SIG_IGN);
643 607
644 for (int fd = 0; fd < 1023; fd++) 608 for (int fd = 0; fd < 1023; fd++)
645 if (fd != sock_fd) 609 if (fd != sock_fd && fd != lock_fd)
646 close (fd); 610 close (fd);
647 611
648 serve (); 612 serve ();
649 _exit (EXIT_SUCCESS); 613 _exit (EXIT_SUCCESS);
650 } 614 }
651} 615}
652#endif
653 616
654// a "factory" *g* 617#endif
618
655rxvt_ptytty * 619ptytty *
656rxvt_new_ptytty () 620ptytty::create ()
657{ 621{
658#if PTYTTY_HELPER 622#if PTYTTY_HELPER
659 if (pid > 0) 623 if (helper_pid
624# ifndef PTYTTY_NO_PID_CHECK
625 && getpid () == owner_pid
626# endif
627 )
660 // use helper process 628 // use helper process
661 return new rxvt_ptytty_proxy; 629 return new ptytty_proxy;
662 else 630 else
663#endif 631#endif
664 return new rxvt_ptytty_unix; 632 return new ptytty_unix;
665} 633}
666 634
667/*----------------------- end-of-file (C source) -----------------------*/ 635void
636ptytty::init ()
637{
638 uid_t uid = getuid ();
639 gid_t gid = getgid ();
640
641 // before doing anything else, check for setuid/setgid operation,
642 // start the helper process and drop privileges
643 if (uid != geteuid ()
644 || gid != getegid ())
645 {
646#if PTYTTY_HELPER
647 use_helper ();
648#else
649 ptytty_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
650#endif
668 651
652 drop_privileges ();
653 }
654}
655
656void
657ptytty::drop_privileges ()
658{
659 uid_t uid = getuid ();
660 gid_t gid = getgid ();
661
662 // drop privileges
663#if HAVE_SETRESUID
664 setresgid (gid, gid, gid);
665 setresuid (uid, uid, uid);
666#elif HAVE_SETREUID
667 setregid (gid, gid);
668 setreuid (uid, uid);
669#elif HAVE_SETUID
670 setgid (gid);
671 setuid (uid);
672#endif
673
674 if (uid != geteuid ()
675 || gid != getegid ())
676 ptytty_fatal ("unable to drop privileges, aborting.\n");
677}
678
679/////////////////////////////////////////////////////////////////////////////
680// C API
681
682#ifndef PTYTTY_NO_C_API
683
684#define DEFINE_METHOD(retval, name, args1, args2) \
685extern "C" retval ptytty_ ## name args1 \
686{ return ((struct ptytty *)ptytty)->name args2; }
687
688DEFINE_METHOD(int,pty,(void *ptytty),)
689DEFINE_METHOD(int,tty,(void *ptytty),)
690DEFINE_METHOD(int,get,(void *ptytty),())
691DEFINE_METHOD(void,login,(void *ptytty, int cmd_pid, bool login_shell, const char *hostname),(cmd_pid,login_shell,hostname))
692
693DEFINE_METHOD(void,close_tty,(void *ptytty),())
694DEFINE_METHOD(int,make_controlling_tty,(void *ptytty),())
695DEFINE_METHOD(void,set_utf8_mode,(void *ptytty, int on),(on))
696
697#define DEFINE_STATIC(retval, name, args) \
698extern "C" retval ptytty_ ## name args \
699{ return ptytty::name args; }
700
701DEFINE_STATIC(void,drop_privileges,())
702DEFINE_STATIC(void,use_helper,())
703DEFINE_STATIC(void,init,())
704
705DEFINE_STATIC(void *,create,())
706
707void ptytty_delete (void *ptytty)
708{
709 delete (struct ptytty *)ptytty;
710}
711
712// send_fd, recv_fd not exposed
713
714#endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines