#3592 missed from 058f8f2

the dbus-proxy feature had already been removed as part of the removal of the rpc subsystem,
this just removes the command line switch

docs/Usage/Security.md

@@ -68,7 +68,7 @@ There are obvious privacy concerns here and it may be desirable to turn off the
 "_D-Bus is a message bus system, a simple way for applications to talk to one another_.
 _In addition to interprocess communication, D-Bus helps coordinate process lifecycle_."  
 This makes `dbus` both a very useful desktop environment component and a wide attack target.  
-The limited `--dbus-proxy` calls can safely be turned off and the `--dbus-control` channel should be turned off if unused.
+The `--dbus-control` channel should be turned off if unused.
 
 ### Hardware Access
 Any subsystem that accesses hardware directly is an inherent security risk.  

fs/etc/xpra/conf.d/60_server.conf.in

@@ -73,11 +73,6 @@ dbus-launch = dbus-launch --sh-syntax --close-stderr
 #dbus-control = no
 dbus-control = %(dbus_control)s
 
-# Forward client dbus rpc requests:
-# (requires client configuration)
-#dbus-proxy = no
-dbus-proxy = %(dbus_proxy)s
-
 # A wrapper for executing all sub-commands:
 # exec-wrapper = vglrun --
 # exec-wrapper = vglrun -d :1 --

fs/share/man/man1/xpra.1

@@ -691,9 +691,6 @@ Start the session within a dbus-launch context, you can specify
 the dbus launch command to use, or turn it off completely.
 Some features may not be available without a dbus context.
 .TP
-\fB--dbus-proxy\fP=\fIyes\fP|\fIno\fP
-Allows the client to forward dbus calls to the server.
-.TP
 \fB--dbus-control\fP=\fIyes\fP|\fIno\fP
 Start a dbus server which can be used to interact with the server
 process.

setup.py

@@ -1070,7 +1070,6 @@ def pretty_cmd(cmd):
         "source"                : source,
         'mdns'                  : bstr(mdns),
         'notifications'         : bstr(OSX or WIN32 or dbus_ENABLED),
-        'dbus_proxy'            : bstr(not OSX and not WIN32 and dbus_ENABLED),
         'pdf_printer'           : pdf,
         'postscript_printer'    : postscript,
         'webcam'                : ["no", "auto"][webcam],

tests/unittests/unit/server/mixins/server_mixins_option_test_util.py

@@ -35,7 +35,6 @@
 if not WIN32:
     OPTIONS += [
     "mmap",
-    "dbus-proxy",
     ]
 
 

xpra/client/gui/ui_client_base.py

@@ -602,7 +602,7 @@ def _process_setting_change(self, packet : PacketType):
             #FIXME: this should update the limits?
             pass
         elif setting in (
-            "bell", "randr", "cursors", "notifications", "dbus-proxy", "clipboard",
+            "bell", "randr", "cursors", "notifications", "clipboard",
             "clipboard-direction", "session_name",
             "sharing", "sharing-toggle", "lock", "lock-toggle",
             "start-new-commands", "client-shutdown", "webcam",

xpra/scripts/config.py

@@ -617,7 +617,6 @@ def may_create_user_config(xpra_conf_filename:str=DEFAULT_XPRA_CONF_FILENAME):
                     "reconnect"         : bool,
                     "tray"              : bool,
                     "pulseaudio"        : bool,
-                    "dbus-proxy"        : bool,
                     "mmap-group"        : str,
                     "readonly"          : bool,
                     "keyboard-sync"     : bool,
@@ -748,7 +747,6 @@ def may_create_user_config(xpra_conf_filename:str=DEFAULT_XPRA_CONF_FILENAME):
                   "open-command", "open-files", "printing", "open-url",
                   "headerbar",
                   "challenge-handlers",
-                  "dbus-proxy",
                   "remote-logging",
                   "lpadmin", "lpinfo",
                   "debug",
@@ -1046,7 +1044,6 @@ def get_defaults():
                     "reconnect"         : True,
                     "tray"              : True,
                     "pulseaudio"        : DEFAULT_PULSEAUDIO,
-                    "dbus-proxy"        : not OSX and not WIN32,
                     "mmap"              : "yes",
                     "mmap-group"        : "auto",
                     "video"             : True,

xpra/scripts/main.py

@@ -1757,7 +1757,7 @@ def impcheck(*modules):
         mixin_features.webcam           = bo(opts.webcam) and impcheck("codecs")
         mixin_features.clipboard        = b(opts.clipboard) and impcheck("clipboard")
         mixin_features.notifications    = opts.notifications and impcheck("notifications")
-        mixin_features.dbus             = opts.dbus_proxy and impcheck("dbus")
+        mixin_features.dbus             = impcheck("dbus")
         mixin_features.mmap             = b(opts.mmap)
         mixin_features.logging          = b(opts.remote_logging)
         mixin_features.tray             = b(opts.tray)
@@ -3918,7 +3918,7 @@ def run_showconfig(options, args) -> int:
             #these options don't make sense on win32 or osx:
             HIDDEN += ["socket-dirs", "socket-dir",
                        "wm-name", "pulseaudio-command", "pulseaudio", "xvfb", "input-method",
-                       "socket-permissions", "dbus-proxy", "xsettings",
+                       "socket-permissions", "xsettings",
                        "exit-with-children", "start-new-commands",
                        "start", "start-child",
                        "start-after-connect", "start-child-after-connect",

xpra/scripts/parsing.py

@@ -1230,11 +1230,7 @@ def dcsv(v):
     group.add_option("--mdns", action="store", metavar="yes|no",
                      dest="mdns", default=defaults.mdns,
                      help="Publish the session information via mDNS. Default: %s." % enabled_str(defaults.mdns))
-    legacy_bool_parse("dbus-proxy")
     legacy_bool_parse("dbus-control")
-    group.add_option("--dbus-proxy", action="store", metavar="yes|no",
-                     dest="dbus_proxy", default=defaults.dbus_proxy,
-                     help="Forward dbus calls from the client. Default: %s." % enabled_str(defaults.dbus_proxy))
     group.add_option("--dbus-control", action="store", metavar="yes|no",
                      dest="dbus_control", default=defaults.dbus_control,
                      help="Allows the server to be controlled via its dbus interface."

xpra/scripts/server.py

@@ -291,7 +291,7 @@ def impcheck(*modules):
     server_features.mmap            = b(opts.mmap)
     server_features.input_devices   = not opts.readonly and impcheck("keyboard")
     server_features.commands        = envbool("XPRA_RUN_COMMANDS", True)
-    server_features.dbus            = opts.dbus_proxy and impcheck("dbus", "server.dbus")
+    server_features.dbus            = impcheck("dbus", "server.dbus")
     server_features.encoding        = impcheck("codecs")
     server_features.logging         = b(opts.remote_logging)
     #server_features.network_state   = ??

xpra/server/mixins/controlcommands.py

@@ -20,7 +20,7 @@
 log = Logger("command")
 
 TOGGLE_FEATURES = (
-    "bell", "randr", "cursors", "notifications", "dbus-proxy", "clipboard",
+    "bell", "randr", "cursors", "notifications", "clipboard",
     "start-new-commands", "client-shutdown", "webcam",
     )