… | |
… | |
46 | |
46 | |
47 | #ifdef HAVE_TERMIOS_H |
47 | #ifdef HAVE_TERMIOS_H |
48 | # include <termios.h> |
48 | # include <termios.h> |
49 | #endif |
49 | #endif |
50 | |
50 | |
|
|
51 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
52 | static uid_t saved_euid; |
|
|
53 | static gid_t saved_egid; |
|
|
54 | #endif |
|
|
55 | |
|
|
56 | bool |
|
|
57 | rxvt_tainted () |
|
|
58 | { |
|
|
59 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
60 | return getuid () != saved_euid || getgid () != saved_egid; |
|
|
61 | #else |
|
|
62 | return false; |
|
|
63 | #endif |
|
|
64 | } |
|
|
65 | |
51 | vector<rxvt_term *> rxvt_term::termlist; |
66 | vector<rxvt_term *> rxvt_term::termlist; |
52 | |
67 | |
53 | static char curlocale[128], savelocale[128]; |
68 | static char curlocale[128], savelocale[128]; |
54 | |
69 | |
55 | bool |
70 | bool |
… | |
… | |
61 | strncpy (curlocale, locale, 128); |
76 | strncpy (curlocale, locale, 128); |
62 | setlocale (LC_CTYPE, curlocale); |
77 | setlocale (LC_CTYPE, curlocale); |
63 | return true; |
78 | return true; |
64 | } |
79 | } |
65 | |
80 | |
66 | bool |
81 | void |
67 | rxvt_push_locale (const char *locale) |
82 | rxvt_push_locale (const char *locale) |
68 | { |
83 | { |
69 | strcpy (savelocale, curlocale); |
84 | strcpy (savelocale, curlocale); |
70 | rxvt_set_locale (locale); |
85 | rxvt_set_locale (locale); |
71 | } |
86 | } |
… | |
… | |
497 | |
512 | |
498 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
513 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
499 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
514 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
500 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
515 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
501 | { |
516 | { |
|
|
517 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
518 | // ignore some perl-related arguments if some bozo installed us set[ug]id |
|
|
519 | if (rxvt_tainted ()) |
|
|
520 | { |
|
|
521 | if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib]) |
|
|
522 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
523 | { |
|
|
524 | rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n"); |
|
|
525 | rs[Rs_perl_lib] = 0; |
|
|
526 | rs[Rs_perl_eval] = 0; |
|
|
527 | } |
|
|
528 | } |
|
|
529 | #endif |
502 | rxvt_perl.init (); |
530 | rxvt_perl.init (); |
503 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
531 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
504 | } |
532 | } |
505 | #endif |
533 | #endif |
506 | |
534 | |
… | |
… | |
665 | * ------------------------------------------------------------------------- */ |
693 | * ------------------------------------------------------------------------- */ |
666 | /* take care of suid/sgid super-user (root) privileges */ |
694 | /* take care of suid/sgid super-user (root) privileges */ |
667 | void |
695 | void |
668 | rxvt_privileges (rxvt_privaction action) |
696 | rxvt_privileges (rxvt_privaction action) |
669 | { |
697 | { |
670 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
671 | static uid_t euid; |
|
|
672 | static gid_t egid; |
|
|
673 | #endif |
|
|
674 | |
|
|
675 | #if ! defined(__CYGWIN32__) |
698 | #if ! defined(__CYGWIN32__) |
676 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
699 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
677 | /* setreuid () is the poor man's setuid (), seteuid () */ |
700 | /* setreuid () is the poor man's setuid (), seteuid () */ |
678 | # define seteuid(a) setreuid(-1, (a)) |
701 | # define seteuid(a) setreuid(-1, (a)) |
679 | # define setegid(a) setregid(-1, (a)) |
702 | # define setegid(a) setregid(-1, (a)) |
… | |
… | |
689 | */ |
712 | */ |
690 | seteuid (getuid ()); |
713 | seteuid (getuid ()); |
691 | setegid (getgid ()); |
714 | setegid (getgid ()); |
692 | break; |
715 | break; |
693 | case SAVE: |
716 | case SAVE: |
694 | euid = geteuid (); |
717 | saved_euid = geteuid (); |
695 | egid = getegid (); |
718 | saved_egid = getegid (); |
696 | break; |
719 | break; |
697 | case RESTORE: |
720 | case RESTORE: |
698 | seteuid (euid); |
721 | seteuid (saved_euid); |
699 | setegid (egid); |
722 | setegid (saved_egid); |
700 | break; |
723 | break; |
701 | } |
724 | } |
702 | # else |
725 | # else |
703 | switch (action) |
726 | switch (action) |
704 | { |
727 | { |