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.50 by root, Thu Jan 19 16:43:36 2006 UTC vs.
Revision 1.57 by root, Sun Jan 22 12:21:47 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>
29 34
30#include <sys/types.h> 35#include <sys/types.h>
… …
33#include <fcntl.h> 38#include <fcntl.h>
34 39
35#ifdef HAVE_SYS_IOCTL_H 40#ifdef HAVE_SYS_IOCTL_H
36# include <sys/ioctl.h> 41# include <sys/ioctl.h>
37#endif 42#endif
38#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) 43#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
39# include <sys/stropts.h> /* for I_PUSH */ 44# include <sys/stropts.h> /* for I_PUSH */
40#endif 45#endif
41#ifdef HAVE_ISASTREAM 46#ifdef HAVE_ISASTREAM
42# include <stropts.h> 47# include <stropts.h>
43#endif 48#endif
… …
46#elif defined(HAVE_LIBUTIL_H) 51#elif defined(HAVE_LIBUTIL_H)
47# include <libutil.h> 52# include <libutil.h>
48#elif defined(HAVE_UTIL_H) 53#elif defined(HAVE_UTIL_H)
49# include <util.h> 54# include <util.h>
50#endif 55#endif
56#ifdef TTY_GID_SUPPORT
57#include <grp.h>
58#endif
51 59
52#include <cstdio> 60#include <cstdio>
53#include <grp.h>
54
55#include "rxvtutil.h"
56#include "fdpass.h"
57#include "ptytty.h"
58 61
59///////////////////////////////////////////////////////////////////////////// 62/////////////////////////////////////////////////////////////////////////////
60 63
61/* ------------------------------------------------------------------------- * 64/* ------------------------------------------------------------------------- *
62 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 65 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
… …
64/* 67/*
65 * Returns pty file descriptor, or -1 on failure 68 * Returns pty file descriptor, or -1 on failure
66 * If successful, ttydev is set to the name of the slave device. 69 * 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 70 * fd_tty _may_ also be set to an open fd to the slave device
68 */ 71 */
69static inline int 72#if defined(UNIX98_PTY)
73static int
70get_pty_streams (int *fd_tty, char **ttydev) 74get_pty (int *fd_tty, char **ttydev)
71{ 75{
72#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
73# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
74 int pfd; 76 int pfd;
75 77
76# if defined(PTYS_ARE_GETPT) 78# if defined(HAVE_GETPT)
77 pfd = getpt(); 79 pfd = getpt();
78# elif defined(PTYS_ARE_POSIX) 80# elif defined(HAVE_POSIX_OPENPT)
79 pfd = posix_openpt (O_RDWR); 81 pfd = posix_openpt (O_RDWR);
80# else 82# else
81 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 83 pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0);
82# endif 84# endif
83 if (pfd >= 0) 85 if (pfd >= 0)
84 { 86 {
85 if (grantpt (pfd) == 0 /* change slave permissions */ 87 if (grantpt (pfd) == 0 /* change slave permissions */
86 && unlockpt (pfd) == 0) 88 && unlockpt (pfd) == 0)
… …
89 return pfd; 91 return pfd;
90 } 92 }
91 93
92 close (pfd); 94 close (pfd);
93 } 95 }
94# endif
95#endif
96 96
97 return -1; 97 return -1;
98} 98}
99 99#elif defined(HAVE_OPENPTY)
100static inline int 100static int
101get_pty_openpty (int *fd_tty, char **ttydev) 101get_pty (int *fd_tty, char **ttydev)
102{ 102{
103#ifdef PTYS_ARE_OPENPTY
104 int pfd; 103 int pfd;
105 int res; 104 int res;
106 char tty_name[sizeof "/dev/pts/????\0"]; 105 char tty_name[32];
107 106
108 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 107 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
109 if (res != -1) 108 if (res != -1)
110 { 109 {
111 *ttydev = strdup (tty_name); 110 *ttydev = strdup (tty_name);
112 return pfd; 111 return pfd;
113 } 112 }
114#endif
115 113
116 return -1; 114 return -1;
117} 115}
118 116#elif defined(HAVE__GETPTY)
119static inline int 117static int
120get_pty__getpty (int *fd_tty, char **ttydev) 118get_pty (int *fd_tty, char **ttydev)
121{ 119{
122#ifdef PTYS_ARE__GETPTY
123 int pfd; 120 int pfd;
124 121
125 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 122 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
126 if (*ttydev != NULL) 123 if (*ttydev != NULL)
127 return pfd; 124 return pfd;
128#endif
129 125
130 return -1; 126 return -1;
131} 127}
132 128#elif defined(HAVE_DEV_PTC)
133static inline int 129static int
134get_pty_ptc (int *fd_tty, char **ttydev) 130get_pty (int *fd_tty, char **ttydev)
135{ 131{
136#ifdef PTYS_ARE_PTC
137 int pfd; 132 int pfd;
138 133
139 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) 134 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
140 { 135 {
141 *ttydev = strdup (ttyname (pfd)); 136 *ttydev = strdup (ttyname (pfd));
142 return pfd; 137 return pfd;
143 } 138 }
144#endif
145 139
146 return -1; 140 return -1;
147} 141}
148 142#elif defined(HAVE_DEV_CLONE)
149static inline int 143static int
150get_pty_clone (int *fd_tty, char **ttydev) 144get_pty (int *fd_tty, char **ttydev)
151{ 145{
152#ifdef PTYS_ARE_CLONE
153 int pfd; 146 int pfd;
154 147
155 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) 148 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
156 { 149 {
157 *ttydev = strdup (ptsname (pfd)); 150 *ttydev = strdup (ptsname (pfd));
158 return pfd; 151 return pfd;
159 } 152 }
160#endif
161 153
162 return -1; 154 return -1;
163} 155}
164 156#else
165static inline int 157/* Based on the code in openssh/openbsd-compat/bsd-openpty.c */
158static int
166get_pty_numeric (int *fd_tty, char **ttydev) 159get_pty (int *fd_tty, char **ttydev)
167{ 160{
168#ifdef PTYS_ARE_NUMERIC
169 int pfd; 161 int pfd;
170 int idx; 162 int i;
171 char *c1, *c2; 163 char pty_name[32];
172 char pty_name[] = "/dev/ptyp???"; 164 char tty_name[32];
173 char tty_name[] = "/dev/ttyp???"; 165 const char *majors = "pqrstuvwxyzabcde";
174 166 const char *minors = "0123456789abcdef";
175 c1 = &(pty_name[sizeof (pty_name) - 4]);
176 c2 = &(tty_name[sizeof (tty_name) - 4]);
177
178 for (idx = 0; idx < 256; idx++) 167 for (i = 0; i < 256; i++)
179 { 168 {
180 sprintf (c1, "%d", idx); 169 snprintf(pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]);
181 sprintf (c2, "%d", idx); 170 snprintf(tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]);
182
183 if (access (tty_name, F_OK) < 0)
184 {
185 idx = 256;
186 break;
187 }
188
189 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) 171 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
172 {
173 snprintf(pty_name, 32, "/dev/ptyp%d", i);
174 snprintf(tty_name, 32, "/dev/ttyp%d", i);
175 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
176 continue;
190 { 177 }
191 if (access (tty_name, R_OK | W_OK) == 0) 178 if (access (tty_name, R_OK | W_OK) == 0)
192 { 179 {
193 *ttydev = strdup (tty_name); 180 *ttydev = strdup (tty_name);
194 return pfd; 181 return pfd;
195 } 182 }
196 183
197 close (pfd); 184 close (pfd);
198 }
199 } 185 }
200#endif
201
202 return -1;
203} 186}
204
205static inline int
206get_pty_searched (int *fd_tty, char **ttydev)
207{
208#ifdef PTYS_ARE_SEARCHED
209# ifndef PTYCHAR1
210# define PTYCHAR1 "pqrstuvwxyz"
211# endif 187#endif
212# ifndef PTYCHAR2
213# define PTYCHAR2 "0123456789abcdef"
214# endif
215 int pfd;
216 const char *c1, *c2;
217 char pty_name[] = "/dev/pty??";
218 char tty_name[] = "/dev/tty??";
219
220 for (c1 = PTYCHAR1; *c1; c1++)
221 {
222 pty_name[ (sizeof (pty_name) - 3)] =
223 tty_name[ (sizeof (pty_name) - 3)] = *c1;
224
225 for (c2 = PTYCHAR2; *c2; c2++)
226 {
227 pty_name[ (sizeof (pty_name) - 2)] =
228 tty_name[ (sizeof (pty_name) - 2)] = *c2;
229
230 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
231 {
232 if (access (tty_name, R_OK | W_OK) == 0)
233 {
234 *ttydev = strdup (tty_name);
235 return pfd;
236 }
237
238 close (pfd);
239 }
240 }
241 }
242#endif
243
244 return -1;
245}
246
247static int
248get_pty (int *fd_tty, char **ttydev)
249{
250 int pfd;
251
252 if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1
253 || (pfd = get_pty_openpty (fd_tty, ttydev)) != -1
254 || (pfd = get_pty__getpty (fd_tty, ttydev)) != -1
255 || (pfd = get_pty_ptc (fd_tty, ttydev)) != -1
256 || (pfd = get_pty_clone (fd_tty, ttydev)) != -1
257 || (pfd = get_pty_numeric (fd_tty, ttydev)) != -1
258 || (pfd = get_pty_searched (fd_tty, ttydev)) != -1)
259 return pfd;
260
261 return -1;
262}
263 188
264/*----------------------------------------------------------------------*/ 189/*----------------------------------------------------------------------*/
265/* 190/*
266 * Returns tty file descriptor, or -1 on failure 191 * Returns tty file descriptor, or -1 on failure
267 */ 192 */
… …
278static int 203static int
279control_tty (int fd_tty) 204control_tty (int fd_tty)
280{ 205{
281 setsid (); 206 setsid ();
282 207
283#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 208#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
284 /* 209 /*
285 * Push STREAMS modules: 210 * Push STREAMS modules:
286 * ptem: pseudo-terminal hardware emulation module. 211 * ptem: pseudo-terminal hardware emulation module.
287 * ldterm: standard terminal line discipline. 212 * ldterm: standard terminal line discipline.
288 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 213 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
310 235
311 ioctl (fd_tty, TIOCSCTTY, NULL); 236 ioctl (fd_tty, TIOCSCTTY, NULL);
312 237
313 int fd = open ("/dev/tty", O_WRONLY); 238 int fd = open ("/dev/tty", O_WRONLY);
314 if (fd < 0) 239 if (fd < 0)
315 return -1; /* fatal */ 240 return -1; /* fatal */
316 241
317 close (fd); 242 close (fd);
318 243
319 return 0; 244 return 0;
320} 245}
321 246
322void 247void
323rxvt_ptytty::close_tty () 248ptytty::close_tty ()
324{ 249{
325 if (tty < 0) 250 if (tty < 0)
326 return; 251 return;
327 252
328 close (tty); 253 close (tty);
329 tty = -1; 254 tty = -1;
330} 255}
331 256
332bool 257bool
333rxvt_ptytty::make_controlling_tty () 258ptytty::make_controlling_tty ()
334{ 259{
335 return control_tty (tty) >= 0; 260 return control_tty (tty) >= 0;
336} 261}
337 262
338void 263void
339rxvt_ptytty::set_utf8_mode (bool on) 264ptytty::set_utf8_mode (bool on)
340{ 265{
341#ifdef IUTF8 266#ifdef IUTF8
342 if (pty < 0) 267 if (pty < 0)
343 return; 268 return;
344 269
… …
383 gid = 0; 308 gid = 0;
384 } 309 }
385 } 310 }
386} ttyconf; 311} ttyconf;
387 312
388rxvt_ptytty_unix::rxvt_ptytty_unix () 313ptytty_unix::ptytty_unix ()
389{ 314{
390 pty = tty = -1;
391 name = 0; 315 name = 0;
392#if UTMP_SUPPORT 316#if UTMP_SUPPORT
393 cmd_pid = 0; 317 cmd_pid = 0;
394#endif 318#endif
395} 319}
396 320
397rxvt_ptytty_unix::~rxvt_ptytty_unix () 321ptytty_unix::~ptytty_unix ()
398{ 322{
399#if UTMP_SUPPORT 323#if UTMP_SUPPORT
400 logout (); 324 logout ();
401#endif 325#endif
402 put (); 326 put ();
403} 327}
404 328
405void 329void
406rxvt_ptytty_unix::put () 330ptytty_unix::put ()
407{ 331{
408 chmod (name, RESTORE_TTY_MODE); 332 chmod (name, RESTORE_TTY_MODE);
409 chown (name, 0, ttyconf.gid); 333 chown (name, 0, ttyconf.gid);
410 334
411 close_tty (); 335 close_tty ();
… …
418 pty = tty = -1; 342 pty = tty = -1;
419 name = 0; 343 name = 0;
420} 344}
421 345
422bool 346bool
423rxvt_ptytty_unix::get () 347ptytty_unix::get ()
424{ 348{
425 /* get master (pty) */ 349 /* get master (pty) */
426 if ((pty = get_pty (&tty, &name)) < 0) 350 if ((pty = get_pty (&tty, &name)) < 0)
427 return false; 351 return false;
428 352
… …
449 return true; 373 return true;
450} 374}
451 375
452#if PTYTTY_HELPER 376#if PTYTTY_HELPER
453 377
454static int sock_fd; 378static int sock_fd = -1;
455static int pid; 379static int helper_pid, owner_pid;
456 380
457struct command 381struct command
458{ 382{
459 enum { get, login, destroy } type; 383 enum { get, login, destroy } type;
460 384
461 rxvt_ptytty *id; 385 ptytty *id;
462 386
463 bool login_shell; 387 bool login_shell;
464 int cmd_pid; 388 int cmd_pid;
465 char hostname[512]; // arbitrary, but should be plenty 389 char hostname[512]; // arbitrary, but should be plenty
466}; 390};
467 391
468struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty 392struct ptytty_proxy : ptytty
469{ 393{
470 rxvt_ptytty *id; 394 ptytty *id;
471 395
396 ptytty_proxy ()
397 : id(0)
398 {
399 }
400
472 ~rxvt_ptytty_proxy (); 401 ~ptytty_proxy ();
473 402
474 bool get (); 403 bool get ();
475 void login (int cmd_pid, bool login_shell, const char *hostname); 404 void login (int cmd_pid, bool login_shell, const char *hostname);
476}; 405};
477 406
478bool 407bool
479rxvt_ptytty_proxy::get () 408ptytty_proxy::get ()
480{ 409{
481 command cmd; 410 command cmd;
482 411
483 cmd.type = command::get; 412 cmd.type = command::get;
484 413
485 write (sock_fd, &cmd, sizeof (cmd)); 414 write (sock_fd, &cmd, sizeof (cmd));
486 415
487 if (read (sock_fd, &id, sizeof (id)) != sizeof (id)) 416 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
488 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n"); 417 ptytty_fatal ("protocol error while creating pty using helper process, aborting.\n");
489 418
490 if (!id) 419 if (!id)
491 return false; 420 return false;
492 421
493 if ((pty = rxvt_recv_fd (sock_fd)) < 0 422 if ((pty = recv_fd (sock_fd)) < 0
494 || (tty = rxvt_recv_fd (sock_fd)) < 0) 423 || (tty = recv_fd (sock_fd)) < 0)
495 rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n"); 424 ptytty_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
496 425
497 return true; 426 return true;
498} 427}
499 428
500void 429void
501rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname) 430ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
502{ 431{
503 command cmd; 432 command cmd;
504 433
505 cmd.type = command::login; 434 cmd.type = command::login;
506 cmd.id = id; 435 cmd.id = id;
… …
509 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname)); 438 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
510 439
511 write (sock_fd, &cmd, sizeof (cmd)); 440 write (sock_fd, &cmd, sizeof (cmd));
512} 441}
513 442
514rxvt_ptytty_proxy::~rxvt_ptytty_proxy () 443ptytty_proxy::~ptytty_proxy ()
515{ 444{
445 if (id)
446 {
516 command cmd; 447 command cmd;
517 448
518 cmd.type = command::destroy; 449 cmd.type = command::destroy;
519 cmd.id = id; 450 cmd.id = id;
520 451
521 write (sock_fd, &cmd, sizeof (cmd)); 452 write (sock_fd, &cmd, sizeof (cmd));
453 }
522} 454}
523 455
524static 456static
525void serve () 457void serve ()
526{ 458{
527 command cmd; 459 command cmd;
528 vector<rxvt_ptytty *> ptys; 460 vector<ptytty *> ptys;
529 461
530 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command)) 462 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
531 { 463 {
532 if (cmd.type == command::get) 464 if (cmd.type == command::get)
533 { 465 {
534 // -> id ptyfd ttyfd 466 // -> id ptyfd ttyfd
535 cmd.id = new rxvt_ptytty_unix; 467 cmd.id = new ptytty_unix;
536 468
537 if (cmd.id->get ()) 469 if (cmd.id->get ())
538 { 470 {
539 write (sock_fd, &cmd.id, sizeof (cmd.id)); 471 write (sock_fd, &cmd.id, sizeof (cmd.id));
540 ptys.push_back (cmd.id); 472 ptys.push_back (cmd.id);
541 473
542 rxvt_send_fd (sock_fd, cmd.id->pty); 474 ptytty::send_fd (sock_fd, cmd.id->pty);
543 rxvt_send_fd (sock_fd, cmd.id->tty); 475 ptytty::send_fd (sock_fd, cmd.id->tty);
544 } 476 }
545 else 477 else
546 { 478 {
547 delete cmd.id; 479 delete cmd.id;
548 cmd.id = 0; 480 cmd.id = 0;
… …
559 } 491 }
560#endif 492#endif
561 } 493 }
562 else if (cmd.type == command::destroy) 494 else if (cmd.type == command::destroy)
563 { 495 {
564 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); 496 vector<ptytty *>::iterator pty = find (ptys.begin (), ptys.end (), cmd.id);
565 497
566 if (pty) 498 if (pty != ptys.end ())
567 { 499 {
568 delete *pty; 500 delete *pty;
569 ptys.erase (pty); 501 ptys.erase (pty);
570 } 502 }
571 } 503 }
572 else 504 else
573 break; 505 break;
574 } 506 }
575 507
576 // destroy all ptys 508 // destroy all ptys
577 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); ) 509 for (vector<ptytty *>::iterator i = ptys.end (); i-- > ptys.begin (); )
578 delete *i; 510 delete *i;
579} 511}
580 512
581void rxvt_ptytty_server () 513void
514ptytty::use_helper ()
582{ 515{
516 int pid = getpid ();
517
518 if (sock_fd >= 0 && pid == owner_pid)
519 return;
520
521 owner_pid = pid;
522
583 int sv[2]; 523 int sv[2];
584 524
585 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv)) 525 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
586 rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n"); 526 ptytty_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
587 527
588 pid = fork (); 528 helper_pid = fork ();
589 529
590 if (pid < 0) 530 if (helper_pid < 0)
591 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n"); 531 ptytty_fatal ("could not create pty/sessiondb helper process, aborting.\n");
592 532
593 if (pid) 533 if (helper_pid)
594 { 534 {
595 // client, urxvt 535 // client, process
596 sock_fd = sv[0]; 536 sock_fd = sv[0];
597 close (sv[1]); 537 close (sv[1]);
598 fcntl (sock_fd, F_SETFD, FD_CLOEXEC); 538 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
599 } 539 }
600 else 540 else
601 { 541 {
602 // server, pty-helper 542 // server, pty-helper
603 sock_fd = sv[1]; 543 sock_fd = sv[1];
604 544
545 chdir ("/");
546
605 for (int fd = 0; fd < 1023; fd++) 547 for (int fd = 0; fd < 1023; fd++)
606 if (fd != sock_fd) 548 if (fd != sock_fd)
607 close (fd); 549 close (fd);
608 550
609 serve (); 551 serve ();
… …
611 } 553 }
612} 554}
613 555
614#endif 556#endif
615 557
616// a "factory" *g*
617rxvt_ptytty * 558ptytty *
618rxvt_new_ptytty () 559ptytty::create ()
619{ 560{
620#if PTYTTY_HELPER 561#if PTYTTY_HELPER
621 if (pid > 0) 562 if (helper_pid && getpid () == owner_pid)
622 // use helper process 563 // use helper process
623 return new rxvt_ptytty_proxy; 564 return new ptytty_proxy;
624 else 565 else
625#endif 566#endif
626 return new rxvt_ptytty_unix; 567 return new ptytty_unix;
627} 568}
628 569
629/*----------------------- end-of-file (C source) -----------------------*/ 570void
571ptytty::init ()
572{
573 uid_t uid = getuid ();
574 gid_t gid = getgid ();
575
576 // before doing anything else, check for setuid/setgid operation,
577 // start the helper process and drop privileges
578 if (uid != geteuid ()
579 || gid != getegid ())
580 {
581#if PTYTTY_HELPER
582 use_helper ();
583#else
584 ptytty_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
585#endif
630 586
587 drop_privileges ();
588 }
589}
590
591void
592ptytty::drop_privileges ()
593{
594 uid_t uid = getuid ();
595 gid_t gid = getgid ();
596
597 // drop privileges
598#if HAVE_SETRESUID
599 setresgid (gid, gid, gid);
600 setresuid (uid, uid, uid);
601#elif HAVE_SETREUID
602 setregid (gid, gid);
603 setreuid (uid, uid);
604#elif HAVE_SETUID
605 setgid (gid);
606 setuid (uid);
607#endif
608
609 if (uid != geteuid ()
610 || gid != getegid ())
611 ptytty_fatal ("unable to drop privileges, aborting.\n");
612}
613

Diff Legend

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