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

Diff Legend

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