api/admin: report unexpected driver options in admin.pool.Add

Fixes QubesOS/qubes-issues#5895
QubesOS · Jun 22, 2020 · 8f1d59e · 8f1d59e
1 parent c4739b7
commit 8f1d59e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/qubes/api/admin.py b/qubes/api/admin.py
@@ -694,8 +694,11 @@ def pool_add(self, untrusted_payload):
         self.enforce(pool_name not in self.app.pools)
 
         driver_parameters = qubes.storage.driver_parameters(self.arg)
-        self.enforce(
-            all(key in driver_parameters for key in untrusted_pool_config))
+        unexpected_parameters = [key for key in untrusted_pool_config
+                                 if key not in driver_parameters]
+        if unexpected_parameters:
+            raise qubes.exc.QubesException(
+                'unexpected driver options: ' + ' '.join(unexpected_parameters))
         pool_config = untrusted_pool_config
 
         self.fire_event_for_permission(name=pool_name,

diff --git a/qubes/tests/api_admin.py b/qubes/tests/api_admin.py
@@ -768,7 +768,7 @@ def test_160_pool_add_invalid_param(self, mock_parameters, mock_drivers):
 
         add_pool_mock, self.app.add_pool = self.coroutine_mock()
 
-        with self.assertRaises(qubes.api.PermissionDenied):
+        with self.assertRaises(qubes.exc.QubesException):
             self.call_mgmt_func(b'admin.pool.Add', b'dom0',
                 b'driver1', b'name=test-pool\nparam3=some-value\n')
         self.assertEqual(mock_drivers.mock_calls, [unittest.mock.call()])