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.48 by ayin, Thu Jan 19 10:44:44 2006 UTC vs.
Revision 1.58 by root, Sun Jan 22 12:23:55 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#ifdef NO_SETOWNER_TTYDEV
73 int pfd; 76 int pfd;
74 77
75# if defined(PTYS_ARE_GETPT) 78# if defined(HAVE_GETPT)
76 pfd = getpt(); 79 pfd = getpt();
77# elif defined(PTYS_ARE_POSIX) 80# elif defined(HAVE_POSIX_OPENPT)
78 pfd = posix_openpt (O_RDWR); 81 pfd = posix_openpt (O_RDWR);
79# else 82# else
80 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 83 pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0);
81# endif 84# endif
82 if (pfd >= 0) 85 if (pfd >= 0)
83 { 86 {
84 if (grantpt (pfd) == 0 /* change slave permissions */ 87 if (grantpt (pfd) == 0 /* change slave permissions */
85 && unlockpt (pfd) == 0) 88 && unlockpt (pfd) == 0)
… …
88 return pfd; 91 return pfd;
89 } 92 }
90 93
91 close (pfd); 94 close (pfd);
92 } 95 }
93#endif
94 96
95 return -1; 97 return -1;
96} 98}
97 99#elif defined(HAVE_OPENPTY)
98static inline int 100static int
99get_pty_openpty (int *fd_tty, char **ttydev) 101get_pty (int *fd_tty, char **ttydev)
100{ 102{
101#ifdef PTYS_ARE_OPENPTY
102 int pfd; 103 int pfd;
103 int res; 104 int res;
104 char tty_name[sizeof "/dev/pts/????\0"]; 105 char tty_name[32];
105 106
106 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 107 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
107 if (res != -1) 108 if (res != -1)
108 { 109 {
109 *ttydev = strdup (tty_name); 110 *ttydev = strdup (tty_name);
110 return pfd; 111 return pfd;
111 } 112 }
112#endif
113 113
114 return -1; 114 return -1;
115} 115}
116 116#elif defined(HAVE__GETPTY)
117static inline int 117static int
118get_pty__getpty (int *fd_tty, char **ttydev) 118get_pty (int *fd_tty, char **ttydev)
119{ 119{
120#ifdef PTYS_ARE__GETPTY
121 int pfd; 120 int pfd;
122 121
123 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 122 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
124 if (*ttydev != NULL) 123 if (*ttydev != NULL)
125 return pfd; 124 return pfd;
126#endif
127 125
128 return -1; 126 return -1;
129} 127}
130 128#elif defined(HAVE_DEV_PTC)
131static inline int 129static int
132get_pty_ptc (int *fd_tty, char **ttydev) 130get_pty (int *fd_tty, char **ttydev)
133{ 131{
134#ifdef PTYS_ARE_PTC
135 int pfd; 132 int pfd;
136 133
137 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) 134 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
138 { 135 {
139 *ttydev = strdup (ttyname (pfd)); 136 *ttydev = strdup (ttyname (pfd));
140 return pfd; 137 return pfd;
141 } 138 }
142#endif
143 139
144 return -1; 140 return -1;
145} 141}
146 142#elif defined(HAVE_DEV_CLONE)
147static inline int 143static int
148get_pty_clone (int *fd_tty, char **ttydev) 144get_pty (int *fd_tty, char **ttydev)
149{ 145{
150#ifdef PTYS_ARE_CLONE
151 int pfd; 146 int pfd;
152 147
153 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)
154 { 149 {
155 *ttydev = strdup (ptsname (pfd)); 150 *ttydev = strdup (ptsname (pfd));
156 return pfd; 151 return pfd;
157 } 152 }
158#endif
159 153
160 return -1; 154 return -1;
161} 155}
162 156#else
163static inline int 157/* Based on the code in openssh/openbsd-compat/bsd-openpty.c */
158static int
164get_pty_numeric (int *fd_tty, char **ttydev) 159get_pty (int *fd_tty, char **ttydev)
165{ 160{
166#ifdef PTYS_ARE_NUMERIC
167 int pfd; 161 int pfd;
168 int idx; 162 int i;
169 char *c1, *c2; 163 char pty_name[32];
170 char pty_name[] = "/dev/ptyp???"; 164 char tty_name[32];
171 char tty_name[] = "/dev/ttyp???"; 165 const char *majors = "pqrstuvwxyzabcde";
172 166 const char *minors = "0123456789abcdef";
173 c1 = &(pty_name[sizeof (pty_name) - 4]);
174 c2 = &(tty_name[sizeof (tty_name) - 4]);
175
176 for (idx = 0; idx < 256; idx++) 167 for (i = 0; i < 256; i++)
177 { 168 {
178 sprintf (c1, "%d", idx); 169 snprintf(pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]);
179 sprintf (c2, "%d", idx); 170 snprintf(tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]);
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) 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;
188 { 177 }
189 if (access (tty_name, R_OK | W_OK) == 0) 178 if (access (tty_name, R_OK | W_OK) == 0)
190 { 179 {
191 *ttydev = strdup (tty_name); 180 *ttydev = strdup (tty_name);
192 return pfd; 181 return pfd;
193 } 182 }
194 183
195 close (pfd); 184 close (pfd);
196 }
197 } 185 }
198#endif
199
200 return -1;
201} 186}
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 187#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
246get_pty (int *fd_tty, char **ttydev)
247{
248 int pfd;
249
250 if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1
251 || (pfd = get_pty_openpty (fd_tty, ttydev)) != -1
252 || (pfd = get_pty__getpty (fd_tty, ttydev)) != -1
253 || (pfd = get_pty_ptc (fd_tty, ttydev)) != -1
254 || (pfd = get_pty_clone (fd_tty, ttydev)) != -1
255 || (pfd = get_pty_numeric (fd_tty, ttydev)) != -1
256 || (pfd = get_pty_searched (fd_tty, ttydev)) != -1)
257 return pfd;
258
259 return -1;
260}
261 188
262/*----------------------------------------------------------------------*/ 189/*----------------------------------------------------------------------*/
263/* 190/*
264 * Returns tty file descriptor, or -1 on failure 191 * Returns tty file descriptor, or -1 on failure
265 */ 192 */
… …
276static int 203static int
277control_tty (int fd_tty) 204control_tty (int fd_tty)
278{ 205{
279 setsid (); 206 setsid ();
280 207
281#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 208#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
282 /* 209 /*
283 * Push STREAMS modules: 210 * Push STREAMS modules:
284 * ptem: pseudo-terminal hardware emulation module. 211 * ptem: pseudo-terminal hardware emulation module.
285 * ldterm: standard terminal line discipline. 212 * ldterm: standard terminal line discipline.
286 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 213 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
308 235
309 ioctl (fd_tty, TIOCSCTTY, NULL); 236 ioctl (fd_tty, TIOCSCTTY, NULL);
310 237
311 int fd = open ("/dev/tty", O_WRONLY); 238 int fd = open ("/dev/tty", O_WRONLY);
312 if (fd < 0) 239 if (fd < 0)
313 return -1; /* fatal */ 240 return -1; /* fatal */
314 241
315 close (fd); 242 close (fd);
316 243
317 return 0; 244 return 0;
318} 245}
319 246
320void 247void
321rxvt_ptytty::close_tty () 248ptytty::close_tty ()
322{ 249{
323 if (tty < 0) 250 if (tty < 0)
324 return; 251 return;
325 252
326 close (tty); 253 close (tty);
327 tty = -1; 254 tty = -1;
328} 255}
329 256
330bool 257bool
331rxvt_ptytty::make_controlling_tty () 258ptytty::make_controlling_tty ()
332{ 259{
333 return control_tty (tty) >= 0; 260 return control_tty (tty) >= 0;
334} 261}
335 262
336void 263void
337rxvt_ptytty::set_utf8_mode (bool on) 264ptytty::set_utf8_mode (bool on)
338{ 265{
339#ifdef IUTF8 266#ifdef IUTF8
340 if (pty < 0) 267 if (pty < 0)
341 return; 268 return;
342 269
… …
358 } 285 }
359 } 286 }
360#endif 287#endif
361} 288}
362 289
363/////////////////////////////////////////////////////////////////////////////
364
365#ifndef NO_SETOWNER_TTYDEV
366static struct ttyconf { 290static struct ttyconf {
367 gid_t gid; 291 gid_t gid;
368 mode_t mode; 292 mode_t mode;
369 293
370 ttyconf () 294 ttyconf ()
… …
384 gid = 0; 308 gid = 0;
385 } 309 }
386 } 310 }
387} ttyconf; 311} ttyconf;
388 312
389///////////////////////////////////////////////////////////////////////////// 313ptytty_unix::ptytty_unix ()
314{
315 name = 0;
316#if UTMP_SUPPORT
317 cmd_pid = 0;
318#endif
319}
320
321ptytty_unix::~ptytty_unix ()
322{
323#if UTMP_SUPPORT
324 logout ();
325#endif
326 put ();
327}
390 328
391void 329void
392rxvt_ptytty_unix::privileges (rxvt_privaction action) 330ptytty_unix::put ()
393{ 331{
394 if (!name || !*name) 332 chmod (name, RESTORE_TTY_MODE);
333 chown (name, 0, ttyconf.gid);
334
335 close_tty ();
336
337 if (pty >= 0)
338 close (pty);
339
340 free (name);
341
342 pty = tty = -1;
343 name = 0;
344}
345
346bool
347ptytty_unix::get ()
348{
349 /* get master (pty) */
350 if ((pty = get_pty (&tty, &name)) < 0)
395 return; 351 return false;
396 352
397 if (action == SAVE) 353 fcntl (pty, F_SETFL, O_NONBLOCK);
354
355 /* get slave (tty) */
356 if (tty < 0)
398 { 357 {
358#ifndef NO_SETOWNER_TTYDEV
399 chown (name, getuid (), ttyconf.gid); /* fail silently */ 359 chown (name, getuid (), ttyconf.gid); /* fail silently */
400 chmod (name, ttyconf.mode); 360 chmod (name, ttyconf.mode);
401# ifdef HAVE_REVOKE 361# ifdef HAVE_REVOKE
402 revoke (name); 362 revoke (name);
403# endif 363# endif
404 }
405 else
406 { /* action == RESTORE */
407 chmod (name, RESTORE_TTY_MODE);
408 chown (name, 0, ttyconf.gid);
409 }
410}
411#endif
412
413rxvt_ptytty_unix::rxvt_ptytty_unix ()
414{
415 pty = tty = -1;
416 name = 0;
417#if UTMP_SUPPORT
418 cmd_pid = 0;
419#endif
420}
421
422rxvt_ptytty_unix::~rxvt_ptytty_unix ()
423{
424#if UTMP_SUPPORT
425 logout ();
426#endif
427 put ();
428}
429
430void
431rxvt_ptytty_unix::put ()
432{
433#ifndef NO_SETOWNER_TTYDEV
434 privileges (RESTORE);
435#endif
436
437 if (pty >= 0) close (pty);
438 close_tty ();
439 free (name);
440
441 pty = tty = -1;
442 name = 0;
443}
444
445bool
446rxvt_ptytty_unix::get ()
447{
448 /* get master (pty) */
449 if ((pty = get_pty (&tty, &name)) < 0)
450 return false;
451
452 fcntl (pty, F_SETFL, O_NONBLOCK);
453
454 /* get slave (tty) */
455 if (tty < 0)
456 {
457#ifndef NO_SETOWNER_TTYDEV
458 privileges (SAVE);
459#endif 364#endif
460 365
461 if ((tty = get_tty (name)) < 0) 366 if ((tty = get_tty (name)) < 0)
462 { 367 {
463 put (); 368 put ();
… …
468 return true; 373 return true;
469} 374}
470 375
471#if PTYTTY_HELPER 376#if PTYTTY_HELPER
472 377
473static int sock_fd; 378static int sock_fd = -1;
474static int pid; 379static int helper_pid, owner_pid;
475 380
476struct command 381struct command
477{ 382{
478 enum { get, login, destroy } type; 383 enum { get, login, destroy } type;
479 384
480 rxvt_ptytty *id; 385 ptytty *id;
481 386
482 bool login_shell; 387 bool login_shell;
483 int cmd_pid; 388 int cmd_pid;
484 char hostname[512]; // arbitrary, but should be plenty 389 char hostname[512]; // arbitrary, but should be plenty
485}; 390};
486 391
487struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty 392struct ptytty_proxy : ptytty
488{ 393{
489 rxvt_ptytty *id; 394 ptytty *id;
490 395
396 ptytty_proxy ()
397 : id(0)
398 {
399 }
400
491 ~rxvt_ptytty_proxy (); 401 ~ptytty_proxy ();
492 402
493 bool get (); 403 bool get ();
494 void login (int cmd_pid, bool login_shell, const char *hostname); 404 void login (int cmd_pid, bool login_shell, const char *hostname);
495}; 405};
496 406
497bool 407bool
498rxvt_ptytty_proxy::get () 408ptytty_proxy::get ()
499{ 409{
500 command cmd; 410 command cmd;
501 411
502 cmd.type = command::get; 412 cmd.type = command::get;
503 413
504 write (sock_fd, &cmd, sizeof (cmd)); 414 write (sock_fd, &cmd, sizeof (cmd));
505 415
506 if (read (sock_fd, &id, sizeof (id)) != sizeof (id)) 416 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
507 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");
508 418
509 if (!id) 419 if (!id)
510 return false; 420 return false;
511 421
512 if ((pty = rxvt_recv_fd (sock_fd)) < 0 422 if ((pty = recv_fd (sock_fd)) < 0
513 || (tty = rxvt_recv_fd (sock_fd)) < 0) 423 || (tty = recv_fd (sock_fd)) < 0)
514 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");
515 425
516 return true; 426 return true;
517} 427}
518 428
519void 429void
520rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname) 430ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
521{ 431{
522 command cmd; 432 command cmd;
523 433
524 cmd.type = command::login; 434 cmd.type = command::login;
525 cmd.id = id; 435 cmd.id = id;
… …
528 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname)); 438 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
529 439
530 write (sock_fd, &cmd, sizeof (cmd)); 440 write (sock_fd, &cmd, sizeof (cmd));
531} 441}
532 442
533rxvt_ptytty_proxy::~rxvt_ptytty_proxy () 443ptytty_proxy::~ptytty_proxy ()
534{ 444{
445 if (id)
446 {
535 command cmd; 447 command cmd;
536 448
537 cmd.type = command::destroy; 449 cmd.type = command::destroy;
538 cmd.id = id; 450 cmd.id = id;
539 451
540 write (sock_fd, &cmd, sizeof (cmd)); 452 write (sock_fd, &cmd, sizeof (cmd));
453 }
541} 454}
542 455
543static 456static
544void serve () 457void serve ()
545{ 458{
546 command cmd; 459 command cmd;
547 vector<rxvt_ptytty *> ptys; 460 vector<ptytty *> ptys;
548 461
549 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command)) 462 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
550 { 463 {
551 if (cmd.type == command::get) 464 if (cmd.type == command::get)
552 { 465 {
553 // -> id ptyfd ttyfd 466 // -> id ptyfd ttyfd
554 cmd.id = new rxvt_ptytty_unix; 467 cmd.id = new ptytty_unix;
555 468
556 if (cmd.id->get ()) 469 if (cmd.id->get ())
557 { 470 {
558 write (sock_fd, &cmd.id, sizeof (cmd.id)); 471 write (sock_fd, &cmd.id, sizeof (cmd.id));
559 ptys.push_back (cmd.id); 472 ptys.push_back (cmd.id);
560 473
561 rxvt_send_fd (sock_fd, cmd.id->pty); 474 ptytty::send_fd (sock_fd, cmd.id->pty);
562 rxvt_send_fd (sock_fd, cmd.id->tty); 475 ptytty::send_fd (sock_fd, cmd.id->tty);
563 } 476 }
564 else 477 else
565 { 478 {
566 delete cmd.id; 479 delete cmd.id;
567 cmd.id = 0; 480 cmd.id = 0;
… …
578 } 491 }
579#endif 492#endif
580 } 493 }
581 else if (cmd.type == command::destroy) 494 else if (cmd.type == command::destroy)
582 { 495 {
583 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); 496 vector<ptytty *>::iterator pty = find (ptys.begin (), ptys.end (), cmd.id);
584 497
585 if (pty) 498 if (pty != ptys.end ())
586 { 499 {
587 delete *pty; 500 delete *pty;
588 ptys.erase (pty); 501 ptys.erase (pty);
589 } 502 }
590 } 503 }
591 else 504 else
592 break; 505 break;
593 } 506 }
594 507
595 // destroy all ptys 508 // destroy all ptys
596 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); ) 509 for (vector<ptytty *>::iterator i = ptys.end (); i-- > ptys.begin (); )
597 delete *i; 510 delete *i;
598} 511}
599 512
600void rxvt_ptytty_server () 513void
514ptytty::use_helper ()
601{ 515{
516 int pid = getpid ();
517
518 if (sock_fd >= 0 && pid == owner_pid)
519 return;
520
521 owner_pid = pid;
522
602 int sv[2]; 523 int sv[2];
603 524
604 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv)) 525 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
605 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");
606 527
607 pid = fork (); 528 helper_pid = fork ();
608 529
609 if (pid < 0) 530 if (helper_pid < 0)
610 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n"); 531 ptytty_fatal ("could not create pty/sessiondb helper process, aborting.\n");
611 532
612 if (pid) 533 if (helper_pid)
613 { 534 {
614 // client, urxvt 535 // client, process
615 sock_fd = sv[0]; 536 sock_fd = sv[0];
616 close (sv[1]); 537 close (sv[1]);
617 fcntl (sock_fd, F_SETFD, FD_CLOEXEC); 538 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
618 } 539 }
619 else 540 else
620 { 541 {
621 // server, pty-helper 542 // server, pty-helper
622 sock_fd = sv[1]; 543 sock_fd = sv[1];
623 544
545 chdir ("/");
546
624 for (int fd = 0; fd < 1023; fd++) 547 for (int fd = 0; fd < 1023; fd++)
625 if (fd != sock_fd) 548 if (fd != sock_fd)
626 close (fd); 549 close (fd);
627 550
628 serve (); 551 serve ();
629 _exit (EXIT_SUCCESS); 552 _exit (EXIT_SUCCESS);
630 } 553 }
631} 554}
632#endif
633 555
634// a "factory" *g* 556#endif
557
635rxvt_ptytty * 558ptytty *
636rxvt_new_ptytty () 559ptytty::create ()
637{ 560{
638#if PTYTTY_HELPER 561#if PTYTTY_HELPER
639 if (pid > 0) 562 if (helper_pid && getpid () == owner_pid)
640 // use helper process 563 // use helper process
641 return new rxvt_ptytty_proxy; 564 return new ptytty_proxy;
642 else 565 else
643#endif 566#endif
644 return new rxvt_ptytty_unix; 567 return new ptytty_unix;
645} 568}
646 569
647/*----------------------- 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
648 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