code.ossystems Code Review - openembedded-core.git/blob

   1 From 7d2fea61a95e9498b5a19c8cffcb2ab5631d5685 Mon Sep 17 00:00:00 2001
   2 From: Tom Hochstein <tom.hochstein@nxp.com>
   3 Date: Wed, 22 Feb 2017 15:53:30 +0200
   4 Subject: [PATCH] weston-launch: Provide a default version that doesn't require
   5  PAM
   6
   7 weston-launch requires PAM for starting weston as a non-root user.
   8
   9 Since starting weston as root is a valid use case by itself, if
  10 PAM is not available, provide a default version of weston-launch
  11 without non-root-user support.
  12
  13 Upstream-Status: Pending
  14
  15 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
  16 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
  17 Signed-off-by: Denys Dmytriyenko <denys@ti.com>
  18 Signed-off-by: Ming Liu <ming.liu@toradex.com>
  19 ---
  20  libweston/meson.build     | 16 ++++++++++++----
  21  libweston/weston-launch.c | 20 ++++++++++++++++++++
  22  meson_options.txt         |  7 +++++++
  23  3 files changed, 39 insertions(+), 4 deletions(-)
  24
  25 diff --git a/libweston/meson.build b/libweston/meson.build
  26 index 33ab970..32f495a 100644
  27 --- a/libweston/meson.build
  28 +++ b/libweston/meson.build
  29 @@ -472,16 +472,24 @@ if get_option('renderer-gl')
  30  endif
  31
  32  if get_option('weston-launch')
  33 -       dep_pam = cc.find_library('pam')
  34 +       deps_weston_launch = [systemd_dep, dep_libdrm]
  35
  36 -       if not cc.has_function('pam_open_session', dependencies: dep_pam)
  37 -               error('pam_open_session not found for weston-launch')
  38 +       if get_option('pam')
  39 +               dep_pam = cc.find_library('pam')
  40 +               if not cc.has_function('pam_open_session', dependencies: dep_pam)
  41 +                       error('pam_open_session not found for weston-launch')
  42 +               endif
  43 +
  44 +               if dep_pam.found()
  45 +                       deps_weston_launch += dep_pam
  46 +                       config_h.set('HAVE_PAM', '1')
  47 +               endif
  48         endif
  49
  50         executable(
  51                 'weston-launch',
  52                 'weston-launch.c',
  53 -               dependencies: [dep_pam, systemd_dep, dep_libdrm],
  54 +               dependencies: deps_weston_launch,
  55                 include_directories: include_directories('..'),
  56                 install: true
  57         )
  58 diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
  59 index 9064439..c6abe92 100644
  60 --- a/libweston/weston-launch.c
  61 +++ b/libweston/weston-launch.c
  62 @@ -51,7 +51,9 @@
  63
  64  #include <pwd.h>
  65  #include <grp.h>
  66 +#ifdef HAVE_PAM
  67  #include <security/pam_appl.h>
  68 +#endif
  69
  70  #ifdef HAVE_SYSTEMD_LOGIN
  71  #include <systemd/sd-login.h>
  72 @@ -101,8 +103,10 @@ drmSetMaster(int drm_fd)
  73  #endif
  74
  75  struct weston_launch {
  76 +#ifdef HAVE_PAM
  77         struct pam_conv pc;
  78         pam_handle_t *ph;
  79 +#endif
  80         int tty;
  81         int ttynr;
  82         int sock[2];
  83 @@ -191,6 +195,7 @@ weston_launch_allowed(struct weston_launch *wl)
  84         return false;
  85  }
  86
  87 +#ifdef HAVE_PAM
  88  static int
  89  pam_conversation_fn(int msg_count,
  90                     const struct pam_message **messages,
  91 @@ -231,6 +236,7 @@ setup_pam(struct weston_launch *wl)
  92
  93         return 0;
  94  }
  95 +#endif
  96
  97  static int
  98  setup_launcher_socket(struct weston_launch *wl)
  99 @@ -424,6 +430,7 @@ quit(struct weston_launch *wl, int status)
 100         close(wl->signalfd);
 101         close(wl->sock[0]);
 102
 103 +#ifdef HAVE_PAM
 104         if (wl->new_user) {
 105                 err = pam_close_session(wl->ph, 0);
 106                 if (err)
 107 @@ -431,6 +438,7 @@ quit(struct weston_launch *wl, int status)
 108                                 err, pam_strerror(wl->ph, err));
 109                 pam_end(wl->ph, err);
 110         }
 111 +#endif
 112
 113         if (ioctl(wl->tty, KDSKBMUTE, 0) &&
 114             ioctl(wl->tty, KDSKBMODE, wl->kb_mode))
 115 @@ -610,6 +618,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
 116         setenv("HOME", wl->pw->pw_dir, 1);
 117         setenv("SHELL", wl->pw->pw_shell, 1);
 118
 119 +#ifdef HAVE_PAM
 120         env = pam_getenvlist(wl->ph);
 121         if (env) {
 122                 for (i = 0; env[i]; ++i) {
 123 @@ -618,6 +627,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
 124                 }
 125                 free(env);
 126         }
 127 +#endif
 128
 129         /*
 130          * We open a new session, so it makes sense
 131 @@ -685,8 +695,10 @@ static void
 132  help(const char *name)
 133  {
 134         fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
 135 +#ifdef HAVE_PAM
 136         fprintf(stderr, "  -u, --user      Start session as specified username,\n"
 137                         "                  e.g. -u joe, requires root.\n");
 138 +#endif
 139         fprintf(stderr, "  -t, --tty       Start session on alternative tty,\n"
 140                         "                  e.g. -t /dev/tty4, requires -u option.\n");
 141         fprintf(stderr, "  -v, --verbose   Be verbose\n");
 142 @@ -700,7 +712,9 @@ main(int argc, char *argv[])
 143         int i, c;
 144         char *tty = NULL;
 145         struct option opts[] = {
 146 +#ifdef HAVE_PAM
 147                 { "user",    required_argument, NULL, 'u' },
 148 +#endif
 149                 { "tty",     required_argument, NULL, 't' },
 150                 { "verbose", no_argument,       NULL, 'v' },
 151                 { "help",    no_argument,       NULL, 'h' },
 152 @@ -712,9 +726,13 @@ main(int argc, char *argv[])
 153         while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
 154                 switch (c) {
 155                 case 'u':
 156 +#ifdef HAVE_PAM
 157                         wl.new_user = optarg;
 158                         if (getuid() != 0)
 159                                 error(1, 0, "Permission denied. -u allowed for root only");
 160 +#else
 161 +                       error(1, 0, "-u is unsupported in this weston-launch build");
 162 +#endif
 163                         break;
 164                 case 't':
 165                         tty = optarg;
 166 @@ -755,8 +773,10 @@ main(int argc, char *argv[])
 167         if (setup_tty(&wl, tty) < 0)
 168                 exit(EXIT_FAILURE);
 169
 170 +#ifdef HAVE_PAM
 171         if (wl.new_user && setup_pam(&wl) < 0)
 172                 exit(EXIT_FAILURE);
 173 +#endif
 174
 175         if (setup_launcher_socket(&wl) < 0)
 176                 exit(EXIT_FAILURE);
 177 diff --git a/meson_options.txt b/meson_options.txt
 178 index 0e1d183..9a5c3d5 100644
 179 --- a/meson_options.txt
 180 +++ b/meson_options.txt
 181 @@ -73,6 +73,13 @@ option(
 182  )
 183
 184  option(
 185 +       'pam',
 186 +       type: 'boolean',
 187 +       value: true,
 188 +       description: 'Define if PAM is available'
 189 +)
 190 +
 191 +option(
 192         'xwayland',
 193         type: 'boolean',
 194         value: true,
 195 --
 196 2.7.4
 197