#4491 default to mmap read only for clients

Xpra-org · Feb 6, 2025 · 5730fd0 · 5730fd0
1 parent 0365fe3
commit 5730fd0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/setup.py b/setup.py
@@ -1515,7 +1515,7 @@ def pretty_cmd(cmd: Sequence[str]) -> str:
         'mousewheel'            : "on",
         'printing'              : bstr(printing_ENABLED),
         'dbus_control'          : bstr(dbus_ENABLED),
-        'mmap'                  : bstr(True),
+        'mmap'                  : "auto",
         'opengl'                : "no" if OSX else "probe",
         'headerbar'             : ["auto", "no"][OSX or WIN32],
     }

diff --git a/tests/unittests/unit/client/mixins/mmap_test.py b/tests/unittests/unit/client/mixins/mmap_test.py
@@ -28,6 +28,7 @@ def close(self):
         for mmap_option, ctx in {
             "off": nullcontext(),
             "on": silence_info(mmap),
+            "auto": silence_info(mmap),
             tmp_dir+"/xpra-mmap-test-file-%i" % os.getpid(): silence_info(mmap),
             tmp_dir+"/xpra-fail-mmap-test-file-%i" % os.getpid(): silence_error(mmap),
         }.items():

diff --git a/xpra/client/mixins/mmap.py b/xpra/client/mixins/mmap.py
@@ -88,10 +88,14 @@ def init(self, opts) -> None:
             self.mmap_supported = False
             return
         self.mmap_supported = True
-        if opts.mmap.lower() not in TRUE_OPTIONS:
-            filenames = opts.mmap.split(os.path.pathsep)
-        else:
+        if opts.mmap.lower() == "auto":
+            # by default, only enable mmap reads, not writes:
+            filenames = ("", )
+        elif opts.mmap.lower() in TRUE_OPTIONS:
             filenames = ("", "")
+        else:
+            # assume file path(s) have been specified:
+            filenames = opts.mmap.split(os.path.pathsep)
         group = opts.mmap_group
         root_w, root_h = self.get_root_size()
         # at least 256MB, or 8 fullscreen RGBX frames:

diff --git a/xpra/scripts/config.py b/xpra/scripts/config.py
@@ -1215,7 +1215,7 @@ def get_defaults() -> dict[str, Any]:
         "reconnect"         : True,
         "tray"              : True,
         "pulseaudio"        : DEFAULT_PULSEAUDIO,
-        "mmap"              : "yes",
+        "mmap"              : "auto",
         "mmap-group"        : "auto",
         "video"             : True,
         "audio"             : True,