blob: f6ebfd8f61cc8f71f34f897620f9073cbcd1e38d [file] [log] [blame]
Andrew Geisslerc9f78652020-09-18 14:11:35 -05001From a1548c742bf2dedbb47282d8a00407b60bbab669 Mon Sep 17 00:00:00 2001
Patrick Williamsc0f7c042017-02-23 20:41:17 -06002From: Tom Hochstein <tom.hochstein@nxp.com>
Brad Bishop6e60e8b2018-02-01 10:27:11 -05003Date: Wed, 22 Feb 2017 15:53:30 +0200
Brad Bishopc342db32019-05-15 21:57:59 -04004Subject: [PATCH] weston-launch: Provide a default version that doesn't require
Andrew Geisslerc9f78652020-09-18 14:11:35 -05005
Brad Bishopc342db32019-05-15 21:57:59 -04006 PAM
Patrick Williamsc0f7c042017-02-23 20:41:17 -06007
8weston-launch requires PAM for starting weston as a non-root user.
9
10Since starting weston as root is a valid use case by itself, if
11PAM is not available, provide a default version of weston-launch
12without non-root-user support.
13
Andrew Geissler595f6302022-01-24 19:11:47 +000014Upstream-Status: Denied [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/725]
Patrick Williamsc0f7c042017-02-23 20:41:17 -060015
16Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Brad Bishop6e60e8b2018-02-01 10:27:11 -050017Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080018Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Brad Bishop08902b02019-08-20 09:16:51 -040019Signed-off-by: Ming Liu <ming.liu@toradex.com>
Andrew Geissler82c905d2020-04-13 13:39:40 -050020
Patrick Williamsc0f7c042017-02-23 20:41:17 -060021---
Brad Bishop08902b02019-08-20 09:16:51 -040022 libweston/meson.build | 16 ++++++++++++----
Brad Bishop79641f22019-09-10 07:20:22 -040023 libweston/weston-launch.c | 21 +++++++++++++++++++++
Brad Bishop08902b02019-08-20 09:16:51 -040024 meson_options.txt | 7 +++++++
Brad Bishop79641f22019-09-10 07:20:22 -040025 3 files changed, 40 insertions(+), 4 deletions(-)
Patrick Williamsc0f7c042017-02-23 20:41:17 -060026
Brad Bishop08902b02019-08-20 09:16:51 -040027diff --git a/libweston/meson.build b/libweston/meson.build
Andrew Geissler82c905d2020-04-13 13:39:40 -050028index 08d23ec..cb9fd3f 100644
Brad Bishop08902b02019-08-20 09:16:51 -040029--- a/libweston/meson.build
30+++ b/libweston/meson.build
Andrew Geissler82c905d2020-04-13 13:39:40 -050031@@ -216,16 +216,24 @@ dep_vertex_clipping = declare_dependency(
Brad Bishop79641f22019-09-10 07:20:22 -040032 )
Patrick Williamsc0f7c042017-02-23 20:41:17 -060033
Brad Bishop08902b02019-08-20 09:16:51 -040034 if get_option('weston-launch')
35- dep_pam = cc.find_library('pam')
36+ deps_weston_launch = [systemd_dep, dep_libdrm]
Patrick Williamsc0f7c042017-02-23 20:41:17 -060037
Brad Bishop08902b02019-08-20 09:16:51 -040038- if not cc.has_function('pam_open_session', dependencies: dep_pam)
39- error('pam_open_session not found for weston-launch')
40+ if get_option('pam')
41+ dep_pam = cc.find_library('pam')
42+ if not cc.has_function('pam_open_session', dependencies: dep_pam)
43+ error('pam_open_session not found for weston-launch')
44+ endif
45+
46+ if dep_pam.found()
47+ deps_weston_launch += dep_pam
48+ config_h.set('HAVE_PAM', '1')
49+ endif
50 endif
Patrick Williamsc0f7c042017-02-23 20:41:17 -060051
Brad Bishop08902b02019-08-20 09:16:51 -040052 executable(
53 'weston-launch',
54 'weston-launch.c',
55- dependencies: [dep_pam, systemd_dep, dep_libdrm],
56+ dependencies: deps_weston_launch,
Andrew Geissler82c905d2020-04-13 13:39:40 -050057 include_directories: common_inc,
Brad Bishop08902b02019-08-20 09:16:51 -040058 install: true
59 )
Brad Bishop6e60e8b2018-02-01 10:27:11 -050060diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
Andrew Geisslerc9f78652020-09-18 14:11:35 -050061index 521cb2c..2d42d33 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050062--- a/libweston/weston-launch.c
63+++ b/libweston/weston-launch.c
Patrick Williamsc0f7c042017-02-23 20:41:17 -060064@@ -51,7 +51,9 @@
65
66 #include <pwd.h>
67 #include <grp.h>
68+#ifdef HAVE_PAM
69 #include <security/pam_appl.h>
70+#endif
71
72 #ifdef HAVE_SYSTEMD_LOGIN
73 #include <systemd/sd-login.h>
Brad Bishop79641f22019-09-10 07:20:22 -040074@@ -100,8 +102,10 @@ drmSetMaster(int drm_fd)
Patrick Williamsc0f7c042017-02-23 20:41:17 -060075 #endif
76
77 struct weston_launch {
78+#ifdef HAVE_PAM
79 struct pam_conv pc;
80 pam_handle_t *ph;
81+#endif
82 int tty;
83 int ttynr;
84 int sock[2];
Brad Bishop79641f22019-09-10 07:20:22 -040085@@ -192,6 +196,7 @@ weston_launch_allowed(struct weston_launch *wl)
Patrick Williamsc0f7c042017-02-23 20:41:17 -060086 return false;
87 }
88
89+#ifdef HAVE_PAM
90 static int
91 pam_conversation_fn(int msg_count,
92 const struct pam_message **messages,
Brad Bishop79641f22019-09-10 07:20:22 -040093@@ -232,6 +237,7 @@ setup_pam(struct weston_launch *wl)
Patrick Williamsc0f7c042017-02-23 20:41:17 -060094
95 return 0;
96 }
97+#endif
98
99 static int
100 setup_launcher_socket(struct weston_launch *wl)
Andrew Geisslerc9f78652020-09-18 14:11:35 -0500101@@ -466,6 +472,7 @@ quit(struct weston_launch *wl, int status)
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600102 close(wl->signalfd);
103 close(wl->sock[0]);
104
105+#ifdef HAVE_PAM
106 if (wl->new_user) {
107 err = pam_close_session(wl->ph, 0);
108 if (err)
Andrew Geisslerc9f78652020-09-18 14:11:35 -0500109@@ -473,6 +480,7 @@ quit(struct weston_launch *wl, int status)
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600110 err, pam_strerror(wl->ph, err));
111 pam_end(wl->ph, err);
112 }
113+#endif
114
Andrew Geisslerc9f78652020-09-18 14:11:35 -0500115 /*
116 * Get a fresh handle to the tty as the previous one is in
117@@ -710,6 +718,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600118 setenv("HOME", wl->pw->pw_dir, 1);
119 setenv("SHELL", wl->pw->pw_shell, 1);
120
121+#ifdef HAVE_PAM
122 env = pam_getenvlist(wl->ph);
123 if (env) {
124 for (i = 0; env[i]; ++i) {
Andrew Geisslerc9f78652020-09-18 14:11:35 -0500125@@ -718,6 +727,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600126 }
127 free(env);
128 }
129+#endif
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600130
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500131 /*
132 * We open a new session, so it makes sense
Andrew Geisslerc9f78652020-09-18 14:11:35 -0500133@@ -789,8 +799,10 @@ static void
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600134 help(const char *name)
135 {
136 fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name);
137+#ifdef HAVE_PAM
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800138 fprintf(stderr, " -u, --user Start session as specified username,\n"
139 " e.g. -u joe, requires root.\n");
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600140+#endif
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800141 fprintf(stderr, " -t, --tty Start session on alternative tty,\n"
142 " e.g. -t /dev/tty4, requires -u option.\n");
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600143 fprintf(stderr, " -v, --verbose Be verbose\n");
Andrew Geisslerc9f78652020-09-18 14:11:35 -0500144@@ -804,7 +816,9 @@ main(int argc, char *argv[])
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600145 int i, c;
146 char *tty = NULL;
147 struct option opts[] = {
148+#ifdef HAVE_PAM
149 { "user", required_argument, NULL, 'u' },
150+#endif
151 { "tty", required_argument, NULL, 't' },
152 { "verbose", no_argument, NULL, 'v' },
153 { "help", no_argument, NULL, 'h' },
Andrew Geisslerc9f78652020-09-18 14:11:35 -0500154@@ -816,11 +830,16 @@ main(int argc, char *argv[])
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800155 while ((c = getopt_long(argc, argv, "u:t:vh", opts, &i)) != -1) {
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600156 switch (c) {
157 case 'u':
158+#ifdef HAVE_PAM
159 wl.new_user = optarg;
Brad Bishop79641f22019-09-10 07:20:22 -0400160 if (getuid() != 0) {
161 fprintf(stderr, "weston: Permission denied. -u allowed for root only\n");
162 exit(EXIT_FAILURE);
163 }
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600164+#else
Brad Bishop79641f22019-09-10 07:20:22 -0400165+ fprintf(stderr, "weston: -u is unsupported in this weston-launch build\n");
166+ exit(EXIT_FAILURE);
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600167+#endif
168 break;
169 case 't':
170 tty = optarg;
Andrew Geisslerc9f78652020-09-18 14:11:35 -0500171@@ -872,8 +891,10 @@ main(int argc, char *argv[])
Patrick Williamsc0f7c042017-02-23 20:41:17 -0600172 if (setup_tty(&wl, tty) < 0)
173 exit(EXIT_FAILURE);
174
175+#ifdef HAVE_PAM
176 if (wl.new_user && setup_pam(&wl) < 0)
177 exit(EXIT_FAILURE);
178+#endif
179
180 if (setup_launcher_socket(&wl) < 0)
181 exit(EXIT_FAILURE);
Brad Bishop08902b02019-08-20 09:16:51 -0400182diff --git a/meson_options.txt b/meson_options.txt
Andrew Geisslerc9f78652020-09-18 14:11:35 -0500183index 239bd2d..99e4ec3 100644
Brad Bishop08902b02019-08-20 09:16:51 -0400184--- a/meson_options.txt
185+++ b/meson_options.txt
186@@ -73,6 +73,13 @@ option(
187 )
188
189 option(
190+ 'pam',
191+ type: 'boolean',
192+ value: true,
193+ description: 'Define if PAM is available'
194+)
195+
196+option(
197 'xwayland',
198 type: 'boolean',
199 value: true,