Attachment 28021 Details for Bug 57238

[patch] Add -[xX] to su to copy the X environment.

su-no-x.patch (text/plain), 5.16 KB, created by Ben Kahn on 2005-01-29 05:46:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Kahn

Created: 2005-01-29 05:46:25 UTC

Size: 5.16 KB

patch

obsolete

>Only in coreutils-5.2.1-new/doc: coreutils.info~
>diff -r -u coreutils-5.2.1/doc/coreutils.texi coreutils-5.2.1-new/doc/coreutils.texi
>--- coreutils-5.2.1/doc/coreutils.texi	2005-01-28 14:43:34.008364411 -0500
>+++ coreutils-5.2.1-new/doc/coreutils.texi	2004-09-30 14:31:10.736891562 -0400
>@@ -11881,6 +11881,23 @@
> unless the user running @command{su} is not the superuser and @var{user}'s
> shell is restricted (see @option{-m} just above).
> 
>+@item -X
>+@itemx --enable-x
>+@opindex -X
>+@opindex --enable-x
>+Preserve the X Windows environment settings.  (@env{DISPLAY} and
>+@env{XAUTHORITY}) Depending on the system configuration, this may allow
>+the new user to contact the running X session. [Enabled by
>+default]
>+
>+@item -x
>+@itemx --disable-x
>+@opindex -x
>+@opindex --disable-x
>+Remove the X Windows environment settings.  (@env{DISPLAY} and
>+@env{XAUTHORITY}) This stops the new user from contacting the X server
>+and may be more secure.
>+
> @end table
> 
> @cindex exit status of @command{su}
>Only in coreutils-5.2.1-new/doc: coreutils.texi~
>diff -r -u coreutils-5.2.1/src/su.c coreutils-5.2.1-new/src/su.c
>--- coreutils-5.2.1/src/su.c	2005-01-28 14:43:34.018363214 -0500
>+++ coreutils-5.2.1-new/src/su.c	2005-01-28 14:37:05.588845753 -0500
>@@ -65,6 +65,10 @@
>    -s, --shell=shell	Run SHELL instead of USER's shell from /etc/passwd
> 			unless not the superuser and USER's shell is
> 			restricted.
>+   -x, --disable-x      Removes the DISPLAY environment variable, useful when
>+                        changing to a user you don't trust completely.
>+   -X, --enable-x       Preserves the DISPLAY environment variable which may 
>+                        allow the new user to start X applications. [DEFAULT]
> 
>    Compile-time options:
>    -DSYSLOG_SUCCESS	Log successful su's (by default, to root) with syslog.
>@@ -173,6 +177,9 @@
> /* If nonzero, simulate a login instead of just starting a shell.  */
> static int simulate_login;
> 
>+/* If nonzero, remove the DISPLAY environment variable */
>+static int remove_display;
>+
> /* If nonzero, change some environment vars to indicate the user su'd to.  */
> static int change_environment;
> 
>@@ -183,6 +190,8 @@
>   {"login", no_argument, NULL, 'l'},
>   {"preserve-environment", no_argument, &change_environment, 0},
>   {"shell", required_argument, 0, 's'},
>+  {"disable-x", no_argument, NULL, 'x'},
>+  {"enable-x", no_argument, NULL, 'X'},
>   {GETOPT_HELP_OPTION_DECL},
>   {GETOPT_VERSION_OPTION_DECL},
>   {0, 0, 0, 0}
>@@ -532,6 +541,15 @@
> #endif /* !USE_PAM */
> }
> 
>+/* Check to see if the DISPLAY environment variable needs to be 
>+   cleared */
>+static void
>+modify_display ()
>+{
>+  if (remove_display)
>+    unsetenv ("DISPLAY");
>+}
>+
> /* Update `environ' for the new shell based on PW, with SHELL being
>    the value for the SHELL environment variable.  */
> 
>@@ -539,6 +557,8 @@
> modify_environment (const struct passwd *pw, const char *shell)
> {
>   char *term;
>+  char *display;
>+  char *xauthority;
> 
> #ifdef USE_PAM
>   /* Export env variables declared by PAM modules */
>@@ -556,13 +576,19 @@
> 
>   if (simulate_login)
>     {
>-      /* Leave TERM unchanged.  Set HOME, SHELL, USER, LOGNAME, PATH.
>+      /* Leave TERM, DISPLAY, XAUTHORITY unchanged.  Set HOME, SHELL, USER, LOGNAME, PATH.
>          Unset all other environment variables.  */
>       term = getenv ("TERM");
>+      display = getenv ("DISPLAY");
>+      xauthority = getenv ("XAUTHORITY");
>       environ = xmalloc (2 * sizeof (char *));
>       environ[0] = 0;
>       if (term)
> 	xputenv (concat ("TERM", "=", term));
>+      if (display)
>+	xputenv (concat ("DISPLAY", "=", display));
>+      if (xauthority)
>+	xputenv (concat ("XAUTHORITY", "=", xauthority));
>       xputenv (concat ("HOME", "=", pw->pw_dir));
>       xputenv (concat ("SHELL", "=", shell));
>       xputenv (concat ("USER", "=", pw->pw_name));
>@@ -805,6 +831,8 @@
>   -m, --preserve-environment   do not reset environment variables\n\
>   -p                           same as -m\n\
>   -s, --shell=SHELL            run SHELL if /etc/shells allows it\n\
>+  -x, --disable-x              remove the DISPLAY environment variable\n\
>+  -X, --enable-x               keep the DISPLAY environment variable [DEFAULT]\n\
> "), stdout);
>       fputs (HELP_OPTION_DESCRIPTION, stdout);
>       fputs (VERSION_OPTION_DESCRIPTION, stdout);
>@@ -840,8 +868,9 @@
>   fast_startup = 0;
>   simulate_login = 0;
>   change_environment = 1;
>+  remove_display = 0;
> 
>-  while ((optc = getopt_long (argc, argv, "c:flmps:", longopts, NULL)) != -1)
>+  while ((optc = getopt_long (argc, argv, "c:flmps:xX", longopts, NULL)) != -1)
>     {
>       switch (optc)
> 	{
>@@ -869,6 +898,14 @@
> 	  shell = optarg;
> 	  break;
> 
>+	case 'x':
>+	  remove_display = 1;
>+	  break;
>+
>+	case 'X':
>+	  remove_display = 0;
>+	  break;
>+
> 	case_GETOPT_HELP_CHAR;
> 
> 	case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
>@@ -908,6 +945,11 @@
>   pw->pw_dir = xstrdup (pw->pw_dir);
>   pw->pw_shell = xstrdup (pw->pw_shell);
> 
>+  /* If we need to remove  DISPLAY environment variables, need to do 
>+     it before checking the password.  PAM, for example, may use the 
>+     DISPLAY  environment   variable  to   forward   X  permissions. */
>+  modify_display ();
>+
>   if (!correct_password (pw))
>     {
> #ifdef SYSLOG_FAILURE
>Only in coreutils-5.2.1-new/src: su.c~

Actions: View | Diff

Attachments on bug 57238: 23708 | 23713 | 24332 | 28021 | 28022 | 28114 | 28115