Ticket #1521: socket-activation.patch

etc/sysconfig/xpra

@@ -1 +1 @@
 TCP_AUTH=sys
-AUTH=sys
+AUTH=peercred
 #DEBUG=auth,proxy
 DEBUG=

service/xpra.service

@@ -1 +1 @@
 [Unit]
-Description=Xpra Proxy Server
+Description=Xpra System Server
 Wants=avahi-daemon.socket
 Documentation=https://xpra.org/trac/wiki/ProxyServer man:xpra
+After=network.target xpra.socket
+Requires=xpra.socket
 
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/xpra
-ExecStart=/usr/bin/xpra proxy :14500 --daemon=no --bind-tcp=0.0.0.0:14500 --tcp-auth=${TCP_AUTH} --ssl-cert=/etc/xpra/ssl-cert.pem --bind=auto --auth=${AUTH} --socket-dirs=/var/run/xpra --socket-permissions=666 --log-dir=/var/log --pidfile=/var/run/xpra.pid --debug=${DEBUG}
+#ExecStart=/usr/bin/xpra proxy :14500 --daemon=no --bind-tcp=0.0.0.0:14500 --tcp-auth=${TCP_AUTH} --ssl-cert=/etc/xpra/ssl-cert.pem --bind=auto --auth=${AUTH} --socket-dirs=/var/run/xpra --socket-permissions=666 --log-dir=/var/log --pidfile=/var/run/xpra.pid --debug=${DEBUG}
+ExecStart=/usr/bin/xpra proxy :14500 --daemon=no --tcp-auth=${TCP_AUTH} --ssl-cert=/etc/xpra/ssl-cert.pem --auth=${AUTH} --socket-dirs=/var/run/xpra --socket-permissions=666 --log-dir=/var/log --pidfile=/var/run/xpra.pid --debug=${DEBUG}
 #rely on SIGKILL which returns 128+15=143
 SuccessExitStatus=0 143
 Restart=on-abnormal

service/xpra.socket

@@ +1 @@
+[Unit]
+Description=Xpra Socket
+PartOf=xpra.service
+
+[Socket]
+ListenStream=14500
+ListenStream=/var/run/xpra/system
+#this is not handled yet:
+#ListenStream=vsock:x:y
+SocketUser=root
+SocketGroup=xpra
+PassCredentials=true
+
+[Install]
+WantedBy=sockets.target

setup.py

@@ -143 +143 @@
 shadow_ENABLED = SHADOW_SUPPORTED and not (PYTHON3 and LINUX) and DEFAULT       #shadow servers use some GTK2 code..
 server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and not (PYTHON3 and LINUX) and DEFAULT
 service_ENABLED = LINUX and server_ENABLED
+sd_listen_ENABLED = pkg_config_ok("--exists", "libsystemd")
 proxy_ENABLED  = DEFAULT
 client_ENABLED = DEFAULT
 
@@ -1534 +1535 @@
                     copytodir("etc/sysconfig/xpra", "/etc/sysconfig")
                 elif os.path.exists("/etc/default"):
                     copytodir("etc/sysconfig/xpra", "/etc/default")
+            if sd_listen_ENABLED:
+                copytodir("service/xpra.socket", "/lib/systemd/system")
 
 
     # add build_conf to build step
@@ -1870 +1873 @@
                 ["xpra/server/window/motion.pyx"],
                 **O3_pkgconfig))
 
+if sd_listen_ENABLED:
+    sdp = pkgconfig("libsystemd")
+    cython_add(Extension("xpra.server.sd_listen",
+                ["xpra/server/sd_listen.pyx"],
+                **sdp))
 
+
 toggle_packages(enc_proxy_ENABLED, "xpra.codecs.enc_proxy")
 
 toggle_packages(nvfbc_ENABLED, "xpra.codecs.nvfbc")

xpra/scripts/server.py

@@ -477 +477 @@
         _, tcp_socket, host_port = setup_tcp_socket(host, iport, "SSL")
         socket = ("SSL", wrap_socket_fn(tcp_socket), host_port)
         sockets.append(socket)
-        if opts.mdns:
-            rec = "ssl", [(host, iport)]
-            mdns_recs.append(rec)
+        rec = "ssl", [(host, iport)]
+        mdns_recs.append(rec)
 
     # Initialize the TCP sockets before the display,
     # That way, errors won't make us kill the Xvfb
     # (which may not be ours to kill at that point)
+    tcp_ssl = ssl_opt in TRUE_OPTIONS or (ssl_opt=="auto" and opts.ssl_cert)
+    def add_tcp_mdns_rec(host, iport):
+        rec = "tcp", [(host, iport)]
+        mdns_recs.append(rec)
+        if tcp_ssl:
+            #SSL is also available on this TCP socket:
+            rec = "ssl", [(host, iport)]
+            mdns_recs.append(rec)
     for host, iport in bind_tcp:
         socket = setup_tcp_socket(host, iport)
         sockets.append(socket)
-        if opts.mdns:
-            rec = "tcp", [(host, iport)]
-            mdns_recs.append(rec)
-            if ssl_opt in TRUE_OPTIONS or (ssl_opt=="auto" and opts.ssl_cert):
-                #SSL is also available on this TCP socket:
-                rec = "ssl", [(host, iport)]
-                mdns_recs.append(rec)
+        add_tcp_mdns_rec(host, iport)
 
     # VSOCK:
     for cid, iport in bind_vsock:
         socket = setup_vsock_socket(cid, iport)
         sockets.append(socket)
-        if opts.mdns:
-            rec = "vsock", [("", iport)]
-            mdns_recs.append(rec)
+        rec = "vsock", [("", iport)]
+        mdns_recs.append(rec)
 
+    # systemd socket activation:
+    try:
+        from xpra.server.sd_listen import get_sd_listen_sockets
+    except ImportError:
+        pass
+    else:
+        sd_sockets = get_sd_listen_sockets()
+        for stype, sock, addr in sd_sockets:
+            sockets.append((stype, sock, addr))
+            if stype=="tcp":
+                host, iport = addr
+                add_tcp_mdns_rec(host, iport)
+
     # Do this after writing out the shell script:
     if display_name[0] != 'S':
         os.environ["DISPLAY"] = display_name