Fix exceptions mapped by map_exception_to_dbus_error not translating from Python to D-Bus

igo95862 · igo95862 · commit 01eb5d2ff454 · 2025-03-26T18:38:53.000Z
This fixes the Python built-in exceptions not being translated
when raised by sdbus server.

Also the mapped exceptions will have their first argument added
to the error message as string.
diff --git a/src/sdbus/dbus_proxy_async_method.py b/src/sdbus/dbus_proxy_async_method.py
@@ -33,7 +33,7 @@
     DbusRemoteObjectMeta,
 )
 from .dbus_exceptions import DbusFailedError
-from .sd_bus_internals import DbusNoReplyFlag
+from .sd_bus_internals import EXCEPTION_TO_DBUS_ERROR, DbusNoReplyFlag
 
 if TYPE_CHECKING:
     from collections.abc import Callable, Sequence
@@ -193,23 +193,20 @@ async def _dbus_reply_call(
                 request_message,
                 local_object,
             )
-        except DbusFailedError as e:
+        except Exception as e:
             if not request_message.expect_reply:
                 return
 
+            dbus_error = EXCEPTION_TO_DBUS_ERROR.get(type(e))
+            if dbus_error is None:
+                dbus_error = DbusFailedError.dbus_error_name
+
             error_message = request_message.create_error_reply(
-                e.dbus_error_name,
+                dbus_error,
                 str(e.args[0]) if e.args else "",
             )
             error_message.send()
             return
-        except Exception:
-            error_message = request_message.create_error_reply(
-                DbusFailedError.dbus_error_name,
-                "",
-            )
-            error_message.send()
-            return
 
         if not request_message.expect_reply:
             return
diff --git a/src/sdbus/sd_bus_internals.py b/src/sdbus/sd_bus_internals.py
@@ -304,9 +304,9 @@ class SdBusRequestNameAlreadyOwnerError(SdBusRequestNameError):
     ...
 
 
-DBUS_ERROR_TO_EXCEPTION: dict[str, Exception] = {}
+DBUS_ERROR_TO_EXCEPTION: dict[str, type[Exception]] = {}
 
-EXCEPTION_TO_DBUS_ERROR: dict[Exception, str] = {}
+EXCEPTION_TO_DBUS_ERROR: dict[type[Exception], str] = {}
 
 DbusDeprecatedFlag: int = 0
 DbusHiddenFlag: int = 0
diff --git a/src/sdbus/sd_bus_internals_funcs.c b/src/sdbus/sd_bus_internals_funcs.c
@@ -144,7 +144,7 @@ static PyObject* map_exception_to_dbus_error(PyObject* Py_UNUSED(self), PyObject
 
 #endif
         if (CALL_PYTHON_INT_CHECK(PyDict_Contains(dbus_error_to_exception_dict, dbus_error_string)) > 0) {
-                PyErr_Format(PyExc_ValueError, "Dbus error %R is already mapped.", dbus_error_string);
+                PyErr_Format(PyExc_ValueError, "D-Bus error %R is already mapped.", dbus_error_string);
                 return NULL;
         }
 
@@ -166,7 +166,7 @@ static PyObject* add_exception_mapping(PyObject* Py_UNUSED(self), PyObject* args
         PyObject* dbus_error_string CLEANUP_PY_OBJECT = CALL_PYTHON_AND_CHECK(PyObject_GetAttrString(exception, "dbus_error_name"));
 
         if (CALL_PYTHON_INT_CHECK(PyDict_Contains(dbus_error_to_exception_dict, dbus_error_string)) > 0) {
-                PyErr_Format(PyExc_ValueError, "Dbus error %R is already mapped.", dbus_error_string);
+                PyErr_Format(PyExc_ValueError, "D-Bus error %R is already mapped.", dbus_error_string);
                 return NULL;
         }
 
diff --git a/test/test_sdbus_async.py b/test/test_sdbus_async.py
@@ -196,6 +196,10 @@ async def raise_and_unmap_error(self) -> None:
 
         raise DbusErrorUnmappedLater('Should be unmapped')
 
+    @dbus_method_async()
+    async def raise_python_exc(self) -> None:
+        raise ValueError("Test!")
+
     @dbus_method_async('s', flags=DbusNoReplyFlag)
     async def no_reply_method(self, new_value: str) -> None:
         self.no_reply_sync.set()
@@ -1004,3 +1008,12 @@ async def test() -> None:
 
         with self.assertRaisesRegex(RuntimeError, "different loop"):
             asyncio_run(test())
+
+    async def test_python_exc(self) -> None:
+        test_object, test_object_connection = initialize_object()
+
+        with self.assertRaisesRegex(ValueError, "Test!"):
+            await test_object.raise_python_exc()
+
+        with self.assertRaisesRegex(ValueError, "Test!"):
+            await test_object_connection.raise_python_exc()

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ static PyObject* map_exception_to_dbus_error(PyObject* Py_UNUSED(self), PyObject`
`144`	`144`
`145`	`145`	`#endif`
`146`	`146`	`if (CALL_PYTHON_INT_CHECK(PyDict_Contains(dbus_error_to_exception_dict, dbus_error_string)) > 0) {`
`147`		`- PyErr_Format(PyExc_ValueError, "Dbus error %R is already mapped.", dbus_error_string);`
	`147`	`+ PyErr_Format(PyExc_ValueError, "D-Bus error %R is already mapped.", dbus_error_string);`
`148`	`148`	`return NULL;`
`149`	`149`	`}`
`150`	`150`
`@@ -166,7 +166,7 @@ static PyObject* add_exception_mapping(PyObject* Py_UNUSED(self), PyObject* args`
`166`	`166`	`PyObject* dbus_error_string CLEANUP_PY_OBJECT = CALL_PYTHON_AND_CHECK(PyObject_GetAttrString(exception, "dbus_error_name"));`
`167`	`167`
`168`	`168`	`if (CALL_PYTHON_INT_CHECK(PyDict_Contains(dbus_error_to_exception_dict, dbus_error_string)) > 0) {`
`169`		`- PyErr_Format(PyExc_ValueError, "Dbus error %R is already mapped.", dbus_error_string);`
	`169`	`+ PyErr_Format(PyExc_ValueError, "D-Bus error %R is already mapped.", dbus_error_string);`
`170`	`170`	`return NULL;`
`171`	`171`	`}`
`172`	`172`