Ignore invalid GUI related features and options

resolves: QubesOS/qubes-issues#7730

.gitlab-ci.yml

@@ -7,7 +7,7 @@ include:
   project: QubesOS/qubes-continuous-integration
 checks:pylint:
   before_script:
-  - sudo dnf install -y python3-rpm
+  - sudo dnf install -y python3-rpm python3-xlib
   - pip3 install --quiet -r ci/requirements.txt
   script:
   - export PATH="$HOME/.local/bin:$PATH"
@@ -19,7 +19,7 @@ checks:tests:
   after_script:
   - ci/codecov-wrapper
   before_script:
-  - sudo dnf install -y openssl python3-rpm sequoia-sqv
+  - sudo dnf install -y openssl python3-rpm sequoia-sqv python3-xlib
   - pip3 install --quiet -r ci/requirements.txt
   - git config --global --add safe.directory "$PWD"
   script:

qubesadmin/tools/qvm_start_daemon.py

@@ -39,22 +39,63 @@
 import qubesadmin.vm
 from qubesadmin.tools import xcffibhelpers
 
+# pylint: disable=wrong-import-position
+from Xlib import XK, X
+from Xlib.display import Display
+
 GUI_DAEMON_PATH = '/usr/bin/qubes-guid'
 PACAT_DAEMON_PATH = '/usr/bin/pacat-simple-vchan'
 QUBES_ICON_DIR = '/usr/share/icons/hicolor/128x128/devices'
 
+def validator_key_sequence(sequence: str) -> bool:
+    """ xside.c key sequence validation is not case sensitive and supports more
+    choices than Global Config's limited choices, so we replicate it here """
+    if not isinstance(sequence, str):
+        return False
+    while '-' in sequence:
+        modifier, sequence = sequence.split('-', 1)
+        if not modifier.lower() in \
+                ['shift', 'ctrl', 'alt', 'mod1', 'mod2', 'mod3', 'mod4']:
+            return False
+    return Display().keysym_to_keycode(XK.string_to_keysym(sequence)) != \
+            X.NoSymbol
+
+def validator_trayicon_mode(mode: str) -> bool:
+    """ xside.c tray mode validation is replicated here """
+    if not isinstance(mode, str):
+        return False
+    if mode in ['bg', 'border1', 'border2', 'tint']:
+        return True
+    if mode.startswith('tint'):
+        if mode[4:] in ['+border1', '+border2', '+saturation50', '+whitehack']:
+            return True
+    return False
+
+def validator_color(color: str) -> bool:
+    """ xside.c `parse_color` validation code is replicated here """
+    if not isinstance(color, str):
+        return False
+    if re.match(r"^0[xX](?:[0-9a-fA-F]{3}){1,2}$", color.strip()):
+        # Technically `parse_color` could parse values such as `0x0`
+        # Xlib.xobject.colormap conventions & standards are different.
+        return True
+    if Display().screen().default_colormap.alloc_named_color(color) is not None:
+        return True
+    return False
+
 GUI_DAEMON_OPTIONS = [
-    ('allow_fullscreen', 'bool'),
-    ('override_redirect_protection', 'bool'),
-    ('override_redirect', 'str'),
-    ('allow_utf8_titles', 'bool'),
-    ('secure_copy_sequence', 'str'),
-    ('secure_paste_sequence', 'str'),
-    ('windows_count_limit', 'int'),
-    ('trayicon_mode', 'str'),
-    ('window_background_color', 'str'),
-    ('startup_timeout', 'int'),
-    ('max_clipboard_size', 'int'),
+    ('allow_fullscreen', 'bool', (lambda x: isinstance(x, bool))),
+    ('override_redirect_protection', 'bool', (lambda x: isinstance(x, bool))),
+    ('override_redirect', 'str', (lambda x: x in ['allow', 'disable'])),
+    ('allow_utf8_titles', 'bool', (lambda x: isinstance(x, bool))),
+    ('secure_copy_sequence', 'str', validator_key_sequence),
+    ('secure_paste_sequence', 'str', validator_key_sequence),
+    ('windows_count_limit', 'int', (lambda x: isinstance(x, int) and x > 0)),
+    ('trayicon_mode', 'str', validator_trayicon_mode),
+    ('window_background_color', 'str', validator_color),
+    ('startup_timeout', 'int', (lambda x: isinstance(x, int) and x >= 0)),
+    ('max_clipboard_size', 'int', \
+            (lambda x: isinstance(x, int) and 256 <= x <= 256000)),
 ]
 
 formatter = logging.Formatter(
@@ -108,12 +149,12 @@ def retrieve_gui_daemon_options(vm, guivm):
 
     options = {}
 
-    for name, kind in GUI_DAEMON_OPTIONS:
-        feature_value = vm.features.get(
-            'gui-' + name.replace('_', '-'), None)
+    for name, kind, validator in GUI_DAEMON_OPTIONS:
+        feature = 'gui-' + name.replace('_', '-')
+        feature_value = vm.features.get(feature, None)
         if feature_value is None:
-            feature_value = guivm.features.get(
-                'gui-default-' + name.replace('_', '-'), None)
+            feature = 'gui-' + name.replace('_', '-')
+            feature_value = guivm.features.get(feature, None)
         if feature_value is None:
             continue
 
@@ -126,6 +167,15 @@ def retrieve_gui_daemon_options(vm, guivm):
         else:
             assert False, kind
 
+        if not validator(value):
+            message = f"{vm.name}: Ignoring invalid feature:\n" \
+                      f"{feature}={feature_value}"
+            log.error(message)
+            if not sys.stdout.isatty():
+                subprocess.run(['notify-send', '-a', 'Qubes GUI Daemon', \
+                    '--icon', 'dialog-warning', message], check=False)
+            continue
+
         options[name] = value
     return options
 
@@ -141,7 +191,7 @@ def serialize_gui_daemon_options(options):
         '',
         'global: {',
     ]
-    for name, kind in GUI_DAEMON_OPTIONS:
+    for name, kind, validator in GUI_DAEMON_OPTIONS:
         if name in options:
             value = options[name]
             if kind == 'bool':
@@ -153,6 +203,14 @@ def serialize_gui_daemon_options(options):
             else:
                 assert False, kind
 
+            if not validator(value):
+                message = f"Ignoring invalid GUI property:\n{name}={value}"
+                log.error(message)
+                if not sys.stdout.isatty():
+                    subprocess.run(['notify-send', '-a', 'Qubes GUI Daemon', \
+                        '--icon', 'dialog-warning', message], check=False)
+                continue
+
             lines.append('  {} = {};'.format(name, serialized))
     lines.append('}')
     lines.append('')

rpm_spec/qubes-core-admin-client.spec.in

@@ -42,6 +42,7 @@ Requires:   python%{python3_pkgversion}-qubesdb
 Requires:   python%{python3_pkgversion}-rpm
 Requires:   python%{python3_pkgversion}-tqdm
 Requires:   python%{python3_pkgversion}-pyxdg
+Requires:   python%{python3_pkgversion}-xlib
 Conflicts:  qubes-core-dom0 < 4.3.0
 Conflicts:  qubes-manager < 4.0.6