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