Attachment 640780 Details for Bug 936842

[patch] u_run_xserver-as-non-root.patch

u_run-xserver-as-non-root.patch (text/plain), 12.17 KB, created by Federico Mena Quintero on 2015-07-13 22:53:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Federico Mena Quintero

Created: 2015-07-13 22:53:39 UTC

Size: 12.17 KB

patch

obsolete

>From 5cb9f8451e56b2cb577d561f93945f31649c3143 Mon Sep 17 00:00:00 2001
>From: Hans de Goede <hdegoede@redhat.com>
>Date: Thu, 9 Jul 2015 15:10:42 -0500
>Subject: [PATCH 1/3] xf86LogInit: log to XDG_DATA_HOME when not running as
> root
>
>When no logfile was specified (xf86LogFileFrom == X_DEFAULT) and we're not
>running as root log to $XDG_DATA_HOME/xorg/Xorg.#.log as Xorg won't be able to
>log to the default /var/log/... when it is not running as root.
>
>Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
>Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
>
>Original commit is 9d65c515d83d2158b5949e249777ca2a02b31901
>---
> configure.ac                   |  4 ++++
> hw/xfree86/common/xf86Helper.c | 31 ++++++++++++++++++++++++++++++-
> hw/xfree86/man/xorg.conf.man   |  6 +++++-
> include/xorg-config.h.in       |  6 ++++++
> 4 files changed, 45 insertions(+), 2 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 5951737..7427448 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -2012,6 +2012,8 @@ if test "x$XORG" = xyes; then
> 	AC_SUBST(XF86CONFIGDIR)
> 	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
> 	LOGPREFIX="$logdir/Xorg."
>+	XDG_DATA_HOME=".local/share"
>+	XDG_DATA_HOME_LOGDIR="xorg"
> 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
> 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
> 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
>@@ -2025,6 +2027,8 @@ if test "x$XORG" = xyes; then
> 	AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])
> 	AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path])
> 	AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])
>+	AC_DEFINE_DIR(DEFAULT_XDG_DATA_HOME, XDG_DATA_HOME, [Default XDG_DATA dir under HOME])
>+	AC_DEFINE_DIR(DEFAULT_XDG_DATA_HOME_LOGDIR, XDG_DATA_HOME_LOGDIR, [Default log dir under XDG_DATA_HOME])
> 	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
> 	if test "x$VGAHW" = xyes; then
> 		AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
>diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
>index 839aa5c..fe1093c 100644
>--- a/hw/xfree86/common/xf86Helper.c
>+++ b/hw/xfree86/common/xf86Helper.c
>@@ -1240,16 +1240,45 @@ xf86ErrorF(const char *format, ...)
>     va_end(ap);
> }
> 
>+/* Note temporarily modifies the passed in buffer! */
>+static void xf86_mkdir_p(char *path)
>+{
>+    char *sep = path;
>+
>+    while ((sep = strchr(sep + 1, '/'))) {
>+        *sep = 0;
>+        (void)mkdir(path, 0777);
>+        *sep = '/';
>+    }
>+    (void)mkdir(path, 0777);
>+}
>+
> void
> xf86LogInit(void)
> {
>-    char *lf = NULL;
>+    char *env, *lf = NULL;
>+    char buf[PATH_MAX];
> 
> #define LOGSUFFIX ".log"
> #define LOGOLDSUFFIX ".old"
> 
>     /* Get the log file name */
>     if (xf86LogFileFrom == X_DEFAULT) {
>+        /* When not running as root, we won't be able to write to /var/log */
>+        if (geteuid() != 0) {
>+            if ((env = getenv("XDG_DATA_HOME")))
>+                snprintf(buf, sizeof(buf), "%s/%s", env,
>+                         DEFAULT_XDG_DATA_HOME_LOGDIR);
>+            else if ((env = getenv("HOME")))
>+                snprintf(buf, sizeof(buf), "%s/%s/%s", env,
>+                         DEFAULT_XDG_DATA_HOME, DEFAULT_XDG_DATA_HOME_LOGDIR);
>+
>+            if (env) {
>+                xf86_mkdir_p(buf);
>+                strlcat(buf, "/" DEFAULT_LOGPREFIX, sizeof(buf));
>+                xf86LogFile = buf;
>+            }
>+        }
>         /* Append the display number and ".log" */
>         if (asprintf(&lf, "%s%%s" LOGSUFFIX, xf86LogFile) == -1)
>             FatalError("Cannot allocate space for the log file name\n");
>diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
>index 85f9f2e..6d2652e 100644
>--- a/hw/xfree86/man/xorg.conf.man
>+++ b/hw/xfree86/man/xorg.conf.man
>@@ -442,11 +442,15 @@ __modulepath__
> .TP 7
> .BI "LogFile \*q" path \*q
> sets the name of the Xorg server log file.
>-The default log file name is
>+The default log file name when running as root is
> .PP
> .RS 11
> .RI __logdir__/Xorg. <n> .log
> .RE
>+and for non root it is
>+.RS 11
>+.RI $XDG_DATA_HOME/xorg/Xorg. <n> .log
>+.RE
> .PP
> .RS 7
> where
>diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
>index 487d7ad..aa9f6d5 100644
>--- a/include/xorg-config.h.in
>+++ b/include/xorg-config.h.in
>@@ -48,6 +48,12 @@
> /* Path to server log file. */
> #undef DEFAULT_LOGPREFIX
> 
>+/* Default XDG_DATA dir under HOME */
>+#undef DEFAULT_XDG_DATA_HOME
>+
>+/* Default log dir under XDG_DATA_HOME */
>+#undef DEFAULT_XDG_DATA_HOME_LOGDIR
>+
> /* Building DRI-capable DDX. */
> #undef XF86DRI
> 
>-- 
>2.1.4
>
>
>From 28637dcdd72e399d8278ba11087af7fc02b0acf1 Mon Sep 17 00:00:00 2001
>From: Hans de Goede <hdegoede@redhat.com>
>Date: Fri, 10 Jul 2015 20:57:42 -0500
>Subject: [PATCH 2/3] configure: Change DEFAULT_LOGPREFIX to really be a
> filename prefix
>
>Rather then a full path prefix, this is a preparation patch for adding
>support for logging to another location when not running as root.
>
>Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
>Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
>
>Original commit is f37a46913489397d8628ffe578c8d4ed50b6ca72
>---
> configure.ac                    | 5 +++--
> hw/xfree86/common/xf86Globals.c | 2 +-
> include/xorg-config.h.in        | 5 ++++-
> include/xwin-config.h.in        | 3 ---
> 4 files changed, 8 insertions(+), 7 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 7427448..d52f0de 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -2011,7 +2011,7 @@ if test "x$XORG" = xyes; then
> 	XF86CONFIGDIR="xorg.conf.d"
> 	AC_SUBST(XF86CONFIGDIR)
> 	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
>-	LOGPREFIX="$logdir/Xorg."
>+	LOGPREFIX="Xorg."
> 	XDG_DATA_HOME=".local/share"
> 	XDG_DATA_HOME_LOGDIR="xorg"
> 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
>@@ -2026,7 +2026,8 @@ if test "x$XORG" = xyes; then
> 	AC_DEFINE_DIR(__XCONFIGDIR__, XF86CONFIGDIR, [Name of configuration directory])
> 	AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])
> 	AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path])
>-	AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])
>+	AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location])
>+	AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default logfile prefix])
> 	AC_DEFINE_DIR(DEFAULT_XDG_DATA_HOME, XDG_DATA_HOME, [Default XDG_DATA dir under HOME])
> 	AC_DEFINE_DIR(DEFAULT_XDG_DATA_HOME_LOGDIR, XDG_DATA_HOME_LOGDIR, [Default log dir under XDG_DATA_HOME])
> 	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
>diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
>index 4a94c4d..f47fa83 100644
>--- a/hw/xfree86/common/xf86Globals.c
>+++ b/hw/xfree86/common/xf86Globals.c
>@@ -144,7 +144,7 @@ const char *xf86ConfigFile = NULL;
> const char *xf86ConfigDir = NULL;
> const char *xf86ModulePath = DEFAULT_MODULE_PATH;
> MessageType xf86ModPathFrom = X_DEFAULT;
>-const char *xf86LogFile = DEFAULT_LOGPREFIX;
>+const char *xf86LogFile = DEFAULT_LOGDIR "/" DEFAULT_LOGPREFIX;
> MessageType xf86LogFileFrom = X_DEFAULT;
> Bool xf86LogFileWasOpened = FALSE;
> serverLayoutRec xf86ConfigLayout = { NULL, };
>diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
>index aa9f6d5..29e17bd 100644
>--- a/include/xorg-config.h.in
>+++ b/include/xorg-config.h.in
>@@ -45,7 +45,10 @@
> /* Path to installed libraries. */
> #undef DEFAULT_LIBRARY_PATH
> 
>-/* Path to server log file. */
>+/* Default log location */
>+#undef DEFAULT_LOGDIR
>+
>+/* Default logfile prefix */
> #undef DEFAULT_LOGPREFIX
> 
> /* Default XDG_DATA dir under HOME */
>diff --git a/include/xwin-config.h.in b/include/xwin-config.h.in
>index c5119f2..c0b6a14 100644
>--- a/include/xwin-config.h.in
>+++ b/include/xwin-config.h.in
>@@ -29,8 +29,5 @@
> /* Location of system.XWinrc */
> #undef SYSCONFDIR
> 
>-/* Default log location */
>-#undef DEFAULT_LOGDIR
>-
> /* Whether we should re-locate the root to where the executable lives */
> #undef RELOCATE_PROJECTROOT
>-- 
>2.1.4
>
>
>From 17f20b2bb76ca4d82a6e3a4dc8e67d0ea6052010 Mon Sep 17 00:00:00 2001
>From: Federico Mena Quintero <federico@gnome.org>
>Date: Fri, 10 Jul 2015 14:51:30 -0500
>Subject: [PATCH 3/3] Stop initialization if /etc/fmq-pause-x exists
>
>---
> hw/xfree86/common/xf86Helper.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
>index fe1093c..751ca36 100644
>--- a/hw/xfree86/common/xf86Helper.c
>+++ b/hw/xfree86/common/xf86Helper.c
>@@ -1258,10 +1258,14 @@ xf86LogInit(void)
> {
>     char *env, *lf = NULL;
>     char buf[PATH_MAX];
>+    struct stat statbuf;
> 
> #define LOGSUFFIX ".log"
> #define LOGOLDSUFFIX ".old"
> 
>+    if (stat ("/etc/fmq-pause-x", &statbuf) == 0)
>+       kill (getpid (), SIGSTOP);
>+
>     /* Get the log file name */
>     if (xf86LogFileFrom == X_DEFAULT) {
>         /* When not running as root, we won't be able to write to /var/log */
>-- 
>2.1.4
>
>From cf71121c56b2f5971272d075443f8dc9bfb2df3e Mon Sep 17 00:00:00 2001
>From: Hans de Goede <hdegoede@redhat.com>
>Date: Mon, 13 Jul 2015 13:39:24 -0500
>Subject: [PATCH 1/2] linux: xf86OpenConsole remove root-rights check for
> keeptty option
>
>There is no reason why keeptty cannot be used without root-rights.
>
>Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
>
>Original commit 701b7ab34984b0f9f0c357b0ff8b53c5132c6324
>---
> hw/xfree86/os-support/linux/lnx_init.c | 6 ------
> 1 file changed, 6 deletions(-)
>
>diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
>index c46bca9..e332432 100644
>--- a/hw/xfree86/os-support/linux/lnx_init.c
>+++ b/hw/xfree86/os-support/linux/lnx_init.c
>@@ -94,12 +94,6 @@ xf86OpenConsole(void)
>     char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
> 
>     if (serverGeneration == 1) {
>-
>-        /* when KeepTty check if we're run with euid==0 */
>-        if (KeepTty && geteuid() != 0)
>-            FatalError("xf86OpenConsole:"
>-                       " Server must be suid root for option \"KeepTTY\"\n");
>-
>         /*
>          * setup the virtual terminal manager
>          */
>-- 
>2.1.4
>
>
>From 6ef39e3742b9fc7d131b4c407720efcb446dc114 Mon Sep 17 00:00:00 2001
>From: Hans de Goede <hdegoede@redhat.com>
>Date: Mon, 13 Jul 2015 13:41:06 -0500
>Subject: [PATCH 2/2] linux: xf86OpenConsole: Don't detach from controlling tty
> when it is our vt
>
>Detaching from our controlling tty makes little sense when it is the same
>as the vt we're asked to run on. So automatically assume -keeptty in this case.
>
>This is useful to do because when not running as root the server can only make
>various VT related ioctls when it does not detach from the tty.
>
>Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
>
>Original commit 6b79f28f5cb259f2168ecc3034fe2161e969bf7d
>---
> hw/xfree86/os-support/linux/lnx_init.c | 19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
>
>diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
>index e332432..e057fd6 100644
>--- a/hw/xfree86/os-support/linux/lnx_init.c
>+++ b/hw/xfree86/os-support/linux/lnx_init.c
>@@ -86,9 +86,10 @@ switch_to(int vt, const char *from, Bool fatal)
> void
> xf86OpenConsole(void)
> {
>-    int i, fd = -1, ret;
>+    int i, fd = -1, ret, current_vt = -1;
>     struct vt_mode VT;
>     struct vt_stat vts;
>+    struct stat st;
>     MessageType from = X_PROBED;
>     char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL };
>     char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
>@@ -131,6 +132,22 @@ xf86OpenConsole(void)
>             close(fd);
>         }
> 
>+        /* Some of stdin / stdout / stderr maybe redirected to a file */
>+        for (i = STDIN_FILENO; i <= STDERR_FILENO; i++) {
>+            ret = fstat(i, &st);
>+            if (ret == 0 && S_ISCHR(st.st_mode) && major(st.st_rdev) == 4) {
>+                current_vt = minor(st.st_rdev);
>+                break;
>+            }
>+        }
>+
>+        if (!KeepTty && current_vt == xf86Info.vtno) {
>+            xf86Msg(X_PROBED,
>+                    "controlling tty is VT number %d, auto-enabling KeepTty\n",
>+                    current_vt);
>+            KeepTty = TRUE;
>+        }
>+
>         xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
> 
>         if (!KeepTty) {
>-- 
>2.1.4
>

Actions: View | Diff

Attachments on bug 936842: 640536 | 640656 | 640780 | 641132 | 641618 | 641619 | 641620 | 641656 | 641703 | 641704 | 641714