Commit595822a2Recorded4 Nov 2026Repositorysigil-dbus

Expose incoming method messages to opt-in handlers

Changed
 README.md                  |  5 +++++
 src/sigil/dbus/service.sgl |  9 ++++++---
 test/test-integration.sgl  | 11 +++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)
Diff
README.mdmodified
@@ -177,6 +177,11 @@ and [standard interfaces](https://dbus.freedesktop.org/doc/dbus-specification.ht
177
178
## Tests
179
+180
`dbus-method` accepts `with-message: #t` to prepend the incoming D-Bus message
+181
to the handler's arguments. Use its bus-assigned sender (header field 7) and
+182
object path (field 1) when authorizing an agent request. Validate the sender
+183
against the current unique service owner, rather than a well-known name.
+184
185
Method handlers with output signature `s` may return
186
`(dbus-sensitive-reply bytes)` instead of the usual argument list. This
187
transfers ownership of a UTF-8 bytevector immediately. Do not retain a second
src/sigil/dbus/service.sglmodified
@@ -8,12 +8,12 @@
8
(define introspect-interface "org.freedesktop.DBus.Introspectable")
9
(define peer-interface "org.freedesktop.DBus.Peer")
10
−11
(define (dbus-method name input output handler)
+11
(define (dbus-method name input output handler (keys: (with-message #f)))
12
(unless (and (dbus-member-name? name) (procedure? handler))
13
(error "Invalid D-Bus method descriptor"))
14
(dbus-parse-signature input)
15
(dbus-parse-signature output)
−16
(vector name input output handler))
+16
(vector name input output handler with-message))
17
18
(define (dbus-property name signature getter (keys: (setter #f)))
19
(unless (and (dbus-member-name? name)
@@ -213,7 +213,10 @@
213
(method (or (find-named member (vector-ref interface 1))
214
(failure "UnknownMethod" "No such method"))))
215
(expect-signature call (vector-ref method 1))
−216
(let ((result (apply (vector-ref method 3) (dbus-message-body call))))
+216
(let ((result (apply (vector-ref method 3)
+217
(if (vector-ref method 4)
+218
(cons call (dbus-message-body call))
+219
(dbus-message-body call)))))
220
(when (dbus-error? result) (raise result))
221
(when (dbus-sensitive-reply? result)
222
(dbus-validate-sensitive-reply! result (vector-ref method 2)))
test/test-integration.sglmodified
@@ -34,6 +34,12 @@
34
(dbus-method "Sensitive" "" "s" (lambda () (sensitive (bytevector 97 98 99))))
35
(dbus-method "SensitiveInvalid" "" "s" (lambda () (sensitive (bytevector 97 0 98))))
36
(dbus-method "SensitiveWrongSignature" "" "u" (lambda () (sensitive (bytevector 97))))
+37
(dbus-method "Caller" "s" "ss"
+38
(lambda (message expected-path)
+39
(if (string=? expected-path (dbus-message-field message 1))
+40
(list (dbus-message-field message 7) expected-path)
+41
(dbus-error "org.example.Error.Denied" "Unexpected path")))
+42
with-message: #t)
43
(dbus-method "Slow" "u" "u" (lambda (delay) (sleep (/ delay 1000)) (list delay))))
44
properties:
45
(list (dbus-property "Counter" "u" (lambda () counter)
@@ -90,6 +96,11 @@
96
(test "sensitive string reply clears its owned input"
97
(assert-equal '("abc") (dbus-call client service-name path iface "Sensitive" "" '()))
98
(assert-equal (bytevector 0 0 0) sensitive-input))
+99
(test "opt-in handler receives authenticated sender and object path"
+100
(assert-equal (list (dbus-unique-name client) path)
+101
(dbus-call client service-name path iface "Caller" "s" (list path)))
+102
(assert-equal "org.example.Error.Denied"
+103
(dbus-error-name (dbus-call client service-name path iface "Caller" "s" '("/wrong")))))
104
(test "invalid sensitive output fails without closing the connection"
105
(assert-equal "org.freedesktop.DBus.Error.Failed"
106
(dbus-error-name (dbus-call client service-name path iface "SensitiveInvalid" "" '())))