X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcurl_json.c;h=a4afa02e4c70da022e4ad8487d6208f9205a9fff;hb=96e0f2341bace029acefe0a88bab96ae326c0ff5;hp=21deed61a1e1192ca12bfdf11208a0de4582c461;hpb=b53110ef99e3d6a5e2f8e79b8f068cfe96a1accb;p=collectd.git diff --git a/src/curl_json.c b/src/curl_json.c index 21deed61..a4afa02e 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-2010 Florian octo Forster + * Copyright (C) 2006-2011 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 @@ -18,7 +18,7 @@ * * Authors: * Doug MacEachern - * Florian octo Forster + * Florian octo Forster **/ #include "collectd.h" @@ -26,13 +26,21 @@ #include "plugin.h" #include "configfile.h" #include "utils_avltree.h" +#include "utils_complain.h" #include #include +#if HAVE_YAJL_YAJL_VERSION_H +# include +#endif + +#if defined(YAJL_MAJOR) && (YAJL_MAJOR > 1) +# define HAVE_YAJL_V2 1 +#endif #define CJ_DEFAULT_HOST "localhost" #define CJ_KEY_MAGIC 0x43484b59UL /* CHKY */ -#define CJ_IS_KEY(key) (key)->magic == CJ_KEY_MAGIC +#define CJ_IS_KEY(key) ((key)->magic == CJ_KEY_MAGIC) #define CJ_ANY "*" #define COUCH_MIN(x,y) ((x) < (y) ? (x) : (y)) @@ -40,10 +48,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; }; /* }}} */ @@ -56,9 +64,11 @@ struct cj_s /* {{{ */ char *user; char *pass; char *credentials; - int verify_peer; - int verify_host; + _Bool verify_peer; + _Bool verify_host; char *cacert; + struct curl_slist *headers; + char *post_body; CURL *curl; char curl_errbuf[CURL_ERROR_SIZE]; @@ -77,6 +87,12 @@ struct cj_s /* {{{ */ }; typedef struct cj_s cj_t; /* }}} */ +#if HAVE_YAJL_V2 +typedef size_t yajl_len_t; +#else +typedef unsigned int yajl_len_t; +#endif + static int cj_read (user_data_t *ud); static int cj_curl_perform (cj_t *db, CURL *curl); static void cj_submit (cj_t *db, cj_key_t *key, value_t *value); @@ -99,17 +115,17 @@ static size_t cj_curl_callback (void *buf, /* {{{ */ status = yajl_parse(db->yajl, (unsigned char *)buf, len); if (status == yajl_status_ok) - { - status = yajl_parse_complete(db->yajl); return (len); - } +#if !HAVE_YAJL_V2 else if (status == yajl_status_insufficient_data) return (len); +#endif if (status != yajl_status_ok) { unsigned char *msg = - yajl_get_error(db->yajl, 1, (unsigned char *)buf, len); + yajl_get_error(db->yajl, /* verbose = */ 1, + /* jsonText = */ (unsigned char *) buf, (unsigned int) len); ERROR ("curl_json plugin: yajl_parse failed: %s", msg); yajl_free_error(db->yajl, msg); return (0); /* abort write callback */ @@ -124,9 +140,31 @@ static int cj_get_type (cj_key_t *key) ds = plugin_get_ds (key->type); if (ds == NULL) - return -1; /* let plugin_write do the complaining */ - else - return ds->ds[0].type; /* XXX support ds->ds_len > 1 */ + { + static char type[DATA_MAX_NAME_LEN] = "!!!invalid!!!"; + + assert (key->type != NULL); + if (strcmp (type, key->type) != 0) + { + ERROR ("curl_json plugin: Unable to look up DS type \"%s\".", + key->type); + sstrncpy (type, key->type, sizeof (type)); + } + + return -1; + } + else if (ds->ds_num > 1) + { + static c_complain_t complaint = C_COMPLAIN_INIT_STATIC; + + c_complain_once (LOG_WARNING, &complaint, + "curl_json plugin: The type \"%s\" has more than one data source. " + "This is currently not supported. I will return the type of the " + "first data source, but this will likely lead to problems later on.", + key->type); + } + + return ds->ds[0].type; } /* yajl callbacks */ @@ -136,45 +174,27 @@ static int cj_get_type (cj_key_t *key) /* "number" may not be null terminated, so copy it into a buffer before * parsing. */ static int cj_cb_number (void *ctx, - const char *number, unsigned int number_len) + const char *number, yajl_len_t number_len) { char buffer[number_len + 1]; cj_t *db = (cj_t *)ctx; cj_key_t *key = db->state[db->depth].key; - char *endptr; value_t vt; int type; + int status; - if (key == NULL) + if ((key == NULL) || !CJ_IS_KEY (key)) return (CJ_CB_CONTINUE); memcpy (buffer, number, number_len); buffer[sizeof (buffer) - 1] = 0; type = cj_get_type (key); - - endptr = NULL; - errno = 0; - - if (type == DS_TYPE_COUNTER) - vt.counter = (counter_t) strtoull (buffer, &endptr, /* base = */ 0); - else if (type == DS_TYPE_GAUGE) - vt.gauge = (gauge_t) strtod (buffer, &endptr); - else if (type == DS_TYPE_DERIVE) - vt.derive = (derive_t) strtoll (buffer, &endptr, /* base = */ 0); - else if (type == DS_TYPE_ABSOLUTE) - vt.absolute = (absolute_t) strtoull (buffer, &endptr, /* base = */ 0); - else - { - ERROR ("curl_json plugin: Unknown data source type: \"%s\"", key->type); - return (CJ_CB_ABORT); - } - - if ((endptr == &buffer[0]) || (errno != 0)) + status = parse_value (buffer, &vt, type); + if (status != 0) { - NOTICE ("curl_json plugin: Overflow while parsing number. " - "Ignoring this value."); + NOTICE ("curl_json plugin: Unable to parse number: \"%s\"", buffer); return (CJ_CB_CONTINUE); } @@ -183,7 +203,7 @@ static int cj_cb_number (void *ctx, } /* int cj_cb_number */ static int cj_cb_map_key (void *ctx, const unsigned char *val, - unsigned int len) + yajl_len_t len) { cj_t *db = (cj_t *)ctx; c_avl_tree_t *tree; @@ -211,37 +231,29 @@ static int cj_cb_map_key (void *ctx, const unsigned char *val, } static int cj_cb_string (void *ctx, const unsigned char *val, - unsigned int len) + yajl_len_t len) { cj_t *db = (cj_t *)ctx; - c_avl_tree_t *tree; - char *ptr; - - if (db->depth != 1) /* e.g. _all_dbs */ - return (CJ_CB_CONTINUE); + char str[len + 1]; - cj_cb_map_key (ctx, val, len); /* same logic */ + /* Create a null-terminated version of the string. */ + memcpy (str, val, len); + str[len] = 0; - tree = db->state[db->depth].tree; + /* No configuration for this string -> simply return. */ + if (db->state[db->depth].key == NULL) + return (CJ_CB_CONTINUE); - if ((tree != NULL) && (ptr = rindex (db->url, '/'))) + if (!CJ_IS_KEY (db->state[db->depth].key)) { - char url[PATH_MAX]; - CURL *curl; - - /* url =~ s,[^/]+$,$name, */ - len = (ptr - db->url) + 1; - ptr = url; - sstrncpy (ptr, db->url, sizeof (url)); - sstrncpy (ptr + len, db->state[db->depth].name, sizeof (url) - len); - - curl = curl_easy_duphandle (db->curl); - curl_easy_setopt (curl, CURLOPT_URL, url); - cj_curl_perform (db, curl); - curl_easy_cleanup (curl); + NOTICE ("curl_json plugin: Found string \"%s\", but the configuration " + "expects a map here.", str); + return (CJ_CB_CONTINUE); } - 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 */ static int cj_cb_start (void *ctx) { @@ -279,7 +291,7 @@ static int cj_cb_start_array (void * ctx) static int cj_cb_end_array (void * ctx) { - return cj_cb_start (ctx); + return cj_cb_end (ctx); } static yajl_callbacks ycallbacks = { @@ -357,14 +369,21 @@ static void cj_free (void *arg) /* {{{ */ sfree (db->pass); sfree (db->credentials); sfree (db->cacert); + sfree (db->post_body); + curl_slist_free_all (db->headers); sfree (db); } /* }}} void cj_free */ /* Configuration handling functions {{{ */ -static int cj_config_add_string (const char *name, char **dest, /* {{{ */ - oconfig_item_t *ci) +static c_avl_tree_t *cj_avl_create(void) +{ + return c_avl_create ((int (*) (const void *, const void *)) strcmp); +} + +static int cj_config_append_string (const char *name, struct curl_slist **dest, /* {{{ */ + oconfig_item_t *ci) { if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) { @@ -372,32 +391,12 @@ static int cj_config_add_string (const char *name, char **dest, /* {{{ */ return (-1); } - sfree (*dest); - *dest = strdup (ci->values[0].value.string); + *dest = curl_slist_append(*dest, ci->values[0].value.string); if (*dest == NULL) return (-1); return (0); -} /* }}} int cj_config_add_string */ - -static int cj_config_set_boolean (const char *name, int *dest, /* {{{ */ - oconfig_item_t *ci) -{ - if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN)) - { - WARNING ("curl_json plugin: `%s' needs exactly one boolean argument.", name); - return (-1); - } - - *dest = ci->values[0].value.boolean ? 1 : 0; - - return (0); -} /* }}} int cj_config_set_boolean */ - -static c_avl_tree_t *cj_avl_create(void) -{ - return c_avl_create ((int (*) (const void *, const void *)) strcmp); -} +} /* }}} int cj_config_append_string */ static int cj_config_add_key (cj_t *db, /* {{{ */ oconfig_item_t *ci) @@ -425,7 +424,7 @@ static int cj_config_add_key (cj_t *db, /* {{{ */ if (strcasecmp ("Key", ci->key) == 0) { - status = cj_config_add_string ("Key", &key->path, ci); + status = cf_util_get_string (ci, &key->path); if (status != 0) { sfree (key); @@ -445,9 +444,9 @@ static int cj_config_add_key (cj_t *db, /* {{{ */ oconfig_item_t *child = ci->children + i; if (strcasecmp ("Type", child->key) == 0) - status = cj_config_add_string ("Type", &key->type, child); + status = cf_util_get_string (child, &key->type); else if (strcasecmp ("Instance", child->key) == 0) - status = cj_config_add_string ("Instance", &key->instance, child); + status = cf_util_get_string (child, &key->instance); else { WARNING ("curl_json plugin: Option `%s' not allowed here.", child->key); @@ -501,6 +500,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) @@ -535,6 +535,7 @@ static int cj_init_curl (cj_t *db) /* {{{ */ return (-1); } + 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, @@ -562,11 +563,15 @@ static int cj_init_curl (cj_t *db) /* {{{ */ curl_easy_setopt (db->curl, CURLOPT_USERPWD, db->credentials); } - curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, db->verify_peer); + curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYPEER, (long) db->verify_peer); curl_easy_setopt (db->curl, CURLOPT_SSL_VERIFYHOST, - db->verify_host ? 2 : 0); + db->verify_host ? 2L : 0L); if (db->cacert != NULL) curl_easy_setopt (db->curl, CURLOPT_CAINFO, db->cacert); + if (db->headers != NULL) + curl_easy_setopt (db->curl, CURLOPT_HTTPHEADER, db->headers); + if (db->post_body != NULL) + curl_easy_setopt (db->curl, CURLOPT_POSTFIELDS, db->post_body); return (0); } /* }}} int cj_init_curl */ @@ -595,7 +600,7 @@ static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */ if (strcasecmp ("URL", ci->key) == 0) { - status = cj_config_add_string ("URL", &db->url, ci); + status = cf_util_get_string (ci, &db->url); if (status != 0) { sfree (db); @@ -615,19 +620,23 @@ static int cj_config_add_url (oconfig_item_t *ci) /* {{{ */ oconfig_item_t *child = ci->children + i; if (strcasecmp ("Instance", child->key) == 0) - status = cj_config_add_string ("Instance", &db->instance, child); + status = cf_util_get_string (child, &db->instance); else if (strcasecmp ("Host", child->key) == 0) - status = cj_config_add_string ("Host", &db->host, child); + status = cf_util_get_string (child, &db->host); else if (strcasecmp ("User", child->key) == 0) - status = cj_config_add_string ("User", &db->user, child); + status = cf_util_get_string (child, &db->user); else if (strcasecmp ("Password", child->key) == 0) - status = cj_config_add_string ("Password", &db->pass, child); + status = cf_util_get_string (child, &db->pass); else if (strcasecmp ("VerifyPeer", child->key) == 0) - status = cj_config_set_boolean ("VerifyPeer", &db->verify_peer, child); + status = cf_util_get_boolean (child, &db->verify_peer); else if (strcasecmp ("VerifyHost", child->key) == 0) - status = cj_config_set_boolean ("VerifyHost", &db->verify_host, child); + status = cf_util_get_boolean (child, &db->verify_host); else if (strcasecmp ("CACert", child->key) == 0) - status = cj_config_add_string ("CACert", &db->cacert, child); + status = cf_util_get_string (child, &db->cacert); + else if (strcasecmp ("Header", child->key) == 0) + status = cj_config_append_string ("Header", &db->headers, child); + else if (strcasecmp ("Post", child->key) == 0) + status = cf_util_get_string (child, &db->post_body); else if (strcasecmp ("Key", child->key) == 0) status = cj_config_add_key (db, child); else @@ -740,8 +749,13 @@ static void cj_submit (cj_t *db, cj_key_t *key, value_t *value) /* {{{ */ host = db->host; if (key->instance == NULL) - ssnprintf (vl.type_instance, sizeof (vl.type_instance), "%s-%s", - db->state[db->depth-1].name, db->state[db->depth].name); + { + 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); + } else sstrncpy (vl.type_instance, key->instance, sizeof (vl.type_instance)); @@ -760,36 +774,66 @@ static int cj_curl_perform (cj_t *db, CURL *curl) /* {{{ */ char *url; yajl_handle yprev = db->yajl; - db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db); + db->yajl = yajl_alloc (&ycallbacks, +#if HAVE_YAJL_V2 + /* alloc funcs = */ NULL, +#else + /* alloc funcs = */ NULL, NULL, +#endif + /* context = */ (void *)db); if (db->yajl == NULL) { ERROR ("curl_json plugin: yajl_alloc failed."); + db->yajl = yprev; return (-1); } - status = curl_easy_perform (curl); + url = NULL; + curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url); - yajl_free (db->yajl); - db->yajl = yprev; + status = curl_easy_perform (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 : ""); + yajl_free (db->yajl); + db->yajl = yprev; + return (-1); + } - curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &url); curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &rc); /* The response code is zero if a non-HTTP transport was used. */ if ((rc != 0) && (rc != 200)) { - ERROR ("curl_json plugin: curl_easy_perform failed with response code %ld (%s)", - rc, url); + ERROR ("curl_json plugin: curl_easy_perform failed with " + "response code %ld (%s)", rc, url); + yajl_free (db->yajl); + db->yajl = yprev; return (-1); } - if (status != 0) +#if HAVE_YAJL_V2 + status = yajl_complete_parse(db->yajl); +#else + status = yajl_parse_complete(db->yajl); +#endif + if (status != yajl_status_ok) { - ERROR ("curl_json plugin: curl_easy_perform failed with status %i: %s (%s)", - status, db->curl_errbuf, url); + unsigned char *errmsg; + + errmsg = yajl_get_error (db->yajl, /* verbose = */ 0, + /* jsonText = */ NULL, /* jsonTextLen = */ 0); + ERROR ("curl_json plugin: yajl_parse_complete failed: %s", + (char *) errmsg); + yajl_free_error (db->yajl, errmsg); + yajl_free (db->yajl); + db->yajl = yprev; return (-1); } + yajl_free (db->yajl); + db->yajl = yprev; return (0); } /* }}} int cj_curl_perform */ @@ -813,9 +857,18 @@ static int cj_read (user_data_t *ud) /* {{{ */ return cj_curl_perform (db, db->curl); } /* }}} 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 : */