X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-dbus.c;h=7b6134fa4b9420f4aad3026f1a44144c80ec3a45;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=179f8954d3ce81b41030bbece4361ea05edfa80e;hpb=44f21bd2a3b50f92669223cdafe79993654c1e19;p=src%2Fapp-framework-binder.git diff --git a/src/afb-api-dbus.c b/src/afb-api-dbus.c index 179f8954..7b6134fa 100644 --- a/src/afb-api-dbus.c +++ b/src/afb-api-dbus.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015, 2016, 2017 "IoT.bzh" + * Copyright (C) 2015-2020 "IoT.bzh" * Author José Bollo * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,35 +15,43 @@ * limitations under the License. */ +#if WITH_DBUS_TRANSPARENCY + #define _GNU_SOURCE -#define NO_PLUGIN_VERBOSE_MACRO #include +#include #include #include #include #include #include +#if !defined(JSON_C_TO_STRING_NOSLASHESCAPE) +#define JSON_C_TO_STRING_NOSLASHESCAPE 0 +#endif -#include - -#include "afb-common.h" +#include #include "afb-session.h" #include "afb-msg-json.h" -#include "afb-apis.h" -#include "afb-api-so.h" +#include "afb-api.h" +#include "afb-apiset.h" +#include "afb-api-dbus.h" #include "afb-context.h" +#include "afb-cred.h" #include "afb-evt.h" -#include "afb-subcall.h" +#include "afb-xreq.h" + #include "verbose.h" +#include "systemd.h" +#include "jobs.h" static const char DEFAULT_PATH_PREFIX[] = "/org/agl/afb/api/"; struct dbus_memo; struct dbus_event; -struct destination; +struct origin; /* * The path given are of the form @@ -67,15 +75,12 @@ struct api_dbus struct { struct sd_bus_slot *slot_call; struct afb_evt_listener *listener; /* listener for broadcasted events */ - struct destination *destinations; + struct origin *origins; + struct afb_apiset *apiset; } server; }; }; -#define RETOK 1 -#define RETERR 2 -#define RETRAW 3 - /******************* common part **********************************/ /* @@ -110,7 +115,7 @@ static struct api_dbus *make_api_dbus_3(int system, const char *path, size_t pat goto error2; } api->api++; - if (!afb_apis_is_valid_api_name(api->api)) { + if (!afb_api_is_valid_name(api->api)) { errno = EINVAL; goto error2; } @@ -125,7 +130,8 @@ static struct api_dbus *make_api_dbus_3(int system, const char *path, size_t pat } /* choose the bus */ - sdbus = (system ? afb_common_get_system_bus : afb_common_get_user_bus)(); + jobs_acquire_event_manager(); + sdbus = (system ? systemd_get_system_bus : systemd_get_user_bus)(); if (sdbus == NULL) goto error2; @@ -216,29 +222,27 @@ static void destroy_api_dbus(struct api_dbus *api) struct dbus_memo { struct dbus_memo *next; /* the next memo */ struct api_dbus *api; /* the dbus api */ - struct afb_req req; /* the request handle */ - struct afb_context *context; /* the context of the query */ + struct afb_xreq *xreq; /* the request */ uint64_t msgid; /* the message identifier */ }; struct dbus_event { struct dbus_event *next; - struct afb_event event; + struct afb_event_x2 *event; int id; int refcount; }; /* allocates and init the memorizing data */ -static struct dbus_memo *api_dbus_client_memo_make(struct api_dbus *api, struct afb_req req, struct afb_context *context) +static struct dbus_memo *api_dbus_client_memo_make(struct api_dbus *api, struct afb_xreq *xreq) { struct dbus_memo *memo; memo = malloc(sizeof *memo); if (memo != NULL) { - afb_req_addref(req); - memo->req = req; - memo->context = context; + afb_xreq_unhooked_addref(xreq); + memo->xreq = xreq; memo->msgid = 0; memo->api = api; memo->next = api->client.memos; @@ -261,7 +265,7 @@ static void api_dbus_client_memo_destroy(struct dbus_memo *memo) prv = &(*prv)->next; } - afb_req_unref(memo->req); + afb_xreq_unhooked_unref(memo->xreq); free(memo); } @@ -282,66 +286,62 @@ static int api_dbus_client_on_reply(sd_bus_message *message, void *userdata, sd_ { int rc; struct dbus_memo *memo; - const char *first, *second; - uint8_t type; - uint32_t flags; + const char *json, *error, *info; + struct json_object *object; + enum json_tokener_error jerr; /* retrieve the recorded data */ memo = userdata; /* get the answer */ - rc = sd_bus_message_read(message, "yssu", &type, &first, &second, &flags); + rc = sd_bus_message_read(message, "sss", &json, &error, &info); if (rc < 0) { /* failing to have the answer */ - afb_req_fail(memo->req, "error", "dbus error"); + afb_xreq_reply(memo->xreq, NULL, "error", "dbus error"); } else { /* report the answer */ - memo->context->flags = (unsigned)flags; - switch(type) { - case RETOK: - afb_req_success(memo->req, json_tokener_parse(first), *second ? second : NULL); - break; - case RETERR: - afb_req_fail(memo->req, first, *second ? second : NULL); - break; - case RETRAW: - afb_req_send(memo->req, first, strlen(first)); - break; - default: - afb_req_fail(memo->req, "error", "dbus link broken"); - break; + if (!*json) + object = NULL; + else { + object = json_tokener_parse_verbose(json, &jerr); + if (jerr != json_tokener_success) + object = json_object_new_string(json); } + afb_xreq_reply(memo->xreq, object, *error ? error : NULL, *info ? info : NULL); } api_dbus_client_memo_destroy(memo); return 1; } /* on call, propagate it to the dbus service */ -static void api_dbus_client_call(void *closure, struct afb_req req, struct afb_context *context, const char *verb) +static void api_dbus_client_call(void *closure, struct afb_xreq *xreq) { struct api_dbus *api = closure; size_t size; int rc; struct dbus_memo *memo; struct sd_bus_message *msg; + const char *creds; /* create the recording data */ - memo = api_dbus_client_memo_make(api, req, context); + memo = api_dbus_client_memo_make(api, xreq); if (memo == NULL) { - afb_req_fail(req, "error", "out of memory"); + afb_xreq_reply(memo->xreq, NULL, "error", "out of memory"); return; } /* creates the message */ msg = NULL; - rc = sd_bus_message_new_method_call(api->sdbus, &msg, api->name, api->path, api->name, verb); + rc = sd_bus_message_new_method_call(api->sdbus, &msg, api->name, api->path, api->name, xreq->request.called_verb); if (rc < 0) goto error; - rc = sd_bus_message_append(msg, "ssu", - afb_req_raw(req, &size), - afb_session_uuid(context->session), - (uint32_t)context->flags); + creds = xreq_on_behalf_cred_export(xreq); + rc = sd_bus_message_append(msg, "ssus", + afb_xreq_raw(xreq, &size), + afb_session_uuid(xreq->context.session), + (uint32_t)xreq->context.flags, + creds ?: ""); if (rc < 0) goto error; @@ -357,53 +357,47 @@ static void api_dbus_client_call(void *closure, struct afb_req req, struct afb_c error: /* if there was an error report it directly */ errno = -rc; - afb_req_fail(req, "error", "dbus error"); + afb_xreq_reply(memo->xreq, NULL, "error", "dbus error"); api_dbus_client_memo_destroy(memo); end: sd_bus_message_unref(msg); } -static int api_dbus_service_start(void *closure, int share_session, int onneed) -{ - struct api_dbus *api = closure; - - /* not an error when onneed */ - if (onneed != 0) - return 0; - - /* already started: it is an error */ - ERROR("The Dbus binding %s is not a startable service", api->name); - return -1; -} - /* receives broadcasted events */ static int api_dbus_client_on_broadcast_event(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { struct json_object *object; const char *event, *data; - int rc = sd_bus_message_read(m, "ss", &event, &data); + const unsigned char *uuid; + size_t szuuid; + uint8_t hop; + enum json_tokener_error jerr; + + int rc = sd_bus_message_read(m, "ssayy", &event, &data, &uuid, &szuuid, &hop); if (rc < 0) ERROR("unreadable broadcasted event"); else { - object = json_tokener_parse(data); - afb_evt_broadcast(event, object); + object = json_tokener_parse_verbose(data, &jerr); + if (jerr != json_tokener_success) + object = json_object_new_string(data); + afb_evt_rebroadcast(event, object, uuid, hop); } return 1; } -/* search the event */ +/* search the eventid */ static struct dbus_event *api_dbus_client_event_search(struct api_dbus *api, int id, const char *name) { struct dbus_event *ev; ev = api->client.events; - while (ev != NULL && (ev->id != id || 0 != strcmp(afb_evt_event_name(ev->event), name))) + while (ev != NULL && (ev->id != id || 0 != strcmp(afb_evt_event_x2_fullname(ev->event), name))) ev = ev->next; return ev; } -/* adds an event */ +/* adds an eventid */ static void api_dbus_client_event_create(struct api_dbus *api, int id, const char *name) { struct dbus_event *ev; @@ -418,8 +412,8 @@ static void api_dbus_client_event_create(struct api_dbus *api, int id, const cha /* no conflict, try to add it */ ev = malloc(sizeof *ev); if (ev != NULL) { - ev->event = afb_evt_create_event(name); - if (ev->event.closure == NULL) + ev->event = afb_evt_event_x2_create(name); + if (ev->event == NULL) free(ev); else { ev->refcount = 1; @@ -432,7 +426,7 @@ static void api_dbus_client_event_create(struct api_dbus *api, int id, const cha ERROR("can't create event %s, out of memory", name); } -/* removes an event */ +/* removes an eventid */ static void api_dbus_client_event_drop(struct api_dbus *api, int id, const char *name) { struct dbus_event *ev, **prv; @@ -455,7 +449,7 @@ static void api_dbus_client_event_drop(struct api_dbus *api, int id, const char *prv = ev->next; /* destroys the event */ - afb_event_drop(ev->event); + afb_evt_event_x2_unref(ev->event); free(ev); } @@ -464,6 +458,7 @@ static void api_dbus_client_event_push(struct api_dbus *api, int id, const char { struct json_object *object; struct dbus_event *ev; + enum json_tokener_error jerr; /* retrieves the event */ ev = api_dbus_client_event_search(api, id, name); @@ -473,8 +468,10 @@ static void api_dbus_client_event_push(struct api_dbus *api, int id, const char } /* destroys the event */ - object = json_tokener_parse(data); - afb_event_push(ev->event, object); + object = json_tokener_parse_verbose(data, &jerr); + if (jerr != json_tokener_success) + object = json_object_new_string(data); + afb_evt_event_x2_push(ev->event, object); } /* subscribes an event */ @@ -499,7 +496,7 @@ static void api_dbus_client_event_subscribe(struct api_dbus *api, int id, const } /* subscribe the request to the event */ - rc = afb_req_subscribe(memo->req, ev->event); + rc = afb_xreq_subscribe(memo->xreq, ev->event); if (rc < 0) ERROR("can't subscribe: %m"); } @@ -526,7 +523,7 @@ static void api_dbus_client_event_unsubscribe(struct api_dbus *api, int id, cons } /* unsubscribe the request from the event */ - rc = afb_req_unsubscribe(memo->req, ev->event); + rc = afb_xreq_unsubscribe(memo->xreq, ev->event); if (rc < 0) ERROR("can't unsubscribe: %m"); } @@ -582,12 +579,16 @@ static int api_dbus_client_on_manage_event(sd_bus_message *m, void *userdata, sd return 1; } +static struct afb_api_itf dbus_api_itf = { + .call = api_dbus_client_call +}; + /* adds a afb-dbus-service client api */ -int afb_api_dbus_add_client(const char *path) +int afb_api_dbus_add_client(const char *path, struct afb_apiset *declare_set, struct afb_apiset *call_set) { int rc; struct api_dbus *api; - struct afb_api afb_api; + struct afb_api_item afb_api; char *match; /* create the dbus client api */ @@ -620,9 +621,9 @@ int afb_api_dbus_add_client(const char *path) /* record it as an API */ afb_api.closure = api; - afb_api.call = api_dbus_client_call; - afb_api.service_start = api_dbus_service_start; - if (afb_apis_add(api->api, afb_api) < 0) + afb_api.itf = &dbus_api_itf; + afb_api.group = NULL; + if (afb_apiset_add(declare_set, api->api, afb_api) < 0) goto error2; return 0; @@ -635,10 +636,10 @@ error: /******************* event structures for server part **********************************/ -static void afb_api_dbus_server_event_add(void *closure, const char *event, int eventid); -static void afb_api_dbus_server_event_remove(void *closure, const char *event, int eventid); -static void afb_api_dbus_server_event_push(void *closure, const char *event, int eventid, struct json_object *object); -static void afb_api_dbus_server_event_broadcast(void *closure, const char *event, int eventid, struct json_object *object); +static void afb_api_dbus_server_event_add(void *closure, const char *event, uint16_t eventid); +static void afb_api_dbus_server_event_remove(void *closure, const char *event, uint16_t eventid); +static void afb_api_dbus_server_event_push(void *closure, const char *event, uint16_t eventid, struct json_object *object); +static void afb_api_dbus_server_event_broadcast(void *closure, const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop); /* the interface for events broadcasting */ static const struct afb_evt_itf evt_broadcast_itf = { @@ -652,12 +653,12 @@ static const struct afb_evt_itf evt_push_itf = { .remove = afb_api_dbus_server_event_remove }; -/******************* destination description part for server *****************************/ +/******************* origin description part for server *****************************/ -struct destination +struct origin { - /* link to next different destination */ - struct destination *next; + /* link to next different origin */ + struct origin *next; /* the server dbus-api */ struct api_dbus *api; @@ -665,55 +666,88 @@ struct destination /* count of references */ int refcount; - /* the destination */ - char name[1]; + /* credentials of the origin */ + struct afb_cred *cred; + + /* the origin */ + char name[]; }; -static struct destination *afb_api_dbus_server_destination_get(struct api_dbus *api, const char *sender) +/* get the credentials for the message */ +static void init_origin_creds(struct origin *origin) +{ + int rc; + sd_bus_creds *c; + uid_t uid; + gid_t gid; + pid_t pid; + const char *context; + struct afb_cred *ocred; + + rc = sd_bus_get_name_creds(origin->api->sdbus, origin->name, + SD_BUS_CREDS_PID|SD_BUS_CREDS_UID|SD_BUS_CREDS_GID|SD_BUS_CREDS_SELINUX_CONTEXT, + &c); + if (rc < 0) + origin->cred = NULL; + else { + sd_bus_creds_get_uid(c, &uid); + sd_bus_creds_get_gid(c, &gid); + sd_bus_creds_get_pid(c, &pid); + sd_bus_creds_get_selinux_context(c, &context); + ocred = origin->cred; + origin->cred = afb_cred_create(uid, gid, pid, context); + sd_bus_creds_unref(c); + afb_cred_unref(ocred); + } +} + +static struct origin *afb_api_dbus_server_origin_get(struct api_dbus *api, const char *sender) { - struct destination *destination; - - /* searchs for an existing destination */ - destination = api->server.destinations; - while (destination != NULL) { - if (0 == strcmp(destination->name, sender)) { - destination->refcount++; - return destination; + struct origin *origin; + + /* searchs for an existing origin */ + origin = api->server.origins; + while (origin != NULL) { + if (0 == strcmp(origin->name, sender)) { + origin->refcount++; + return origin; } - destination = destination->next; + origin = origin->next; } /* not found, create it */ - destination = malloc(strlen(sender) + sizeof *destination); - if (destination == NULL) + origin = malloc(strlen(sender) + 1 + sizeof *origin); + if (origin == NULL) errno = ENOMEM; else { - destination->api = api; - destination->refcount = 1; - strcpy(destination->name, sender); - destination->next = api->server.destinations; - api->server.destinations = destination; + origin->api = api; + origin->refcount = 1; + strcpy(origin->name, sender); + init_origin_creds(origin); + origin->next = api->server.origins; + api->server.origins = origin; } - return destination; + return origin; } -static void afb_api_dbus_server_destination_unref(struct destination *destination) +static void afb_api_dbus_server_origin_unref(struct origin *origin) { - if (!--destination->refcount) { - struct destination **prv; + if (!--origin->refcount) { + struct origin **prv; - prv = &destination->api->server.destinations; - while(*prv != destination) + prv = &origin->api->server.origins; + while(*prv != origin) prv = &(*prv)->next; - *prv = destination->next; - free(destination); + *prv = origin->next; + afb_cred_unref(origin->cred); + free(origin); } } struct listener { - /* link to next different destination */ - struct destination *destination; + /* link to next different origin */ + struct origin *origin; /* the listener of events */ struct afb_evt_listener *listener; @@ -722,26 +756,26 @@ struct listener static void afb_api_dbus_server_listener_free(struct listener *listener) { afb_evt_listener_unref(listener->listener); - afb_api_dbus_server_destination_unref(listener->destination); + afb_api_dbus_server_origin_unref(listener->origin); free(listener); } -static struct listener *afb_api_dbus_server_listerner_get(struct api_dbus *api, const char *sender, struct afb_session *session) +static struct listener *afb_api_dbus_server_listener_get(struct api_dbus *api, const char *sender, struct afb_session *session) { int rc; struct listener *listener; - struct destination *destination; + struct origin *origin; - /* get the destination */ - destination = afb_api_dbus_server_destination_get(api, sender); - if (destination == NULL) + /* get the origin */ + origin = afb_api_dbus_server_origin_get(api, sender); + if (origin == NULL) return NULL; /* retrieves the stored listener */ - listener = afb_session_get_cookie(session, destination); + listener = afb_session_get_cookie(session, origin); if (listener != NULL) { /* found */ - afb_api_dbus_server_destination_unref(destination); + afb_api_dbus_server_origin_unref(origin); return listener; } @@ -750,164 +784,111 @@ static struct listener *afb_api_dbus_server_listerner_get(struct api_dbus *api, if (listener == NULL) errno = ENOMEM; else { - listener->destination = destination; - listener->listener = afb_evt_listener_create(&evt_push_itf, destination); + listener->origin = origin; + listener->listener = afb_evt_listener_create(&evt_push_itf, origin); if (listener->listener != NULL) { - rc = afb_session_set_cookie(session, destination, listener, (void*)afb_api_dbus_server_listener_free); + rc = afb_session_set_cookie(session, origin, listener, (void*)afb_api_dbus_server_listener_free); if (rc == 0) return listener; afb_evt_listener_unref(listener->listener); } free(listener); } - afb_api_dbus_server_destination_unref(destination); + afb_api_dbus_server_origin_unref(origin); return NULL; } /******************* dbus request part for server *****************/ -/* - * structure for a dbus request +/** + * Structure for a dbus request */ struct dbus_req { - struct afb_context context; /* the context, should be THE FIRST */ - sd_bus_message *message; /* the incoming request message */ - const char *request; /* the readen request as string */ - struct json_object *json; /* the readen request as object */ - struct listener *listener; /* the listener for events */ - int refcount; /* reference count of the request */ + struct afb_xreq xreq; /**< the xreq of the request */ + sd_bus_message *message; /**< the incoming request message */ + const char *request; /**< the readen request as string */ + struct json_object *json; /**< the readen request as object */ + struct listener *listener; /**< the listener for events */ }; -/* increment the reference count of the request */ -static void dbus_req_addref(struct dbus_req *dreq) -{ - dreq->refcount++; -} - /* decrement the reference count of the request and free/release it on falling to null */ -static void dbus_req_unref(struct dbus_req *dreq) +static void dbus_req_destroy(struct afb_xreq *xreq) { - if (dreq == NULL || --dreq->refcount) - return; + struct dbus_req *dreq = CONTAINER_OF_XREQ(struct dbus_req, xreq); - afb_context_disconnect(&dreq->context); + afb_context_disconnect(&dreq->xreq.context); json_object_put(dreq->json); sd_bus_message_unref(dreq->message); free(dreq); } /* get the object of the request */ -static struct json_object *dbus_req_json(struct dbus_req *dreq) +static struct json_object *dbus_req_json(struct afb_xreq *xreq) { - if (dreq->json == NULL) { - dreq->json = json_tokener_parse(dreq->request); - if (dreq->json == NULL && strcmp(dreq->request, "null")) { - /* lazy error detection of json request. Is it to improve? */ - dreq->json = json_object_new_string(dreq->request); - } - } - return dreq->json; -} + struct dbus_req *dreq = CONTAINER_OF_XREQ(struct dbus_req, xreq); -/* get the argument of the request of 'name' */ -static struct afb_arg dbus_req_get(struct dbus_req *dreq, const char *name) -{ - return afb_msg_json_get_arg(dbus_req_json(dreq), name); + return dreq->json; } -static void dbus_req_reply(struct dbus_req *dreq, uint8_t type, const char *first, const char *second) +void dbus_req_raw_reply(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info) { + struct dbus_req *dreq = CONTAINER_OF_XREQ(struct dbus_req, xreq); int rc; - rc = sd_bus_reply_method_return(dreq->message, - "yssu", type, first ? : "", second ? : "", (uint32_t)dreq->context.flags); + + rc = sd_bus_reply_method_return(dreq->message, "sss", + obj ? json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PLAIN|JSON_C_TO_STRING_NOSLASHESCAPE) : "", + error ? : "", + info ? : ""); if (rc < 0) ERROR("sending the reply failed"); } -static void dbus_req_success(struct dbus_req *dreq, struct json_object *obj, const char *info) -{ - dbus_req_reply(dreq, RETOK, json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PLAIN), info); -} +static void afb_api_dbus_server_event_send(struct origin *origin, char order, const char *event, int eventid, const char *data, uint64_t msgid); -static void dbus_req_fail(struct dbus_req *dreq, const char *status, const char *info) -{ - dbus_req_reply(dreq, RETERR, status, info); -} - -static const char *dbus_req_raw(struct dbus_req *dreq, size_t *size) -{ - if (size != NULL) - *size = strlen(dreq->request); - return dreq->request; -} - -static void dbus_req_send(struct dbus_req *dreq, const char *buffer, size_t size) -{ - /* TODO: how to put sized buffer as strings? things aren't clear here!!! */ - dbus_req_reply(dreq, RETRAW, buffer, ""); -} - -static void afb_api_dbus_server_event_send(struct destination *destination, char order, const char *event, int eventid, const char *data, uint64_t msgid); - -static int dbus_req_subscribe(struct dbus_req *dreq, struct afb_event event) +static int dbus_req_subscribe(struct afb_xreq *xreq, struct afb_event_x2 *event) { + struct dbus_req *dreq = CONTAINER_OF_XREQ(struct dbus_req, xreq); uint64_t msgid; int rc; - rc = afb_evt_add_watch(dreq->listener->listener, event); + rc = afb_evt_listener_watch_x2(dreq->listener->listener, event); sd_bus_message_get_cookie(dreq->message, &msgid); - afb_api_dbus_server_event_send(dreq->listener->destination, 'S', afb_evt_event_name(event), afb_evt_event_id(event), "", msgid); + afb_api_dbus_server_event_send(dreq->listener->origin, 'S', afb_evt_event_x2_fullname(event), afb_evt_event_x2_id(event), "", msgid); return rc; } -static int dbus_req_unsubscribe(struct dbus_req *dreq, struct afb_event event) +static int dbus_req_unsubscribe(struct afb_xreq *xreq, struct afb_event_x2 *event) { + struct dbus_req *dreq = CONTAINER_OF_XREQ(struct dbus_req, xreq); uint64_t msgid; int rc; sd_bus_message_get_cookie(dreq->message, &msgid); - afb_api_dbus_server_event_send(dreq->listener->destination, 'U', afb_evt_event_name(event), afb_evt_event_id(event), "", msgid); - rc = afb_evt_remove_watch(dreq->listener->listener, event); + afb_api_dbus_server_event_send(dreq->listener->origin, 'U', afb_evt_event_x2_fullname(event), afb_evt_event_x2_id(event), "", msgid); + rc = afb_evt_listener_unwatch_x2(dreq->listener->listener, event); return rc; } -static void dbus_req_subcall(struct dbus_req *dreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure); - -const struct afb_req_itf afb_api_dbus_req_itf = { - .json = (void*)dbus_req_json, - .get = (void*)dbus_req_get, - .success = (void*)dbus_req_success, - .fail = (void*)dbus_req_fail, - .raw = (void*)dbus_req_raw, - .send = (void*)dbus_req_send, - .context_get = (void*)afb_context_get, - .context_set = (void*)afb_context_set, - .addref = (void*)dbus_req_addref, - .unref = (void*)dbus_req_unref, - .session_close = (void*)afb_context_close, - .session_set_LOA = (void*)afb_context_change_loa, - .subscribe = (void*)dbus_req_subscribe, - .unsubscribe = (void*)dbus_req_unsubscribe, - .subcall = (void*)dbus_req_subcall +const struct afb_xreq_query_itf afb_api_dbus_xreq_itf = { + .json = dbus_req_json, + .reply = dbus_req_raw_reply, + .unref = dbus_req_destroy, + .subscribe = dbus_req_subscribe, + .unsubscribe = dbus_req_unsubscribe, }; -static void dbus_req_subcall(struct dbus_req *dreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure) -{ - afb_subcall(&dreq->context, api, verb, args, callback, closure, (struct afb_req){ .itf = &afb_api_dbus_req_itf, .closure = dreq }); -} - /******************* server part **********************************/ -static void afb_api_dbus_server_event_send(struct destination *destination, char order, const char *event, int eventid, const char *data, uint64_t msgid) +static void afb_api_dbus_server_event_send(struct origin *origin, char order, const char *event, int eventid, const char *data, uint64_t msgid) { int rc; struct api_dbus *api; struct sd_bus_message *msg; - api = destination->api; + api = origin->api; msg = NULL; - rc = sd_bus_message_new_method_call(api->sdbus, &msg, destination->name, api->path, api->name, "event"); + rc = sd_bus_message_new_method_call(api->sdbus, &msg, origin->name, api->path, api->name, "event"); if (rc < 0) goto error; @@ -920,36 +901,37 @@ static void afb_api_dbus_server_event_send(struct destination *destination, char goto end; error: - ERROR("error while send event %c%s(%d) to %s", order, event, eventid, destination->name); + ERROR("error while send event %c%s(%d) to %s", order, event, eventid, origin->name); end: sd_bus_message_unref(msg); } -static void afb_api_dbus_server_event_add(void *closure, const char *event, int eventid) +static void afb_api_dbus_server_event_add(void *closure, const char *event, uint16_t eventid) { afb_api_dbus_server_event_send(closure, '+', event, eventid, "", 0); } -static void afb_api_dbus_server_event_remove(void *closure, const char *event, int eventid) +static void afb_api_dbus_server_event_remove(void *closure, const char *event, uint16_t eventid) { afb_api_dbus_server_event_send(closure, '-', event, eventid, "", 0); } -static void afb_api_dbus_server_event_push(void *closure, const char *event, int eventid, struct json_object *object) +static void afb_api_dbus_server_event_push(void *closure, const char *event, uint16_t eventid, struct json_object *object) { - const char *data = json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN); + const char *data = json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN|JSON_C_TO_STRING_NOSLASHESCAPE); afb_api_dbus_server_event_send(closure, '!', event, eventid, data, 0); json_object_put(object); } -static void afb_api_dbus_server_event_broadcast(void *closure, const char *event, int eventid, struct json_object *object) +static void afb_api_dbus_server_event_broadcast(void *closure, const char *event, struct json_object *object, const uuid_binary_t uuid, uint8_t hop) { int rc; struct api_dbus *api; api = closure; rc = sd_bus_emit_signal(api->sdbus, api->path, api->name, "broadcast", - "ss", event, json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN)); + "ssayy", event, json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN|JSON_C_TO_STRING_NOSLASHESCAPE), + uuid, UUID_BINARY_LENGTH, hop); if (rc < 0) ERROR("error while broadcasting event %s", event); json_object_put(object); @@ -961,12 +943,13 @@ static int api_dbus_server_on_object_called(sd_bus_message *message, void *userd int rc; const char *method; const char *uuid; + const char *creds; struct dbus_req *dreq; struct api_dbus *api = userdata; - struct afb_req areq; uint32_t flags; struct afb_session *session; struct listener *listener; + enum json_tokener_error jerr; /* check the interface */ if (strcmp(sd_bus_message_get_interface(message), api->name) != 0) @@ -981,32 +964,36 @@ static int api_dbus_server_on_object_called(sd_bus_message *message, void *userd goto out_of_memory; /* get the data */ - rc = sd_bus_message_read(message, "ssu", &dreq->request, &uuid, &flags); + rc = sd_bus_message_read(message, "ssus", &dreq->request, &uuid, &flags, &creds); if (rc < 0) { sd_bus_reply_method_errorf(message, SD_BUS_ERROR_INVALID_SIGNATURE, "invalid signature"); goto error; } /* connect to the context */ - if (afb_context_connect(&dreq->context, uuid, NULL) < 0) + afb_xreq_init(&dreq->xreq, &afb_api_dbus_xreq_itf); + if (afb_context_connect(&dreq->xreq.context, uuid, NULL, NULL) < 0) goto out_of_memory; - session = dreq->context.session; + session = dreq->xreq.context.session; /* get the listener */ - listener = afb_api_dbus_server_listerner_get(api, sd_bus_message_get_sender(message), session); + listener = afb_api_dbus_server_listener_get(api, sd_bus_message_get_sender(message), session); if (listener == NULL) goto out_of_memory; /* fulfill the request and emit it */ - dreq->context.flags = flags; + afb_context_change_cred(&dreq->xreq.context, listener->origin->cred); + afb_context_on_behalf_import(&dreq->xreq.context, creds); dreq->message = sd_bus_message_ref(message); - dreq->json = NULL; + dreq->json = json_tokener_parse_verbose(dreq->request, &jerr); + if (jerr != json_tokener_success) { + /* lazy error detection of json request. Is it to improve? */ + dreq->json = json_object_new_string(dreq->request); + } dreq->listener = listener; - dreq->refcount = 1; - areq.itf = &afb_api_dbus_req_itf; - areq.closure = dreq; - afb_apis_call(areq, &dreq->context, api->api, method); - dbus_req_unref(dreq); + dreq->xreq.request.called_api = api->api; + dreq->xreq.request.called_verb = method; + afb_xreq_process(&dreq->xreq, api->server.apiset); return 1; out_of_memory: @@ -1017,7 +1004,7 @@ error: } /* create the service */ -int afb_api_dbus_add_server(const char *path) +int afb_api_dbus_add_server(const char *path, struct afb_apiset *declare_set, struct afb_apiset *call_set) { int rc; struct api_dbus *api; @@ -1045,6 +1032,7 @@ int afb_api_dbus_add_server(const char *path) INFO("afb service over dbus installed, name %s, path %s", api->name, api->path); api->server.listener = afb_evt_listener_create(&evt_broadcast_itf, api); + api->server.apiset = afb_apiset_addref(call_set); return 0; error3: sd_bus_release_name(api->sdbus, api->name); @@ -1054,4 +1042,5 @@ error: return -1; } +#endif