Ticket #611: xpra_setup_remove_xorg_setuid.patch

setup.py

@@ -614 +614 @@
 
 
 #*******************************************************************************
-xorg_version = None
 def get_xorg_version():
-    global xorg_version
-    if xorg_version:
-        return xorg_version
+    # Detect Xorg Binary
+    xorg_bin = None
+    xorg_version = None   
+ 
     #fedora rawhide binary:
-    if os.path.exists("/usr/libexec/Xorg.bin"):
-        cmd = ["/usr/libexec/Xorg.bin", "-version"]
+    if os.path.exists('/usr/libexec/Xorg.bin'):
+        xorg_bin = '/usr/libexec/Xorg.bin'
     else:
-        cmd = ["Xorg", "-version"]
+        paths = os.environ.get("PATH").split(os.pathsep)
+        for x in paths:
+            xorg = os.path.join(x, "Xorg")
+            if os.path.isfile(xorg):
+                xorg_bin = xorg
+                break
+
+    # can't detect version if there is no binary
+    if not xorg_bin:
+        return xorg_version
+
+    cmd = [xorg_bin, '-version']
+
     if verbose_ENABLED:
         print("detecting Xorg version using: %s" % str(cmd))
     try:
@@ -644 +656 @@
 def detect_xorg_setup():
     if not server_ENABLED or WIN32:
         return ("", False, False)
+    
     #do live detection
     xorg_version = get_xorg_version()
 
     # detect displayfd
-    if not xorg_version:
-        has_displayfd = False
+    # if Xdummy support is enabled, then the X server is new enough to support
+    # displayfd
+    if Xdummy_ENABLED is True:
+        has_displayfd = True
     elif xorg_version >= [1, 12]:
         has_displayfd = True
     else:
@@ -658 +673 @@
     def Xvfb():
         return ("Xvfb +extension Composite -screen 0 3840x2560x24+32 -nolisten tcp -noreset -auth $XAUTHORITY", has_displayfd, False)
 
+    def Xdummy():
+        return ("xpra_Xdummy -dpi 96 -noreset -nolisten tcp +extension GLX +extension RANDR +extension RENDER -logfile ${HOME}/.xpra/Xorg.${DISPLAY}.log -config /etc/xpra/xorg.conf", has_displayfd, True)
+
     if sys.platform.find("bsd")>=0:
         print("Warning: sorry, no support for Xdummy on %s" % sys.platform)
         return Xvfb()
 
-    XORG_BIN = None
-    PATHS = os.environ.get("PATH").split(os.pathsep)
-    for x in PATHS:
-        xorg = os.path.join(x, "Xorg")
-        if os.path.isfile(xorg):
-            XORG_BIN = xorg
-            break
-    if not XORG_BIN:
-        print("Xorg not found, cannot detect version or Xdummy support")
-        return Xvfb()
-
-    def Xorg_suid_check():
-        xorg_stat = os.stat(XORG_BIN)
-        if (xorg_stat.st_mode & stat.S_ISUID)!=0:
-            if (xorg_stat.st_mode & stat.S_IROTH)==0:
-                print("Xorg is suid and not readable, Xdummy support unavailable")
-                return Xvfb()
-            print("%s is suid and readable, using the xpra_Xdummy wrapper" % XORG_BIN)
-            return ("xpra_Xdummy -dpi 96 -noreset -nolisten tcp +extension GLX +extension RANDR +extension RENDER -logfile ${HOME}/.xpra/Xorg.${DISPLAY}.log -config /etc/xpra/xorg.conf", has_displayfd, True)
-        else:
-            print("using Xdummy config file")
-            return ("Xorg -dpi 96 -noreset -nolisten tcp +extension GLX +extension RANDR +extension RENDER -logfile ${HOME}/.xpra/Xorg.${DISPLAY}.log -config /etc/xpra/xorg.conf", has_displayfd, False)
-
+    # if xdummy support is explicitly enabled or disabled do as user wishes,
+    # otherwise try to autodetect
     if Xdummy_ENABLED is False:
         return Xvfb()
     elif Xdummy_ENABLED is True:
-        print("Xdummy support specified as 'enabled', will detect suid mode")
-        return Xorg_suid_check()
+        print("Xdummy support specified as 'enabled'")
+        return Xdummy()
     else:
         print("Xdummy support unspecified, will try to detect")
 
@@ -714 +711 @@
         print("Xorg version %s is too old (1.12 or later required), Xdummy support not available" % str(xorg_version))
         return Xvfb()
     print("found valid recent version of Xorg server: %s" % str(xorg_version))
-    return Xorg_suid_check()
+    return Xdummy()
 
 def build_xpra_conf(build_base):
     #generates an actual config file from the template