#include "afb-msg-json.h"
#include "afb-context.h"
#include "afb-hreq.h"
+#include "afb-subcall.h"
#include "session.h"
#include "verbose.h"
static void req_success(struct afb_hreq *hreq, json_object *obj, const char *info);
static const char *req_raw(struct afb_hreq *hreq, size_t *size);
static void req_send(struct afb_hreq *hreq, const char *buffer, size_t size);
+static int req_subscribe_unsubscribe_error(struct afb_hreq *hreq, struct afb_event event);
+static void req_subcall(struct afb_hreq *hreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure);
-static const struct afb_req_itf afb_hreq_itf = {
+const struct afb_req_itf afb_hreq_req_itf = {
.json = (void*)req_json,
.get = (void*)req_get,
.success = (void*)req_success,
.addref = (void*)afb_hreq_addref,
.unref = (void*)afb_hreq_unref,
.session_close = (void*)afb_context_close,
- .session_set_LOA = (void*)afb_context_change_loa
+ .session_set_LOA = (void*)afb_context_change_loa,
+ .subscribe = (void*)req_subscribe_unsubscribe_error,
+ .unsubscribe = (void*)req_subscribe_unsubscribe_error,
+ .subcall = (void*)req_subcall
};
static struct hreq_data *get_data(struct afb_hreq *hreq, const char *key, int create)
afb_hreq_reply_empty(hreq, status, NULL);
}
+int afb_hreq_redirect_to_ending_slash_if_needed(struct afb_hreq *hreq)
+{
+ char *tourl;
+
+ if (hreq->url[hreq->lenurl - 1] == '/')
+ return 0;
+
+ /* the redirect is needed for reliability of relative path */
+ tourl = alloca(hreq->lenurl + 2);
+ memcpy(tourl, hreq->url, hreq->lenurl);
+ tourl[hreq->lenurl] = '/';
+ tourl[hreq->lenurl + 1] = 0;
+ afb_hreq_redirect_to(hreq, tourl, 1);
+ return 1;
+}
+
int afb_hreq_reply_file_if_exist(struct afb_hreq *hreq, int dirfd, const char *filename)
{
int rc;
int fd;
unsigned int status;
struct stat st;
- char etag[1 + 2 * sizeof(int)];
+ char etag[1 + 2 * 8];
const char *inm;
struct MHD_Response *response;
const char *mimetype;
/* serve directory */
if (S_ISDIR(st.st_mode)) {
- static const char *indexes[] = { "index.html", NULL };
- int i = 0;
- rc = 0;
- while (indexes[i] != NULL) {
- if (faccessat(fd, indexes[i], R_OK, 0) == 0) {
- if (hreq->url[hreq->lenurl - 1] != '/') {
- /* the redirect is needed for reliability of relative path */
- char *tourl = alloca(hreq->lenurl + 2);
- memcpy(tourl, hreq->url, hreq->lenurl);
- tourl[hreq->lenurl] = '/';
- tourl[hreq->lenurl + 1] = 0;
- rc = afb_hreq_redirect_to(hreq, tourl);
- } else {
+ rc = afb_hreq_redirect_to_ending_slash_if_needed(hreq);
+ if (rc == 0) {
+ static const char *indexes[] = { "index.html", NULL };
+ int i = 0;
+ while (indexes[i] != NULL) {
+ if (faccessat(fd, indexes[i], R_OK, 0) == 0) {
rc = afb_hreq_reply_file_if_exist(hreq, fd, indexes[i]);
+ break;
}
- break;
+ i++;
}
- i++;
}
close(fd);
return rc;
return 1;
}
-int afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url)
+struct _mkq_ {
+ int count;
+ size_t length;
+ size_t alloc;
+ char *text;
+};
+
+static void _mkq_add_(struct _mkq_ *mkq, char value)
+{
+ char *text = mkq->text;
+ if (text != NULL) {
+ if (mkq->length == mkq->alloc) {
+ mkq->alloc += 100;
+ text = realloc(text, mkq->alloc);
+ if (text == NULL) {
+ free(mkq->text);
+ mkq->text = NULL;
+ return;
+ }
+ mkq->text = text;
+ }
+ text[mkq->length++] = value;
+ }
+}
+
+static void _mkq_add_hex_(struct _mkq_ *mkq, char value)
+{
+ _mkq_add_(mkq, (char)(value < 10 ? value + '0' : value + 'A' - 10));
+}
+
+static void _mkq_add_esc_(struct _mkq_ *mkq, char value)
+{
+ _mkq_add_(mkq, '%');
+ _mkq_add_hex_(mkq, (char)((value >> 4) & 15));
+ _mkq_add_hex_(mkq, (char)(value & 15));
+}
+
+static void _mkq_add_char_(struct _mkq_ *mkq, char value)
+{
+ if (value <= ' ' || value >= 127)
+ _mkq_add_esc_(mkq, value);
+ else
+ switch(value) {
+ case '=':
+ case '&':
+ case '%':
+ _mkq_add_esc_(mkq, value);
+ break;
+ default:
+ _mkq_add_(mkq, value);
+ }
+}
+
+static void _mkq_append_(struct _mkq_ *mkq, const char *value)
+{
+ while(*value)
+ _mkq_add_char_(mkq, *value++);
+}
+
+static int _mkquery_(struct _mkq_ *mkq, enum MHD_ValueKind kind, const char *key, const char *value)
+{
+ _mkq_add_(mkq, mkq->count++ ? '&' : '?');
+ _mkq_append_(mkq, key);
+ if (value != NULL) {
+ _mkq_add_(mkq, '=');
+ _mkq_append_(mkq, value);
+ }
+ return 1;
+}
+
+static char *url_with_query(struct afb_hreq *hreq, const char *url)
+{
+ struct _mkq_ mkq;
+
+ mkq.count = 0;
+ mkq.length = strlen(url);
+ mkq.alloc = mkq.length + 1000;
+ mkq.text = malloc(mkq.alloc);
+ if (mkq.text != NULL) {
+ strcpy(mkq.text, url);
+ MHD_get_connection_values(hreq->connection, MHD_GET_ARGUMENT_KIND, (void*)_mkquery_, &mkq);
+ _mkq_add_(&mkq, 0);
+ }
+ return mkq.text;
+}
+
+void afb_hreq_redirect_to(struct afb_hreq *hreq, const char *url, int add_query_part)
{
- /* TODO: append the query part! */
+ const char *to;
+ char *wqp;
+
+ wqp = add_query_part ? url_with_query(hreq, url) : NULL;
+ to = wqp ? : url;
afb_hreq_reply_static(hreq, MHD_HTTP_MOVED_PERMANENTLY, 0, NULL,
- MHD_HTTP_HEADER_LOCATION, url, NULL);
+ MHD_HTTP_HEADER_LOCATION, to, NULL);
DEBUG("redirect from [%s] to [%s]", hreq->url, url);
- return 1;
+ free(wqp);
}
const char *afb_hreq_get_cookie(struct afb_hreq *hreq, const char *name)
struct afb_req afb_hreq_to_req(struct afb_hreq *hreq)
{
- return (struct afb_req){ .itf = &afb_hreq_itf, .closure = hreq };
+ return (struct afb_req){ .itf = &afb_hreq_req_itf, .closure = hreq };
}
static struct afb_arg req_get(struct afb_hreq *hreq, const char *name)
static void req_reply(struct afb_hreq *hreq, unsigned retcode, const char *status, const char *info, json_object *resp)
{
- struct json_object *reply, *request;
- const char *token, *uuid, *reqid;
+ struct json_object *reply;
+ const char *reqid;
struct MHD_Response *response;
- token = afb_context_sent_token(&hreq->context);
- uuid = afb_context_sent_uuid(&hreq->context);
-
- reply = afb_msg_json_reply(status, info, resp, token, uuid);
-
reqid = afb_hreq_get_argument(hreq, long_key_for_reqid);
if (reqid == NULL)
reqid = afb_hreq_get_argument(hreq, short_key_for_reqid);
- if (reqid != NULL && json_object_object_get_ex(reply, "request", &request))
- json_object_object_add (request, short_key_for_reqid, json_object_new_string(reqid));
+
+ reply = afb_msg_json_reply(status, info, resp, &hreq->context, reqid);
response = MHD_create_response_from_callback((uint64_t)strlen(json_object_to_json_string_ext(reply, JSON_C_TO_STRING_PLAIN)), SIZE_RESPONSE_BUFFER, (void*)send_json_cb, reply, (void*)json_object_put);
afb_hreq_reply(hreq, retcode, response, NULL);
req_reply(hreq, MHD_HTTP_OK, "success", info, obj);
}
+static int req_subscribe_unsubscribe_error(struct afb_hreq *hreq, struct afb_event event)
+{
+ errno = EINVAL;
+ return -1;
+}
+
+static void req_subcall(struct afb_hreq *hreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure)
+{
+ afb_subcall(&hreq->context, api, verb, args, callback, closure, (struct afb_req){ .itf = &afb_hreq_req_itf, .closure = hreq });
+}
+
int afb_hreq_init_context(struct afb_hreq *hreq)
{
const char *uuid;
Code Review / src / app-framework-binder.git / blobdiff