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.44 by ayin, Tue Jan 17 17:59:31 2006 UTC vs.
Revision 1.60 by root, Mon Jan 23 12:37:59 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# ifdef PTYS_ARE_GETPT 79# if defined(HAVE_GETPT)
76 pfd = getpt(); 80 pfd = getpt();
77# else 81# elif defined(HAVE_POSIX_OPENPT)
78# ifdef PTYS_ARE_POSIX
79 pfd = posix_openpt (O_RDWR); 82 pfd = posix_openpt (O_RDWR);
80# else 83# else
81 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 84 pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0);
82# endif
83# endif 85# endif
84 if (pfd >= 0) 86 if (pfd >= 0)
85 { 87 {
86 if (grantpt (pfd) == 0 /* change slave permissions */ 88 if (grantpt (pfd) == 0 /* change slave permissions */
87 && unlockpt (pfd) == 0) 89 && unlockpt (pfd) == 0)
88 { /* slave now unlocked */ 90 { /* slave now unlocked */
89 *ttydev = strdup (ptsname (pfd)); /* get slave's name */ 91 *ttydev = strdup (ptsname (pfd)); /* get slave's name */
90 return pfd; 92 return pfd;
91 } 93 }
94
92 close (pfd); 95 close (pfd);
93 } 96 }
94#endif 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 114
113 return -1; 115 return -1;
114} 116}
115 117#elif defined(HAVE__GETPTY)
116static inline int 118static int
117get_pty__getpty (int *fd_tty, char **ttydev) 119get_pty (int *fd_tty, char **ttydev)
118{ 120{
119#ifdef PTYS_ARE__GETPTY
120 int pfd; 121 int pfd;
121 122
122 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 123 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
123 if (*ttydev != NULL) 124 if (*ttydev != NULL)
124 return pfd; 125 return pfd;
125#endif 126
126 return -1; 127 return -1;
127} 128}
128 129#elif defined(HAVE_DEV_PTC)
129static inline int 130static int
130get_pty_ptc (int *fd_tty, char **ttydev) 131get_pty (int *fd_tty, char **ttydev)
131{ 132{
132#ifdef PTYS_ARE_PTC
133 int pfd; 133 int pfd;
134 134
135 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) 135 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
136 { 136 {
137 *ttydev = strdup (ttyname (pfd)); 137 *ttydev = strdup (ttyname (pfd));
138 return pfd; 138 return pfd;
139 } 139 }
140#endif 140
141 return -1; 141 return -1;
142} 142}
143 143#elif defined(HAVE_DEV_CLONE)
144static inline int 144static int
145get_pty_clone (int *fd_tty, char **ttydev) 145get_pty (int *fd_tty, char **ttydev)
146{ 146{
147#ifdef PTYS_ARE_CLONE
148 int pfd; 147 int pfd;
149 148
150 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)
151 { 150 {
152 *ttydev = strdup (ptsname (pfd)); 151 *ttydev = strdup (ptsname (pfd));
153 return pfd; 152 return pfd;
154 } 153 }
155#endif 154
156 return -1; 155 return -1;
157} 156}
158 157#else
159static inline int 158/* Based on the code in openssh/openbsd-compat/bsd-openpty.c */
160get_pty_numeric (int *fd_tty, char **ttydev)
161{
162#ifdef PTYS_ARE_NUMERIC
163 int pfd;
164 int idx;
165 char *c1, *c2;
166 char pty_name[] = "/dev/ptyp???";
167 char tty_name[] = "/dev/ttyp???";
168
169 c1 = &(pty_name[sizeof (pty_name) - 4]);
170 c2 = &(tty_name[sizeof (tty_name) - 4]);
171 for (idx = 0; idx < 256; idx++)
172 {
173 sprintf (c1, "%d", idx);
174 sprintf (c2, "%d", idx);
175 if (access (tty_name, F_OK) < 0)
176 {
177 idx = 256;
178 break;
179 }
180
181 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
182 {
183 if (access (tty_name, R_OK | W_OK) == 0)
184 {
185 *ttydev = strdup (tty_name);
186 return pfd;
187 }
188
189 close (pfd);
190 }
191 }
192#endif
193 return -1;
194}
195
196static inline int
197get_pty_searched (int *fd_tty, char **ttydev)
198{
199#ifdef PTYS_ARE_SEARCHED
200# ifndef PTYCHAR1
201# define PTYCHAR1 "pqrstuvwxyz"
202# endif
203# ifndef PTYCHAR2
204# define PTYCHAR2 "0123456789abcdef"
205# endif
206 int pfd;
207 const char *c1, *c2;
208 char pty_name[] = "/dev/pty??";
209 char tty_name[] = "/dev/tty??";
210
211 for (c1 = PTYCHAR1; *c1; c1++)
212 {
213 pty_name[ (sizeof (pty_name) - 3)] =
214 tty_name[ (sizeof (pty_name) - 3)] = *c1;
215 for (c2 = PTYCHAR2; *c2; c2++)
216 {
217 pty_name[ (sizeof (pty_name) - 2)] =
218 tty_name[ (sizeof (pty_name) - 2)] = *c2;
219 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
220 {
221 if (access (tty_name, R_OK | W_OK) == 0)
222 {
223 *ttydev = strdup (tty_name);
224 return pfd;
225 }
226
227 close (pfd);
228 }
229 }
230 }
231#endif
232 return -1;
233}
234
235static int 159static int
236get_pty (int *fd_tty, char **ttydev) 160get_pty (int *fd_tty, char **ttydev)
237{ 161{
238 int pfd; 162 int pfd;
239 163 int i;
240 if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1 164 char pty_name[32];
241 || (pfd = get_pty_openpty (fd_tty, ttydev)) != -1 165 char tty_name[32];
242 || (pfd = get_pty__getpty (fd_tty, ttydev)) != -1 166 const char *majors = "pqrstuvwxyzabcde";
243 || (pfd = get_pty_ptc (fd_tty, ttydev)) != -1 167 const char *minors = "0123456789abcdef";
244 || (pfd = get_pty_clone (fd_tty, ttydev)) != -1 168 for (i = 0; i < 256; i++)
245 || (pfd = get_pty_numeric (fd_tty, ttydev)) != -1 169 {
246 || (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);
247 return pfd; 182 return pfd;
248 return -1; 183 }
184
185 close (pfd);
186 }
249} 187}
188#endif
250 189
251/*----------------------------------------------------------------------*/ 190/*----------------------------------------------------------------------*/
252/* 191/*
253 * Returns tty file descriptor, or -1 on failure 192 * Returns tty file descriptor, or -1 on failure
254 */ 193 */
… …
263 * Make our tty a controlling tty so that /dev/tty points to us 202 * Make our tty a controlling tty so that /dev/tty points to us
264 */ 203 */
265static int 204static int
266control_tty (int fd_tty) 205control_tty (int fd_tty)
267{ 206{
268 int fd;
269
270 /* ---------------------------------------- */
271 setsid (); 207 setsid ();
272 208
273 /* ---------------------------------------- */
274# if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 209#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
275 /* 210 /*
276 * Push STREAMS modules: 211 * Push STREAMS modules:
277 * ptem: pseudo-terminal hardware emulation module. 212 * ptem: pseudo-terminal hardware emulation module.
278 * ldterm: standard terminal line discipline. 213 * ldterm: standard terminal line discipline.
279 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 214 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
287 * documentation is really unclear about whether it is any close () on 222 * documentation is really unclear about whether it is any close () on
288 * the master side or the last close () - i.e. a proper STREAMS dismantling 223 * the master side or the last close () - i.e. a proper STREAMS dismantling
289 * close () - on the master side which causes a hang up to be sent 224 * close () - on the master side which causes a hang up to be sent
290 * through - Geoff Wing 225 * through - Geoff Wing
291 */ 226 */
292# ifdef HAVE_ISASTREAM 227# ifdef HAVE_ISASTREAM
293 if (isastream (fd_tty) == 1) 228 if (isastream (fd_tty) == 1)
294# endif 229# endif
295 { 230 {
296 ioctl (fd_tty, I_PUSH, "ptem"); 231 ioctl (fd_tty, I_PUSH, "ptem");
297 ioctl (fd_tty, I_PUSH, "ldterm"); 232 ioctl (fd_tty, I_PUSH, "ldterm");
298 ioctl (fd_tty, I_PUSH, "ttcompat"); 233 ioctl (fd_tty, I_PUSH, "ttcompat");
299 } 234 }
300# endif 235#endif
301 /* ---------------------------------------- */ 236
302 fd = ioctl (fd_tty, TIOCSCTTY, NULL); 237 ioctl (fd_tty, TIOCSCTTY, NULL);
303 /* ---------------------------------------- */ 238
304 fd = open ("/dev/tty", O_WRONLY); 239 int fd = open ("/dev/tty", O_WRONLY);
305 if (fd < 0) 240 if (fd < 0)
306 return -1; /* fatal */ 241 return -1; /* fatal */
242
307 close (fd); 243 close (fd);
308 /* ---------------------------------------- */
309 244
310 return 0; 245 return 0;
311} 246}
312 247
313void 248void
314rxvt_ptytty::close_tty () 249ptytty::close_tty ()
315{ 250{
316 if (tty < 0) 251 if (tty < 0)
317 return; 252 return;
318 253
319 close (tty); 254 close (tty);
320 tty = -1; 255 tty = -1;
321} 256}
322 257
323bool 258bool
324rxvt_ptytty::make_controlling_tty () 259ptytty::make_controlling_tty ()
325{ 260{
326 return control_tty (tty) >= 0; 261 return control_tty (tty) >= 0;
327} 262}
328 263
329void 264void
330rxvt_ptytty::set_utf8_mode (bool on) 265ptytty::set_utf8_mode (bool on)
331{ 266{
332#ifdef IUTF8 267#ifdef IUTF8
333 if (pty < 0) 268 if (pty < 0)
334 return; 269 return;
335 270
… …
351 } 286 }
352 } 287 }
353#endif 288#endif
354} 289}
355 290
356/////////////////////////////////////////////////////////////////////////////
357
358#ifndef NO_SETOWNER_TTYDEV
359static struct ttyconf { 291static struct ttyconf {
360 gid_t gid; 292 gid_t gid;
361 mode_t mode; 293 mode_t mode;
362 294
363 ttyconf () 295 ttyconf ()
… …
372 } 304 }
373 else 305 else
374#endif /* TTY_GID_SUPPORT */ 306#endif /* TTY_GID_SUPPORT */
375 { 307 {
376 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 308 mode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
377 gid = getgid (); 309 gid = 0;
378 } 310 }
379 } 311 }
380} ttyconf; 312} ttyconf;
381 313
382///////////////////////////////////////////////////////////////////////////// 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}
383 329
384void 330void
385rxvt_ptytty_unix::privileges (rxvt_privaction action) 331ptytty_unix::put ()
386{ 332{
387 if (!name || !*name) 333 chmod (name, RESTORE_TTY_MODE);
388 return; 334 chown (name, 0, ttyconf.gid);
389 335
390 if (action == SAVE) 336 close_tty ();
391 {
392# ifndef RESET_TTY_TO_COMMON_DEFAULTS
393 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
394 if (lstat (name, &savestat) < 0) /* you lose out */
395 ;
396 else
397# endif
398 {
399 saved = true;
400 chown (name, getuid (), ttyconf.gid); /* fail silently */
401 chmod (name, ttyconf.mode);
402# ifdef HAVE_REVOKE
403 revoke (name);
404# endif
405 }
406 }
407 else
408 { /* action == RESTORE */
409# ifndef RESET_TTY_TO_COMMON_DEFAULTS
410 if (saved)
411 {
412 chmod (name, savestat.st_mode);
413 chown (name, savestat.st_uid, savestat.st_gid);
414 }
415# else
416 chmod (name, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
417 chown (name, 0, 0);
418# endif
419 337
420 } 338 if (pty >= 0)
421} 339 close (pty);
422#endif
423 340
424rxvt_ptytty_unix::rxvt_ptytty_unix () 341 free (name);
425{ 342
426 pty = tty = -1; 343 pty = tty = -1;
427 name = 0; 344 name = 0;
428#ifndef NO_SETOWNER_TTYDEV
429 saved = false;
430#endif
431#if UTMP_SUPPORT
432 cmd_pid = 0;
433#endif
434}
435
436rxvt_ptytty_unix::~rxvt_ptytty_unix ()
437{
438#if UTMP_SUPPORT
439 logout ();
440#endif
441 put ();
442}
443
444void
445rxvt_ptytty_unix::put ()
446{
447#ifndef NO_SETOWNER_TTYDEV
448 privileges (RESTORE);
449#endif
450
451 if (pty >= 0) close (pty);
452 close_tty ();
453 free (name);
454
455 pty = tty = -1;
456 name = 0;
457} 345}
458 346
459bool 347bool
460rxvt_ptytty_unix::get () 348ptytty_unix::get ()
461{ 349{
462 /* get master (pty) */ 350 /* get master (pty) */
463 if ((pty = get_pty (&tty, &name)) < 0) 351 if ((pty = get_pty (&tty, &name)) < 0)
464 return false; 352 return false;
465 353
… …
467 355
468 /* get slave (tty) */ 356 /* get slave (tty) */
469 if (tty < 0) 357 if (tty < 0)
470 { 358 {
471#ifndef NO_SETOWNER_TTYDEV 359#ifndef NO_SETOWNER_TTYDEV
472 privileges (SAVE); 360 chown (name, getuid (), ttyconf.gid); /* fail silently */
361 chmod (name, ttyconf.mode);
362# ifdef HAVE_REVOKE
363 revoke (name);
364# endif
473#endif 365#endif
474 366
475 if ((tty = get_tty (name)) < 0) 367 if ((tty = get_tty (name)) < 0)
476 { 368 {
477 put (); 369 put ();
… …
480 } 372 }
481 373
482 return true; 374 return true;
483} 375}
484 376
377/////////////////////////////////////////////////////////////////////////////
378// helper/proxy support
379
485#if PTYTTY_HELPER 380#if PTYTTY_HELPER
486 381
487static int sock_fd; 382static int sock_fd = -1, lock_fd = -1;
488static int pid; 383static int helper_pid, owner_pid;
489 384
490struct command 385struct command
491{ 386{
492 enum { get, login, destroy } type; 387 enum { get, login, destroy } type;
493 388
494 rxvt_ptytty *id; 389 ptytty *id;
495 390
496 bool login_shell; 391 bool login_shell;
497 int cmd_pid; 392 int cmd_pid;
498 char hostname[512]; // arbitrary, but should be plenty 393 char hostname[512]; // arbitrary, but should be plenty
499}; 394};
500 395
501struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty 396struct ptytty_proxy : ptytty
502{ 397{
503 rxvt_ptytty *id; 398 ptytty *id;
504 399
400 ptytty_proxy ()
401 : id(0)
402 {
403 }
404
505 ~rxvt_ptytty_proxy (); 405 ~ptytty_proxy ();
506 406
507 bool get (); 407 bool get ();
508 void login (int cmd_pid, bool login_shell, const char *hostname); 408 void login (int cmd_pid, bool login_shell, const char *hostname);
509}; 409};
510 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
511bool 419bool
512rxvt_ptytty_proxy::get () 420ptytty_proxy::get ()
513{ 421{
422 NEED_TOKEN;
423
514 command cmd; 424 command cmd;
515 425
516 cmd.type = command::get; 426 cmd.type = command::get;
517 427
518 write (sock_fd, &cmd, sizeof (cmd)); 428 write (sock_fd, &cmd, sizeof (cmd));
519 429
520 if (read (sock_fd, &id, sizeof (id)) != sizeof (id)) 430 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
521 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");
522 432
523 if (!id) 433 if (!id)
434 {
435 GIVE_TOKEN;
524 return false; 436 return false;
437 }
525 438
526 if ((pty = rxvt_recv_fd (sock_fd)) < 0 439 if ((pty = recv_fd (sock_fd)) < 0
527 || (tty = rxvt_recv_fd (sock_fd)) < 0) 440 || (tty = recv_fd (sock_fd)) < 0)
528 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");
529 442
443 GIVE_TOKEN;
530 return true; 444 return true;
531} 445}
532 446
533void 447void
534rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname) 448ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
535{ 449{
450 NEED_TOKEN;
451
536 command cmd; 452 command cmd;
537 453
538 cmd.type = command::login; 454 cmd.type = command::login;
539 cmd.id = id; 455 cmd.id = id;
540 cmd.cmd_pid = cmd_pid; 456 cmd.cmd_pid = cmd_pid;
541 cmd.login_shell = login_shell; 457 cmd.login_shell = login_shell;
542 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname)); 458 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
543 459
544 write (sock_fd, &cmd, sizeof (cmd)); 460 write (sock_fd, &cmd, sizeof (cmd));
545}
546 461
462 GIVE_TOKEN;
463}
464
547rxvt_ptytty_proxy::~rxvt_ptytty_proxy () 465ptytty_proxy::~ptytty_proxy ()
548{ 466{
467 if (id)
468 {
469 NEED_TOKEN;
470
549 command cmd; 471 command cmd;
550 472
551 cmd.type = command::destroy; 473 cmd.type = command::destroy;
552 cmd.id = id; 474 cmd.id = id;
553 475
554 write (sock_fd, &cmd, sizeof (cmd)); 476 write (sock_fd, &cmd, sizeof (cmd));
477
478 GIVE_TOKEN;
479 }
555} 480}
556 481
557static 482static
558void serve () 483void serve ()
559{ 484{
560 command cmd; 485 command cmd;
561 vector<rxvt_ptytty *> ptys; 486 vector<ptytty *> ptys;
562 487
488 for (;;)
489 {
490 GIVE_TOKEN;
491
563 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command)) 492 if (read (sock_fd, &cmd, sizeof (command)) != sizeof (command))
564 { 493 break;
494
565 if (cmd.type == command::get) 495 if (cmd.type == command::get)
566 { 496 {
567 // -> id ptyfd ttyfd 497 // -> id ptyfd ttyfd
568 cmd.id = new rxvt_ptytty_unix; 498 cmd.id = new ptytty_unix;
569 499
570 if (cmd.id->get ()) 500 if (cmd.id->get ())
571 { 501 {
572 write (sock_fd, &cmd.id, sizeof (cmd.id)); 502 write (sock_fd, &cmd.id, sizeof (cmd.id));
573 ptys.push_back (cmd.id); 503 ptys.push_back (cmd.id);
574 504
575 rxvt_send_fd (sock_fd, cmd.id->pty); 505 ptytty::send_fd (sock_fd, cmd.id->pty);
576 rxvt_send_fd (sock_fd, cmd.id->tty); 506 ptytty::send_fd (sock_fd, cmd.id->tty);
577 } 507 }
578 else 508 else
579 { 509 {
580 delete cmd.id; 510 delete cmd.id;
581 cmd.id = 0; 511 cmd.id = 0;
… …
583 } 513 }
584 } 514 }
585 else if (cmd.type == command::login) 515 else if (cmd.type == command::login)
586 { 516 {
587#if UTMP_SUPPORT 517#if UTMP_SUPPORT
588 if (find (ptys.begin (), ptys.end (), cmd.id)) 518 if (find (ptys.begin (), ptys.end (), cmd.id) != ptys.end ())
589 { 519 {
590 cmd.hostname[sizeof (cmd.hostname) - 1] = 0; 520 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
591 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname); 521 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
592 } 522 }
593#endif 523#endif
594 } 524 }
595 else if (cmd.type == command::destroy) 525 else if (cmd.type == command::destroy)
596 { 526 {
597 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); 527 vector<ptytty *>::iterator pty = find (ptys.begin (), ptys.end (), cmd.id);
598 528
599 if (pty) 529 if (pty != ptys.end ())
600 { 530 {
601 delete *pty; 531 delete *pty;
602 ptys.erase (pty); 532 ptys.erase (pty);
603 } 533 }
604 } 534 }
605 else 535 else
606 break; 536 break;
537
538 NEED_TOKEN;
607 } 539 }
608 540
609 // destroy all ptys 541 // destroy all ptys
610 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); ) 542 for (vector<ptytty *>::iterator i = ptys.end (); i-- > ptys.begin (); )
611 delete *i; 543 delete *i;
612} 544}
613 545
614void rxvt_ptytty_server () 546void
547ptytty::use_helper ()
615{ 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
616 int sv[2]; 564 int sv[2];
617 565
618 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv)) 566 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
619 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");
620 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
621 pid = fork (); 576 helper_pid = fork ();
622 577
623 if (pid < 0) 578 if (helper_pid < 0)
624 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n"); 579 ptytty_fatal ("could not create pty/sessiondb helper process, aborting.\n");
625 580
626 if (pid) 581 if (helper_pid)
627 { 582 {
628 // client, urxvt 583 // client, process
629 sock_fd = sv[0]; 584 sock_fd = sv[0];
630 close (sv[1]); 585 close (sv[1]);
631 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
632 } 592 }
633 else 593 else
634 { 594 {
635 setgid (getegid ());
636 setuid (geteuid ());
637
638 // server, pty-helper 595 // server, pty-helper
639 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);
640 607
641 for (int fd = 0; fd < 1023; fd++) 608 for (int fd = 0; fd < 1023; fd++)
642 if (fd != sock_fd && fd != 1) 609 if (fd != sock_fd && fd != lock_fd)
643 close (fd); 610 close (fd);
644 611
645 serve (); 612 serve ();
646 _exit (EXIT_SUCCESS); 613 _exit (EXIT_SUCCESS);
647 } 614 }
648} 615}
649#endif
650 616
651// a "factory" *g* 617#endif
618
652rxvt_ptytty * 619ptytty *
653rxvt_new_ptytty () 620ptytty::create ()
654{ 621{
655#if PTYTTY_HELPER 622#if PTYTTY_HELPER
656 if (pid > 0) 623 if (helper_pid
624# ifndef PTYTTY_NO_PID_CHECK
625 && getpid () == owner_pid
626# endif
627 )
657 // use helper process 628 // use helper process
658 return new rxvt_ptytty_proxy; 629 return new ptytty_proxy;
659 else 630 else
660#endif 631#endif
661 return new rxvt_ptytty_unix; 632 return new ptytty_unix;
662} 633}
663 634
664/*----------------------- 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
665 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
684typedef void *PTYTTY;
685
686#define DEFINE_METHOD(retval, name, args1, args2) \
687extern "C" retval ptytty_ ## name args1 \
688{ return ((struct ptytty *)ptytty)->name args2; }
689
690DEFINE_METHOD(int,pty,(PTYTTY ptytty),)
691DEFINE_METHOD(int,tty,(PTYTTY ptytty),)
692DEFINE_METHOD(int,get,(PTYTTY ptytty),())
693DEFINE_METHOD(void,login,(PTYTTY ptytty, int cmd_pid, bool login_shell, const char *hostname),(cmd_pid,login_shell,hostname))
694
695DEFINE_METHOD(void,close_tty,(PTYTTY ptytty),())
696DEFINE_METHOD(int,make_controlling_tty,(PTYTTY ptytty),())
697DEFINE_METHOD(void,set_utf8_mode,(PTYTTY ptytty, int on),(on))
698
699#define DEFINE_STATIC(retval, name, args) \
700extern "C" retval ptytty_ ## name args \
701{ return ptytty::name args; }
702
703DEFINE_STATIC(void,drop_privileges,())
704DEFINE_STATIC(void,use_helper,())
705DEFINE_STATIC(void,init,())
706
707DEFINE_STATIC(PTYTTY ,create,())
708
709void ptytty_delete (PTYTTY ptytty)
710{
711 delete (struct ptytty *)ptytty;
712}
713
714// send_fd, recv_fd not exposed
715
716#endif

Diff Legend

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