X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcurl_json.c;h=a84cba042b924d6e3b7667066889ead4ab41ca72;hb=103f05e098865196fc5f28df51e99b64fd6b5202;hp=de66862c7cd415916df9182d43ad77387efd516a;hpb=1f8f016bd1ab08f33c16b4589b0371c81d66b122;p=collectd.git diff --git a/src/curl_json.c b/src/curl_json.c index de66862c..a84cba04 100644 --- a/src/curl_json.c +++ b/src/curl_json.c @@ -1,7 +1,7 @@ /** * collectd - src/curl_json.c * Copyright (C) 2009 Doug MacEachern - * Copyright (C) 2006-2011 Florian octo Forster + * Copyright (C) 2006-2013 Florian octo Forster * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -53,10 +53,10 @@ struct cj_key_s; typedef struct cj_key_s cj_key_t; struct cj_key_s /* {{{ */ { + unsigned long magic; char *path; char *type; char *instance; - unsigned long magic; }; /* }}} */ @@ -71,11 +71,13 @@ struct cj_s /* {{{ */ char *user; char *pass; char *credentials; + _Bool digest; _Bool verify_peer; _Bool verify_host; char *cacert; struct curl_slist *headers; char *post_body; + cdtime_t interval; CURL *curl; char curl_errbuf[CURL_ERROR_SIZE]; @@ -89,6 +91,8 @@ struct cj_s /* {{{ */ c_avl_tree_t *tree; cj_key_t *key; }; + _Bool in_array; + int index; char name[DATA_MAX_NAME_LEN]; } state[YAJL_MAX_DEPTH]; }; @@ -173,12 +177,44 @@ static int cj_get_type (cj_key_t *key) return ds->ds[0].type; } +static int cj_cb_map_key (void *ctx, const unsigned char *val, + yajl_len_t len); + +static void cj_cb_inc_array_index (void *ctx, _Bool update_key) +{ + cj_t *db = (cj_t *)ctx; + + if (!db->state[db->depth].in_array) + return; + + db->state[db->depth].index++; + + if (update_key) + { + char name[DATA_MAX_NAME_LEN]; + + ssnprintf (name, sizeof (name), "%d", db->state[db->depth].index - 1); + + cj_cb_map_key (ctx, (unsigned char *)name, (yajl_len_t) strlen (name)); + } +} + /* yajl callbacks */ #define CJ_CB_ABORT 0 #define CJ_CB_CONTINUE 1 -/* "number" may not be null terminated, so copy it into a buffer before - * parsing. */ +static int cj_cb_boolean (void * ctx, int boolVal) +{ + cj_cb_inc_array_index (ctx, /* update_key = */ 0); + return (CJ_CB_CONTINUE); +} + +static int cj_cb_null (void * ctx) +{ + cj_cb_inc_array_index (ctx, /* update_key = */ 0); + return (CJ_CB_CONTINUE); +} + static int cj_cb_number (void *ctx, const char *number, yajl_len_t number_len) { @@ -190,12 +226,20 @@ static int cj_cb_number (void *ctx, int type; int status; - if ((key == NULL) || !CJ_IS_KEY (key)) - return (CJ_CB_CONTINUE); - + /* Create a null-terminated version of the string. */ memcpy (buffer, number, number_len); buffer[sizeof (buffer) - 1] = 0; + if ((key == NULL) || !CJ_IS_KEY (key)) { + if (key != NULL) + NOTICE ("curl_json plugin: Found \"%s\", but the configuration expects" + " a map.", buffer); + cj_cb_inc_array_index (ctx, /* update_key = */ 0); + return (CJ_CB_CONTINUE); + } else { + cj_cb_inc_array_index (ctx, /* update_key = */ 1); + } + type = cj_get_type (key); status = parse_value (buffer, &vt, type); if (status != 0) @@ -208,8 +252,11 @@ static int cj_cb_number (void *ctx, return (CJ_CB_CONTINUE); } /* int cj_cb_number */ -static int cj_cb_map_key (void *ctx, const unsigned char *val, - yajl_len_t len) +/* Queries the key-tree of the parent context for "in_name" and, if found, + * updates the "key" field of the current context. Otherwise, "key" is set to + * NULL. */ +static int cj_cb_map_key (void *ctx, + unsigned char const *in_name, yajl_len_t in_name_len) { cj_t *db = (cj_t *)ctx; c_avl_tree_t *tree; @@ -218,12 +265,16 @@ static int cj_cb_map_key (void *ctx, const unsigned char *val, if (tree != NULL) { - cj_key_t *value; + cj_key_t *value = NULL; char *name; + size_t name_len; + /* Create a null-terminated version of the name. */ name = db->state[db->depth].name; - len = COUCH_MIN(len, sizeof (db->state[db->depth].name)-1); - sstrncpy (name, (char *)val, len+1); + name_len = COUCH_MIN ((size_t) in_name_len, + sizeof (db->state[db->depth].name) - 1); + memcpy (name, in_name, name_len); + name[name_len] = 0; if (c_avl_get (tree, name, (void *) &value) == 0) db->state[db->depth].key = value; @@ -239,24 +290,6 @@ static int cj_cb_map_key (void *ctx, const unsigned char *val, static int cj_cb_string (void *ctx, const unsigned char *val, yajl_len_t len) { - cj_t *db = (cj_t *)ctx; - char str[len + 1]; - - /* Create a null-terminated version of the string. */ - memcpy (str, val, len); - str[len] = 0; - - /* No configuration for this string -> simply return. */ - if (db->state[db->depth].key == NULL) - return (CJ_CB_CONTINUE); - - if (!CJ_IS_KEY (db->state[db->depth].key)) - { - NOTICE ("curl_json plugin: Found string \"%s\", but the configuration " - "expects a map here.", str); - return (CJ_CB_CONTINUE); - } - /* Handle the string as if it was a number. */ return (cj_cb_number (ctx, (const char *) val, len)); } /* int cj_cb_string */ @@ -266,7 +299,8 @@ static int cj_cb_start (void *ctx) cj_t *db = (cj_t *)ctx; if (++db->depth >= YAJL_MAX_DEPTH) { - ERROR ("curl_json plugin: %s depth exceeds max, aborting.", db->url ? db->url : db->sock); + ERROR ("curl_json plugin: %s depth exceeds max, aborting.", + db->url ? db->url : db->sock); return (CJ_CB_ABORT); } return (CJ_CB_CONTINUE); @@ -282,6 +316,7 @@ static int cj_cb_end (void *ctx) static int cj_cb_start_map (void *ctx) { + cj_cb_inc_array_index (ctx, /* update_key = */ 1); return cj_cb_start (ctx); } @@ -292,17 +327,25 @@ static int cj_cb_end_map (void *ctx) static int cj_cb_start_array (void * ctx) { + cj_t *db = (cj_t *)ctx; + cj_cb_inc_array_index (ctx, /* update_key = */ 1); + if (db->depth+1 < YAJL_MAX_DEPTH) { + db->state[db->depth+1].in_array = 1; + db->state[db->depth+1].index = 0; + } return cj_cb_start (ctx); } static int cj_cb_end_array (void * ctx) { + cj_t *db = (cj_t *)ctx; + db->state[db->depth].in_array = 0; return cj_cb_end (ctx); } static yajl_callbacks ycallbacks = { - NULL, /* null */ - NULL, /* boolean */ + cj_cb_null, /* null */ + cj_cb_boolean, /* boolean */ NULL, /* integer */ NULL, /* double */ cj_cb_number, @@ -370,6 +413,8 @@ static void cj_free (void *arg) /* {{{ */ sfree (db->instance); sfree (db->host); + sfree (db->sock); + sfree (db->url); sfree (db->user); sfree (db->pass); @@ -506,6 +551,7 @@ static int cj_config_add_key (cj_t *db, /* {{{ */ len = ptr-name; if (len == 0) break; + len = COUCH_MIN(len, sizeof (ent)-1); sstrncpy (ent, name, len+1); if (c_avl_get (tree, ent, (void *) &value) != 0) @@ -543,8 +589,7 @@ static int cj_init_curl (cj_t *db) /* {{{ */ curl_easy_setopt (db->curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (db->curl, CURLOPT_WRITEFUNCTION, cj_curl_callback); curl_easy_setopt (db->curl, CURLOPT_WRITEDATA, db); - curl_easy_setopt (db->curl, CURLOPT_USERAGENT, - PACKAGE_NAME"/"PACKAGE_VERSION); + curl_easy_setopt (db->curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT); curl_easy_setopt (db->curl, CURLOPT_ERRORBUFFER, db->curl_errbuf); curl_easy_setopt (db->curl, CURLOPT_URL, db->url); @@ -566,6 +611,13 @@ static int cj_init_curl (cj_t *db) /* {{{ */ ssnprintf (db->credentials, credentials_size, "%s:%s", db->user, (db->pass == NULL) ? "" : db->pass); curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials); + + if (db->digest) + { + curl_easy_setopt (db->curl, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST); + curl_easy_setopt (db->curl, CURLOPT_USERNAME, db->user); + curl_easy_setopt (db->curl, CURLOPT_PASSWORD, db->pass); + } } curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, (long) db->verify_peer); @@ -632,6 +684,8 @@ static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */ status = cf_util_get_string (child, &db->user); else if (db->url && strcasecmp ("Password", child->key) == 0) status = cf_util_get_string (child, &db->pass); + else if (strcasecmp ("Digest", child->key) == 0) + status = cf_util_get_boolean (child, &db->digest); else if (db->url && strcasecmp ("VerifyPeer", child->key) == 0) status = cf_util_get_boolean (child, &db->verify_peer); else if (db->url && strcasecmp ("VerifyHost", child->key) == 0) @@ -644,6 +698,8 @@ static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */ status = cf_util_get_string (child, &db->post_body); else if (strcasecmp ("Key", child->key) == 0) status = cj_config_add_key (db, child); + else if (strcasecmp ("Interval", child->key) == 0) + status = cf_util_get_cdtime(child, &db->interval); else { WARNING ("curl_json plugin: Option `%s' not allowed here.", child->key); @@ -658,8 +714,8 @@ static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */ { if (db->tree == NULL) { - WARNING ("curl_json plugin: No (valid) `Key' block " - "within `%s' block `%s'.", db->url ? "URL" : "Sock", db->url ? db->url : db->sock); + WARNING ("curl_json plugin: No (valid) `Key' block within `%s' \"`%s'\".", + db->url ? "URL" : "Sock", db->url ? db->url : db->sock); status = -1; } if (status == 0 && db->url) @@ -670,7 +726,10 @@ static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */ if (status == 0) { user_data_t ud; - char cb_name[DATA_MAX_NAME_LEN]; + char *cb_name; + struct timespec interval = { 0, 0 }; + + CDTIME_T_TO_TIMESPEC (db->interval, &interval); if (db->instance == NULL) db->instance = strdup("default"); @@ -682,11 +741,13 @@ static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */ ud.data = (void *) db; ud.free_func = cj_free; - ssnprintf (cb_name, sizeof (cb_name), "curl_json-%s-%s", + cb_name = ssnprintf_alloc ("curl_json-%s-%s", db->instance, db->url ? db->url : db->sock); plugin_register_complex_read (/* group = */ NULL, cb_name, cj_read, - /* interval = */ NULL, &ud); + /* interval = */ (db->interval > 0) ? &interval : NULL, + &ud); + sfree (cb_name); } else { @@ -712,7 +773,8 @@ static int cj_config (oconfig_item_t *ci) /* {{{ */ { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("Sock", child->key) == 0 || strcasecmp ("URL", child->key) == 0) + if (strcasecmp ("Sock", child->key) == 0 + || strcasecmp ("URL", child->key) == 0) { status = cj_config_add_url (child); if (status == 0) @@ -755,11 +817,10 @@ static void cj_submit (cj_t *db, cj_key_t *key, value_t *value) /* {{{ */ if (key->instance == NULL) { - if ((db->depth == 0) || (strcmp ("", db->state[db->depth-1].name) == 0)) - sstrncpy (vl.type_instance, db->state[db->depth].name, sizeof (vl.type_instance)); - else - ssnprintf (vl.type_instance, sizeof (vl.type_instance), "%s-%s", - db->state[db->depth-1].name, db->state[db->depth].name); + int i, len = 0; + for (i = 0; i < db->depth; i++) + len += ssnprintf(vl.type_instance+len, sizeof(vl.type_instance)-len, + i ? "-%s" : "%s", db->state[i+1].name); } else sstrncpy (vl.type_instance, key->instance, sizeof (vl.type_instance)); @@ -769,11 +830,15 @@ static void cj_submit (cj_t *db, cj_key_t *key, value_t *value) /* {{{ */ sstrncpy (vl.plugin_instance, db->instance, sizeof (vl.plugin_instance)); sstrncpy (vl.type, key->type, sizeof (vl.type)); + if (db->interval > 0) + vl.interval = db->interval; + plugin_dispatch_values (&vl); } /* }}} int cj_submit */ static int cj_sock_perform (cj_t *db) /* {{{ */ { + char errbuf[1024]; struct sockaddr_un sa_unix = {}; sa_unix.sun_family = AF_UNIX; sstrncpy (sa_unix.sun_path, db->sock, sizeof (sa_unix.sun_path)); @@ -784,7 +849,8 @@ static int cj_sock_perform (cj_t *db) /* {{{ */ if (connect (fd, (struct sockaddr *)&sa_unix, sizeof(sa_unix)) < 0) { ERROR ("curl_json plugin: connect(%s) failed: %s", - (db->sock != NULL) ? db->sock : "", strerror(errno)); + (db->sock != NULL) ? db->sock : "", + sstrerror(errno, errbuf, sizeof (errbuf))); close (fd); return (-1); } @@ -795,7 +861,8 @@ static int cj_sock_perform (cj_t *db) /* {{{ */ red = read (fd, buffer, sizeof(buffer)); if (red < 0) { ERROR ("curl_json plugin: read(%s) failed: %s", - (db->sock != NULL) ? db->sock : "", strerror(errno)); + (db->sock != NULL) ? db->sock : "", + sstrerror(errno, errbuf, sizeof (errbuf))); close (fd); return (-1); } @@ -812,17 +879,17 @@ static int cj_curl_perform(cj_t *db) /* {{{ */ int status; long rc; char *url; - url = NULL; - curl_easy_getinfo(db->curl, CURLINFO_EFFECTIVE_URL, &url); + url = db->url; status = curl_easy_perform (db->curl); if (status != CURLE_OK) { ERROR ("curl_json plugin: curl_easy_perform failed with status %i: %s (%s)", - status, db->curl_errbuf, (url != NULL) ? url : ""); + status, db->curl_errbuf, url); return (-1); } + curl_easy_getinfo(db->curl, CURLINFO_EFFECTIVE_URL, &url); curl_easy_getinfo(db->curl, CURLINFO_RESPONSE_CODE, &rc); /* The response code is zero if a non-HTTP transport was used. */ @@ -854,7 +921,11 @@ static int cj_perform (cj_t *db) /* {{{ */ return (-1); } - if (db->url ? cj_curl_perform (db) < 0 : cj_sock_perform (db) < 0) + if (db->url) + status = cj_curl_perform (db); + else + status = cj_sock_perform (db); + if (status < 0) { yajl_free (db->yajl); db->yajl = yprev; @@ -905,9 +976,18 @@ static int cj_read (user_data_t *ud) /* {{{ */ return cj_perform (db); } /* }}} int cj_read */ +static int cj_init (void) /* {{{ */ +{ + /* Call this while collectd is still single-threaded to avoid + * initialization issues in libgcrypt. */ + curl_global_init (CURL_GLOBAL_SSL); + return (0); +} /* }}} int cj_init */ + void module_register (void) { plugin_register_complex_config ("curl_json", cj_config); + plugin_register_init ("curl_json", cj_init); } /* void module_register */ /* vim: set sw=2 sts=2 et fdm=marker : */