Re: [PATCH weston 2/2] weston-launch: Allow the user to use her login shell

[Pekka Paalanen]

On Sun, 29 May 2016 13:59:15 +0200
Quentin Glidic  wrote:

> From: Quentin Glidic 
> 

Hi,

could you please explain in the commit message why we want this again?

The below does not get into the commit message.

> Signed-off-by: Quentin Glidic 
> ---
> 
> This patch is just there to restore and old feature which I introduced and was
> removed later because fish doesn’t support the $SHELL -l -c "weston \"$@\"" 
> syntax.
> 
> It is fully optional and even I do not use that feature any more, so feel 
> free to ignore
> it unless it brings you a feature you wanted.

Right.

Would anyone make use of this feature?

I don't think we should add it if no-one votes for it. It's a
setuid-root program.


Thanks,
pq

>  src/weston-launch.c | 29 +++--
>  1 file changed, 19 insertions(+), 10 deletions(-)
> 
> diff --git a/src/weston-launch.c b/src/weston-launch.c
> index d731ed8..3003dd5 100644
> --- a/src/weston-launch.c
> +++ b/src/weston-launch.c
> @@ -108,6 +108,7 @@ struct weston_launch {
>   pid_t child;
>   int verbose;
>   char *new_user;
> + int use_user_shell;
>  };
>  
>  union cmsg_data { unsigned char b[4]; int fd; };
> @@ -613,7 +614,10 @@ setup_session(struct weston_launch *wl, char 
> *child_argv[MAX_ARGV_SIZE])
>* We open a new session, so it makes sense
>* to run a new login shell
>*/
> - child_argv[0] = "/bin/sh";
> + if (wl->use_user_shell)
> + child_argv[0] = wl->pw->pw_shell;
> + else
> + child_argv[0] = "/bin/sh";
>   child_argv[1] = "-l";
>   child_argv[2] = "-c";
>   child_argv[3] = BINDIR "/weston \"$@\"";
> @@ -675,10 +679,11 @@ static void
>  help(const char *name)
>  {
>   fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
> - fprintf(stderr, "  -u, --user  Start session as specified 
> username\n");
> - fprintf(stderr, "  -t, --tty   Start session on alternative tty\n");
> - fprintf(stderr, "  -v, --verbose   Be verbose\n");
> - fprintf(stderr, "  -h, --help  Display this help message\n");
> + fprintf(stderr, "  -u, --user  Start session as specified 
> username\n");
> + fprintf(stderr, "  -s, --use-user-shellUse the user login shell 
> (from PAM) instead of /bin/sh, only has effect with --user\n");
> + fprintf(stderr, "  -t, --tty   Start session on alternative 
> tty\n");
> + fprintf(stderr, "  -v, --verbose   Be verbose\n");
> + fprintf(stderr, "  -h, --help  Display this help 
> message\n");
>  }
>  
>  int
> @@ -688,11 +693,12 @@ main(int argc, char *argv[])
>   int i, c;
>   char *tty = NULL;
>   struct option opts[] = {
> - { "user",required_argument, NULL, 'u' },
> - { "tty", required_argument, NULL, 't' },
> - { "verbose", no_argument,   NULL, 'v' },
> - { "help",no_argument,   NULL, 'h' },
> - { 0, 0, NULL,  0  }
> + { "user",   required_argument, NULL, 'u' },
> + { "use-user-shell", no_argument,   NULL, 's' },
> + { "tty",required_argument, NULL, 't' },
> + { "verbose",no_argument,   NULL, 'v' },
> + { "help",   no_argument,   NULL, 'h' },
> + { 0,0, NULL,  0  }
>   };
>  
>   memset(, 0, sizeof wl);
> @@ -704,6 +710,9 @@ main(int argc, char *argv[])
>   if (getuid() != 0)
>   error(1, 0, "Permission denied. -u allowed for 
> root only");
>   break;
> + case 's':
> + wl.use_user_shell = 1;
> + break;
>   case 't':
>   tty = optarg;
>   break;



pgpTtfEGGWoXS.pgp
Description: OpenPGP digital signature
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

[PATCH weston 2/2] weston-launch: Allow the user to use her login shell

[Quentin Glidic]

From: Quentin Glidic 

Signed-off-by: Quentin Glidic 
---

This patch is just there to restore and old feature which I introduced and was
removed later because fish doesn’t support the $SHELL -l -c "weston \"$@\"" 
syntax.

It is fully optional and even I do not use that feature any more, so feel free 
to ignore
it unless it brings you a feature you wanted.

 src/weston-launch.c | 29 +++--
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/weston-launch.c b/src/weston-launch.c
index d731ed8..3003dd5 100644
--- a/src/weston-launch.c
+++ b/src/weston-launch.c
@@ -108,6 +108,7 @@ struct weston_launch {
pid_t child;
int verbose;
char *new_user;
+   int use_user_shell;
 };
 
 union cmsg_data { unsigned char b[4]; int fd; };
@@ -613,7 +614,10 @@ setup_session(struct weston_launch *wl, char 
*child_argv[MAX_ARGV_SIZE])
 * We open a new session, so it makes sense
 * to run a new login shell
 */
-   child_argv[0] = "/bin/sh";
+   if (wl->use_user_shell)
+   child_argv[0] = wl->pw->pw_shell;
+   else
+   child_argv[0] = "/bin/sh";
child_argv[1] = "-l";
child_argv[2] = "-c";
child_argv[3] = BINDIR "/weston \"$@\"";
@@ -675,10 +679,11 @@ static void
 help(const char *name)
 {
fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
-   fprintf(stderr, "  -u, --user  Start session as specified 
username\n");
-   fprintf(stderr, "  -t, --tty   Start session on alternative tty\n");
-   fprintf(stderr, "  -v, --verbose   Be verbose\n");
-   fprintf(stderr, "  -h, --help  Display this help message\n");
+   fprintf(stderr, "  -u, --user  Start session as specified 
username\n");
+   fprintf(stderr, "  -s, --use-user-shellUse the user login shell 
(from PAM) instead of /bin/sh, only has effect with --user\n");
+   fprintf(stderr, "  -t, --tty   Start session on alternative 
tty\n");
+   fprintf(stderr, "  -v, --verbose   Be verbose\n");
+   fprintf(stderr, "  -h, --help  Display this help 
message\n");
 }
 
 int
@@ -688,11 +693,12 @@ main(int argc, char *argv[])
int i, c;
char *tty = NULL;
struct option opts[] = {
-   { "user",required_argument, NULL, 'u' },
-   { "tty", required_argument, NULL, 't' },
-   { "verbose", no_argument,   NULL, 'v' },
-   { "help",no_argument,   NULL, 'h' },
-   { 0, 0, NULL,  0  }
+   { "user",   required_argument, NULL, 'u' },
+   { "use-user-shell", no_argument,   NULL, 's' },
+   { "tty",required_argument, NULL, 't' },
+   { "verbose",no_argument,   NULL, 'v' },
+   { "help",   no_argument,   NULL, 'h' },
+   { 0,0, NULL,  0  }
};
 
memset(, 0, sizeof wl);
@@ -704,6 +710,9 @@ main(int argc, char *argv[])
if (getuid() != 0)
error(1, 0, "Permission denied. -u allowed for 
root only");
break;
+   case 's':
+   wl.use_user_shell = 1;
+   break;
case 't':
tty = optarg;
break;
-- 
2.8.3

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/wayland-devel