Forward Qubes property set events

qubesdbus/domain.py

@@ -41,14 +41,6 @@ def __init__(self, bus, bus_name, bus_path, data):
         super(Domain, self).__init__(name, data, bus=bus, bus_name=bus_name,
                                      bus_path=bus_path)
 
-    @dbus.service.method(dbus_interface="org.freedesktop.DBus.Properties")
-    def GetAll(self, _):
-        # According to the dbus spec we should be able to return types not only
-        # string, but it doesn't work. We need to serialize everything to string
-        # ☹
-        return dbus.Dictionary({k: dbus.String(v)
-                                for k, v in self.properties.items()})
-
     @dbus.service.signal(
         dbus_interface="org.qubes.DomainManager1.domains.Signals",
         signature='s')

qubesdbus/domain_manager.py

@@ -55,9 +55,9 @@ def GetManagedObjects(self):
         ''' Returns the domain objects paths and their supported interfaces and
             properties.
         '''
-        return {"%s/domains/%s" % (self.bus_path, d.qid):
+        return {"%s/domains/%s" % (self.bus_path, d.properties['qid']):
                 # pylint: disable=protected-access
-                "%s.domains.%s" % (self.bus_name._name, d.qid)
+                "%s.domains.%s" % (self.bus_name._name, d.properties['qid'])
                 for d in self.domains}
 
     def _proxify_domain(self, vm):

qubesdbus/labels.py

@@ -60,13 +60,6 @@ def __init__(self, bus, bus_name, bus_path, data):
         super(Label, self).__init__(name, data, bus=bus, bus_name=bus_name,
                                     bus_path=bus_path)
 
-    @dbus.service.method(dbus_interface="org.freedesktop.DBus.Properties")
-    def GetAll(self, _):
-        # According to the dbus spec we should be able to return types not only
-        # string, but it doesn't work. We need to serialize everything to string ☹
-        return dbus.Dictionary({k: dbus.String(v)
-                                for k, v in self.properties.items()})
-
 
 def main(args=None):
     ''' Main function '''  # pylint: disable=unused-argument

qubesdbus/proxy.py

@@ -80,7 +80,15 @@ def forward_vm_event(self, vm, event, *args, **kwargs):
 
     @handler('*', system=True)
     def forward_app_event(self, vm, event, *args, **kwargs):
-        log.debug('A: %s %s %s %s', vm, event, args, kwargs)
+        if is_garbage(event):
+            log.debug('Drop %s from %s', event, vm)
+            return
+        elif event.startswith('property-set:'):
+            proxy = app_proxy()
+            property_set(proxy, args[0], str(args[1]))
+            log.info('App: %s %s %s %s', vm, event, args, kwargs)
+        else:
+            log.warn('Unknown %s from %s', event, vm)
 
 
 def property_set(proxy, name, value):

qubesdbus/service.py

@@ -83,6 +83,14 @@ def __init__(self, name, data, *args, **kwargs):
     def Get(self, _, property_name):
         return self.properties[property_name]
 
+    @dbus.service.method(dbus_interface="org.freedesktop.DBus.Properties")
+    def GetAll(self, _):
+        # According to the dbus spec we should be able to return types not only
+        # string, but it doesn't work. We need to serialize everything to string
+        # ☹
+        return dbus.Dictionary({k: dbus.String(v)
+                                for k, v in self.properties.items()})
+
     @dbus.service.method(dbus_interface="org.freedesktop.DBus.Properties")
     def Set(self, _, name, value):  # type: (str, dbus.String, Any) -> None
         new_value = value