ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libptytty/src/ptytty.C
(Generate patch)

Comparing libptytty/src/ptytty.C (file contents):
Revision 1.8 by root, Sun Jan 22 00:58:18 2006 UTC vs.
Revision 1.15 by root, Mon Jan 23 11:22:08 2006 UTC

… …
6 *----------------------------------------------------------------------* 6 *----------------------------------------------------------------------*
7 * 7 *
8 * All portions of code are copyright by their respective author/s. 8 * All portions of code are copyright by their respective author/s.
9 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 9 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
10 * 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>
11 * 12 *
12 * 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
13 * 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
14 * the Free Software Foundation; either version 2 of the License, or 15 * the Free Software Foundation; either version 2 of the License, or
15 * (at your option) any later version. 16 * (at your option) any later version.
… …
24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 25 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 *---------------------------------------------------------------------*/ 26 *---------------------------------------------------------------------*/
26 27
27#include "../config.h" 28#include "../config.h"
28 29
29#include "fdpass.h"
30#include "ptytty.h" 30#include "ptytty.h"
31 31
32#include <cstdlib> 32#include <cstdlib>
33#include <cstring> 33#include <cstring>
34 34
… …
235 235
236 ioctl (fd_tty, TIOCSCTTY, NULL); 236 ioctl (fd_tty, TIOCSCTTY, NULL);
237 237
238 int fd = open ("/dev/tty", O_WRONLY); 238 int fd = open ("/dev/tty", O_WRONLY);
239 if (fd < 0) 239 if (fd < 0)
240 return -1; /* fatal */ 240 return -1; /* fatal */
241 241
242 close (fd); 242 close (fd);
243 243
244 return 0; 244 return 0;
245} 245}
… …
371 } 371 }
372 372
373 return true; 373 return true;
374} 374}
375 375
376/////////////////////////////////////////////////////////////////////////////
377// helper/proxy support
378
376#if PTYTTY_HELPER 379#if PTYTTY_HELPER
377 380
378static int sock_fd; 381static int sock_fd = -1;
379static int pid; 382static int helper_pid, owner_pid;
380 383
381struct command 384struct command
382{ 385{
383 enum { get, login, destroy } type; 386 enum { get, login, destroy } type;
384 387
… …
412 cmd.type = command::get; 415 cmd.type = command::get;
413 416
414 write (sock_fd, &cmd, sizeof (cmd)); 417 write (sock_fd, &cmd, sizeof (cmd));
415 418
416 if (read (sock_fd, &id, sizeof (id)) != sizeof (id)) 419 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
417 fatal ("protocol error while creating pty using helper process, aborting.\n"); 420 ptytty_fatal ("protocol error while creating pty using helper process, aborting.\n");
418 421
419 if (!id) 422 if (!id)
420 return false; 423 return false;
421 424
422 if ((pty = ptytty_recv_fd (sock_fd)) < 0 425 if ((pty = recv_fd (sock_fd)) < 0
423 || (tty = ptytty_recv_fd (sock_fd)) < 0) 426 || (tty = recv_fd (sock_fd)) < 0)
424 fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n"); 427 ptytty_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
425 428
426 return true; 429 return true;
427} 430}
428 431
429void 432void
… …
469 if (cmd.id->get ()) 472 if (cmd.id->get ())
470 { 473 {
471 write (sock_fd, &cmd.id, sizeof (cmd.id)); 474 write (sock_fd, &cmd.id, sizeof (cmd.id));
472 ptys.push_back (cmd.id); 475 ptys.push_back (cmd.id);
473 476
474 ptytty_send_fd (sock_fd, cmd.id->pty); 477 ptytty::send_fd (sock_fd, cmd.id->pty);
475 ptytty_send_fd (sock_fd, cmd.id->tty); 478 ptytty::send_fd (sock_fd, cmd.id->tty);
476 } 479 }
477 else 480 else
478 { 481 {
479 delete cmd.id; 482 delete cmd.id;
480 cmd.id = 0; 483 cmd.id = 0;
… …
482 } 485 }
483 } 486 }
484 else if (cmd.type == command::login) 487 else if (cmd.type == command::login)
485 { 488 {
486#if UTMP_SUPPORT 489#if UTMP_SUPPORT
487 if (find (ptys.begin (), ptys.end (), cmd.id)) 490 if (find (ptys.begin (), ptys.end (), cmd.id) != ptys.end ())
488 { 491 {
489 cmd.hostname[sizeof (cmd.hostname) - 1] = 0; 492 cmd.hostname[sizeof (cmd.hostname) - 1] = 0;
490 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname); 493 cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname);
491 } 494 }
492#endif 495#endif
493 } 496 }
494 else if (cmd.type == command::destroy) 497 else if (cmd.type == command::destroy)
495 { 498 {
496 ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); 499 vector<ptytty *>::iterator pty = find (ptys.begin (), ptys.end (), cmd.id);
497 500
498 if (pty) 501 if (pty != ptys.end ())
499 { 502 {
500 delete *pty; 503 delete *pty;
501 ptys.erase (pty); 504 ptys.erase (pty);
502 } 505 }
503 } 506 }
504 else 507 else
505 break; 508 break;
506 } 509 }
507 510
508 // destroy all ptys 511 // destroy all ptys
509 for (ptytty **i = ptys.end (); i-- > ptys.begin (); ) 512 for (vector<ptytty *>::iterator i = ptys.end (); i-- > ptys.begin (); )
510 delete *i; 513 delete *i;
511} 514}
512 515
513void ptytty_server () 516void
517ptytty::use_helper ()
514{ 518{
519 int pid = getpid ();
520
521 if (sock_fd >= 0 && pid == owner_pid)
522 return;
523
524 owner_pid = pid;
525
515 int sv[2]; 526 int sv[2];
516 527
517 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv)) 528 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
518 fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n"); 529 ptytty_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
519 530
520 pid = fork (); 531 helper_pid = fork ();
521 532
522 if (pid < 0) 533 if (helper_pid < 0)
523 fatal ("could not create pty/sessiondb helper process, aborting.\n"); 534 ptytty_fatal ("could not create pty/sessiondb helper process, aborting.\n");
524 535
525 if (pid) 536 if (helper_pid)
526 { 537 {
527 // client, process 538 // client, process
528 sock_fd = sv[0]; 539 sock_fd = sv[0];
529 close (sv[1]); 540 close (sv[1]);
530 fcntl (sock_fd, F_SETFD, FD_CLOEXEC); 541 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
… …
532 else 543 else
533 { 544 {
534 // server, pty-helper 545 // server, pty-helper
535 sock_fd = sv[1]; 546 sock_fd = sv[1];
536 547
548 chdir ("/");
549
537 for (int fd = 0; fd < 1023; fd++) 550 for (int fd = 0; fd < 1023; fd++)
538 if (fd != sock_fd) 551 if (fd != sock_fd)
539 close (fd); 552 close (fd);
540 553
541 serve (); 554 serve ();
… …
543 } 556 }
544} 557}
545 558
546#endif 559#endif
547 560
548// a "factory" *g*
549ptytty * 561ptytty *
550new_ptytty () 562ptytty::create ()
551{ 563{
552#if PTYTTY_HELPER 564#if PTYTTY_HELPER
553 if (pid > 0) 565 if (helper_pid && getpid () == owner_pid)
554 // use helper process 566 // use helper process
555 return new ptytty_proxy; 567 return new ptytty_proxy;
556 else 568 else
557#endif 569#endif
558 return new ptytty_unix; 570 return new ptytty_unix;
559} 571}
560 572
561/*----------------------- end-of-file (C source) -----------------------*/ 573void
574ptytty::init ()
575{
576 uid_t uid = getuid ();
577 gid_t gid = getgid ();
578
579 // before doing anything else, check for setuid/setgid operation,
580 // start the helper process and drop privileges
581 if (uid != geteuid ()
582 || gid != getegid ())
583 {
584#if PTYTTY_HELPER
585 use_helper ();
586#else
587 ptytty_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
588#endif
562 589
590 drop_privileges ();
591 }
592}
593
594void
595ptytty::drop_privileges ()
596{
597 uid_t uid = getuid ();
598 gid_t gid = getgid ();
599
600 // drop privileges
601#if HAVE_SETRESUID
602 setresgid (gid, gid, gid);
603 setresuid (uid, uid, uid);
604#elif HAVE_SETREUID
605 setregid (gid, gid);
606 setreuid (uid, uid);
607#elif HAVE_SETUID
608 setgid (gid);
609 setuid (uid);
610#endif
611
612 if (uid != geteuid ()
613 || gid != getegid ())
614 ptytty_fatal ("unable to drop privileges, aborting.\n");
615}
616
617/////////////////////////////////////////////////////////////////////////////
618// C API
619
620#ifndef NO_C_API
621
622#define DEFINE_METHOD(retval, name, args1, args2) \
623extern "C" retval ptytty_ ## name args1 \
624{ return ((struct ptytty *)ptytty)->name args2; }
625
626DEFINE_METHOD(int,pty,(void *ptytty),)
627DEFINE_METHOD(int,tty,(void *ptytty),)
628DEFINE_METHOD(int,get,(void *ptytty),())
629DEFINE_METHOD(void,login,(void *ptytty, int cmd_pid, bool login_shell, const char *hostname),(cmd_pid,login_shell,hostname))
630
631DEFINE_METHOD(void,close_tty,(void *ptytty),())
632DEFINE_METHOD(int,make_controlling_tty,(void *ptytty),())
633DEFINE_METHOD(void,set_utf8_mode,(void *ptytty, int on),(on))
634
635#define DEFINE_STATIC(retval, name, args) \
636extern "C" retval ptytty_ ## name args \
637{ return ptytty::name args; }
638
639DEFINE_STATIC(void,init,())
640DEFINE_STATIC(void *,create,())
641
642void ptytty_delete (void *ptytty)
643{
644 delete (struct ptytty *)ptytty;
645}
646
647DEFINE_STATIC(void,drop_privileges,())
648DEFINE_STATIC(void,use_helper,())
649
650#endif

Diff Legend

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