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