q-dev: add device_identity to device assignment

Author: piotrbartman

qubes/device_protocol.py

@@ -822,7 +822,7 @@ class DeviceAssignment(Port):
     def __init__(
             self,
             port: Port,
-            device_id=None,
+            device_identity=None,
             frontend_domain=None,
             options=None,
             mode: Union[str, AssignmentMode] = "manual",
@@ -834,25 +834,38 @@ def __init__(
         else:
             self.mode = AssignmentMode(mode)
         self.frontend_domain = frontend_domain
+        if device_identity == 'any':
+            device_identity = None
+        self.device_identity = device_identity
 
     def clone(self, **kwargs):
         """
         Clone object and substitute attributes with explicitly given.
         """
+        port = kwargs.get(
+            "port", Port(self.backend_domain, self.ident, self.devclass))
         attr = {
             "options": self.options,
-            "required": self.required,
-            "attach_automatically": self.attach_automatically,
+            "mode": self.mode,
+            "device_identity": self.device_identity,
             "frontend_domain": self.frontend_domain,
         }
         attr.update(kwargs)
-        return self.__class__(
-            Port(self.backend_domain, self.ident, self.devclass), **attr)
+        return self.__class__(port, **attr)
 
     @property
     def device(self) -> DeviceInfo:
         """Get DeviceInfo object corresponding to this DeviceAssignment"""
-        return self.backend_domain.devices[self.devclass][self.ident]
+        dev = self.backend_domain.devices[self.devclass][self.ident]
+        if (self.device_identity is not None
+                and self.device_identity != dev.self_identity):
+            # raise ProtocolError(
+            #     "Device identity does not match, expected "
+            #     f"'{self.device_identity}' got '{dev.self_identity}'")
+            # TODO
+            return UnknownDevice(
+                self.backend_domain, self.ident, devclass=self.devclass)
+        return dev
 
     @property
     def frontend_domain(self) -> Optional[QubesVM]:
@@ -923,6 +936,7 @@ def serialize(self) -> bytes:
             self.pack_property(key, value)
             for key, value in (
                 ('mode', self.mode.value),
+                ('device_identity', self.device_identity),
                 ('ident', self.ident),
                 ('devclass', self.devclass)))
 

qubes/ext/block.py

@@ -498,19 +498,19 @@ def pre_attachment_internal(
                     raise qubes.exc.QubesValueError(
                         'devtype option can only have '
                         '\'disk\' or \'cdrom\' value')
-            elif option == 'identity':
-                identity = value
-                if identity not in ('any', device.self_identity):
-                    print("Unrecognized identity, skipping attachment of"
-                          f" {device}", file=sys.stderr)
-                    raise qubes.devices.UnrecognizedDevice(
-                        f"Device presented identity {device.self_identity} "
-                        f"does not match expected {identity}"
-                    )
             else:
                 raise qubes.exc.QubesValueError(
                     'Unsupported option {}'.format(option))
 
+        # identity = value  # TODO!
+        # if identity not in ('any', device.self_identity):
+        #     print("Unrecognized identity, skipping attachment of"
+        #           f" {device}", file=sys.stderr)
+        #     raise qubes.devices.UnrecognizedDevice(
+        #         f"Device presented identity {device.self_identity} "
+        #         f"does not match expected {identity}"
+        #     )
+
         if 'read-only' not in options:
             options['read-only'] = 'yes' if device.mode == 'r' else 'no'
         if options.get('read-only', 'no') == 'no' and device.mode == 'r':

qubes/vm/__init__.py

@@ -305,14 +305,19 @@ def load_extras(self):
                         else:
                             mode = (qubes.device_protocol.
                                     AssignmentMode.AUTO)
-
+                    if 'identity' in options:
+                        identity = options.get('identity')
+                        del options['identity']
+                    else:
+                        identity = node.get('identity', 'any')
                     device_assignment = qubes.device_protocol.DeviceAssignment(
                         qubes.device_protocol.Port(
                             backend_domain=self.app.domains[
                                 node.get('backend-domain')],
                             ident=node.get('id'),
                             devclass=devclass,
                         ),
+                        device_identity=identity,
                         options=options,
                         mode=mode,
                     )
@@ -373,6 +378,8 @@ def __xml__(self):
                 node.set('backend-domain', assignment.backend_domain.name)
                 node.set('id', assignment.ident)
                 node.set('mode', assignment.mode.value)
+                identity = assignment.device_identity or 'any'
+                node.set('identity', identity)
                 for key, val in assignment.options.items():
                     option_node = lxml.etree.Element('option')
                     option_node.set('name', key)