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

Diff Legend

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