X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_http.c;h=9a4051176bf9c40bba5c9f877d838727f9c17283;hb=ff9e11ade5cfabf32c63fb19fc76cbbc4186bc5b;hp=868bca84395ac23fe0e672b179f882ec3f488c53;hpb=584f57cc8cfb14cbcc45714db5dc87304ccb2a0e;p=collectd.git diff --git a/src/write_http.c b/src/write_http.c index 868bca84..9a405117 100644 --- a/src/write_http.c +++ b/src/write_http.c @@ -69,6 +69,7 @@ struct wh_callback_s int format; CURL *curl; + struct curl_slist *headers; char curl_errbuf[CURL_ERROR_SIZE]; char *send_buffer; @@ -129,8 +130,6 @@ static int wh_send_buffer (wh_callback_t *cb) /* {{{ */ static int wh_callback_init (wh_callback_t *cb) /* {{{ */ { - struct curl_slist *headers; - if (cb->curl != NULL) return (0); @@ -157,14 +156,13 @@ static int wh_callback_init (wh_callback_t *cb) /* {{{ */ curl_easy_setopt (cb->curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (cb->curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT); - headers = NULL; - headers = curl_slist_append (headers, "Accept: */*"); + cb->headers = curl_slist_append (cb->headers, "Accept: */*"); if (cb->format == WH_FORMAT_JSON) - headers = curl_slist_append (headers, "Content-Type: application/json"); + cb->headers = curl_slist_append (cb->headers, "Content-Type: application/json"); else - headers = curl_slist_append (headers, "Content-Type: text/plain"); - headers = curl_slist_append (headers, "Expect:"); - curl_easy_setopt (cb->curl, CURLOPT_HTTPHEADER, headers); + cb->headers = curl_slist_append (cb->headers, "Content-Type: text/plain"); + cb->headers = curl_slist_append (cb->headers, "Expect:"); + curl_easy_setopt (cb->curl, CURLOPT_HTTPHEADER, cb->headers); curl_easy_setopt (cb->curl, CURLOPT_ERRORBUFFER, cb->curl_errbuf); curl_easy_setopt (cb->curl, CURLOPT_URL, cb->location); @@ -184,7 +182,7 @@ static int wh_callback_init (wh_callback_t *cb) /* {{{ */ if (cb->pass != NULL) credentials_size += strlen (cb->pass); - cb->credentials = (char *) malloc (credentials_size); + cb->credentials = malloc (credentials_size); if (cb->credentials == NULL) { ERROR ("curl plugin: malloc failed."); @@ -331,6 +329,13 @@ static void wh_callback_free (void *data) /* {{{ */ curl_easy_cleanup (cb->curl); cb->curl = NULL; } + + if (cb->headers != NULL) + { + curl_slist_free_all (cb->headers); + cb->headers = NULL; + } + sfree (cb->name); sfree (cb->location); sfree (cb->user); @@ -534,21 +539,40 @@ static int config_set_format (wh_callback_t *cb, /* {{{ */ return (0); } /* }}} int config_set_format */ +static int wh_config_append_string (const char *name, struct curl_slist **dest, /* {{{ */ + oconfig_item_t *ci) +{ + struct curl_slist *temp = NULL; + if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) + { + WARNING ("write_http plugin: `%s' needs exactly one string argument.", name); + return (-1); + } + + temp = curl_slist_append(*dest, ci->values[0].value.string); + if (temp == NULL) + return (-1); + + *dest = temp; + + return (0); +} /* }}} int wh_config_append_string */ + static int wh_config_node (oconfig_item_t *ci) /* {{{ */ { wh_callback_t *cb; int buffer_size = 0; user_data_t user_data; char callback_name[DATA_MAX_NAME_LEN]; + int status = 0; int i; - cb = malloc (sizeof (*cb)); + cb = calloc (1, sizeof (*cb)); if (cb == NULL) { - ERROR ("write_http plugin: malloc failed."); + ERROR ("write_http plugin: calloc failed."); return (-1); } - memset (cb, 0, sizeof (*cb)); cb->verify_peer = 1; cb->verify_host = 1; cb->format = WH_FORMAT_COMMAND; @@ -556,6 +580,8 @@ static int wh_config_node (oconfig_item_t *ci) /* {{{ */ cb->low_speed_limit = 0; cb->timeout = 0; cb->log_http_error = 0; + cb->headers = NULL; + pthread_mutex_init (&cb->send_lock, /* attr = */ NULL); @@ -570,30 +596,32 @@ static int wh_config_node (oconfig_item_t *ci) /* {{{ */ oconfig_item_t *child = ci->children + i; if (strcasecmp ("URL", child->key) == 0) - cf_util_get_string (child, &cb->location); + status = cf_util_get_string (child, &cb->location); else if (strcasecmp ("User", child->key) == 0) - cf_util_get_string (child, &cb->user); + status = cf_util_get_string (child, &cb->user); else if (strcasecmp ("Password", child->key) == 0) - cf_util_get_string (child, &cb->pass); + status = cf_util_get_string (child, &cb->pass); else if (strcasecmp ("VerifyPeer", child->key) == 0) - cf_util_get_boolean (child, &cb->verify_peer); + status = cf_util_get_boolean (child, &cb->verify_peer); else if (strcasecmp ("VerifyHost", child->key) == 0) - cf_util_get_boolean (child, &cb->verify_host); + status = cf_util_get_boolean (child, &cb->verify_host); else if (strcasecmp ("CACert", child->key) == 0) - cf_util_get_string (child, &cb->cacert); + status = cf_util_get_string (child, &cb->cacert); else if (strcasecmp ("CAPath", child->key) == 0) - cf_util_get_string (child, &cb->capath); + status = cf_util_get_string (child, &cb->capath); else if (strcasecmp ("ClientKey", child->key) == 0) - cf_util_get_string (child, &cb->clientkey); + status = cf_util_get_string (child, &cb->clientkey); else if (strcasecmp ("ClientCert", child->key) == 0) - cf_util_get_string (child, &cb->clientcert); + status = cf_util_get_string (child, &cb->clientcert); else if (strcasecmp ("ClientKeyPass", child->key) == 0) - cf_util_get_string (child, &cb->clientkeypass); + status = cf_util_get_string (child, &cb->clientkeypass); else if (strcasecmp ("SSLVersion", child->key) == 0) { char *value = NULL; - cf_util_get_string (child, &value); + status = cf_util_get_string (child, &value); + if (status != 0) + break; if (value == NULL || strcasecmp ("default", value) == 0) cb->sslversion = CURL_SSLVERSION_DEFAULT; @@ -612,28 +640,43 @@ static int wh_config_node (oconfig_item_t *ci) /* {{{ */ cb->sslversion = CURL_SSLVERSION_TLSv1_2; #endif else + { ERROR ("write_http plugin: Invalid SSLVersion " "option: %s.", value); + status = EINVAL; + } sfree(value); } else if (strcasecmp ("Format", child->key) == 0) - config_set_format (cb, child); + status = config_set_format (cb, child); else if (strcasecmp ("StoreRates", child->key) == 0) - cf_util_get_boolean (child, &cb->store_rates); + status = cf_util_get_boolean (child, &cb->store_rates); else if (strcasecmp ("BufferSize", child->key) == 0) - cf_util_get_int (child, &buffer_size); + status = cf_util_get_int (child, &buffer_size); else if (strcasecmp ("LowSpeedLimit", child->key) == 0) - cf_util_get_int (child, &cb->low_speed_limit); + status = cf_util_get_int (child, &cb->low_speed_limit); else if (strcasecmp ("Timeout", child->key) == 0) - cf_util_get_int (child, &cb->timeout); + status = cf_util_get_int (child, &cb->timeout); else if (strcasecmp ("LogHttpError", child->key) == 0) - cf_util_get_boolean (child, &cb->log_http_error); + status = cf_util_get_boolean (child, &cb->log_http_error); + else if (strcasecmp ("Header", child->key) == 0) + status = wh_config_append_string ("Header", &cb->headers, child); else { ERROR ("write_http plugin: Invalid configuration " "option: %s.", child->key); + status = EINVAL; } + + if (status != 0) + break; + } + + if (status != 0) + { + wh_callback_free (cb); + return (status); } if (cb->location == NULL)