chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: when introspecting, turn unprivileged flag into inverse annoation of "privileged"
[elogind.git]
/
src
/
libsystemd-bus
/
bus-introspect.c
diff --git
a/src/libsystemd-bus/bus-introspect.c
b/src/libsystemd-bus/bus-introspect.c
index 1965364cd0ae26a62350922c532724c2ed7fe433..4d5c25a23fdc34bddb5b230902140728bba6f5ac 100644
(file)
--- a/
src/libsystemd-bus/bus-introspect.c
+++ b/
src/libsystemd-bus/bus-introspect.c
@@
-24,17
+24,19
@@
#include "bus-introspect.h"
#include "bus-signature.h"
#include "bus-internal.h"
#include "bus-introspect.h"
#include "bus-signature.h"
#include "bus-internal.h"
+#include "bus-protocol.h"
-int introspect_begin(struct introspect *i) {
+int introspect_begin(struct introspect *i
, bool trusted
) {
assert(i);
zero(*i);
assert(i);
zero(*i);
+ i->trusted = trusted;
i->f = open_memstream(&i->introspection, &i->size);
if (!i->f)
return -ENOMEM;
i->f = open_memstream(&i->introspection, &i->size);
if (!i->f)
return -ENOMEM;
- fputs(
SD_
BUS_INTROSPECT_DOCTYPE
+ fputs(BUS_INTROSPECT_DOCTYPE
"<node>\n", i->f);
return 0;
"<node>\n", i->f);
return 0;
@@
-43,12
+45,12
@@
int introspect_begin(struct introspect *i) {
int introspect_write_default_interfaces(struct introspect *i, bool object_manager) {
assert(i);
int introspect_write_default_interfaces(struct introspect *i, bool object_manager) {
assert(i);
- fputs(
SD_
BUS_INTROSPECT_INTERFACE_PEER
-
SD_
BUS_INTROSPECT_INTERFACE_INTROSPECTABLE
-
SD_
BUS_INTROSPECT_INTERFACE_PROPERTIES, i->f);
+ fputs(BUS_INTROSPECT_INTERFACE_PEER
+ BUS_INTROSPECT_INTERFACE_INTROSPECTABLE
+ BUS_INTROSPECT_INTERFACE_PROPERTIES, i->f);
if (object_manager)
if (object_manager)
- fputs(
SD_
BUS_INTROSPECT_INTERFACE_OBJECT_MANAGER, i->f);
+ fputs(BUS_INTROSPECT_INTERFACE_OBJECT_MANAGER, i->f);
return 0;
}
return 0;
}
@@
-76,7
+78,7
@@
static void introspect_write_flags(struct introspect *i, int type, int flags) {
if (flags & SD_BUS_VTABLE_DEPRECATED)
fputs(" <annotation name=\"org.freedesktop.DBus.Deprecated\" value=\"true\"/>\n", i->f);
if (flags & SD_BUS_VTABLE_DEPRECATED)
fputs(" <annotation name=\"org.freedesktop.DBus.Deprecated\" value=\"true\"/>\n", i->f);
- if (type == _SD_BUS_VTABLE_METHOD &&
flags & SD_BUS_VTABLE_METHOD_NO_REPLY
)
+ if (type == _SD_BUS_VTABLE_METHOD &&
(flags & SD_BUS_VTABLE_METHOD_NO_REPLY)
)
fputs(" <annotation name=\"org.freedesktop.DBus.Method.NoReply\" value=\"true\"/>\n", i->f);
if (type == _SD_BUS_VTABLE_PROPERTY || type == _SD_BUS_VTABLE_WRITABLE_PROPERTY) {
fputs(" <annotation name=\"org.freedesktop.DBus.Method.NoReply\" value=\"true\"/>\n", i->f);
if (type == _SD_BUS_VTABLE_PROPERTY || type == _SD_BUS_VTABLE_WRITABLE_PROPERTY) {
@@
-85,6
+87,11
@@
static void introspect_write_flags(struct introspect *i, int type, int flags) {
else if (flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY)
fputs(" <annotation name=\"org.freedesktop.DBus.Property.EmitsChangedSignal\" value=\"invalidates\"/>\n", i->f);
}
else if (flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY)
fputs(" <annotation name=\"org.freedesktop.DBus.Property.EmitsChangedSignal\" value=\"invalidates\"/>\n", i->f);
}
+
+ if (!i->trusted &&
+ (type == _SD_BUS_VTABLE_METHOD || type == _SD_BUS_VTABLE_WRITABLE_PROPERTY) &&
+ !(flags & SD_BUS_VTABLE_UNPRIVILEGED))
+ fputs(" <annotation name=\"org.freedesktop.systemd1.Privileged\" value=\"true\"/>\n", i->f);
}
static int introspect_write_arguments(struct introspect *i, const char *signature, const char *direction) {
}
static int introspect_write_arguments(struct introspect *i, const char *signature, const char *direction) {
@@
-117,6
+124,13
@@
int introspect_write_interface(struct introspect *i, const sd_bus_vtable *v) {
for (; v->type != _SD_BUS_VTABLE_END; v++) {
for (; v->type != _SD_BUS_VTABLE_END; v++) {
+ /* Ignore methods, signals and properties that are
+ * marked "hidden", but do show the interface
+ * itself */
+
+ if (v->type != _SD_BUS_VTABLE_START && (v->flags & SD_BUS_VTABLE_HIDDEN))
+ continue;
+
switch (v->type) {
case _SD_BUS_VTABLE_START:
switch (v->type) {
case _SD_BUS_VTABLE_START: