X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fapache.c;h=c6bf8addfed4d6918c7345e5839b3a92105a4c3f;hb=ee9183741485112c084467779cf0b05e23eeed05;hp=280c687feebd79dcbb5c36ed80bce50d3c4ae844;hpb=278d000ffbd978fce52871a9f33f0cf5e1ce49b7;p=collectd.git

diff --git a/src/apache.c b/src/apache.c
index 280c687f..c6bf8add 100644
--- a/src/apache.c
+++ b/src/apache.c
@@ -29,42 +29,57 @@
 
 #include <curl/curl.h>
 
-static char *url    = NULL;
-static char *user   = NULL;
-static char *pass   = NULL;
-static char *cacert = NULL;
+static char *url         = NULL;
+static char *user        = NULL;
+static char *pass        = NULL;
+static char *verify_peer = NULL;
+static char *verify_host = NULL;
+static char *cacert      = NULL;
 
 static CURL *curl = NULL;
 
-#define ABUFFER_SIZE 16384
-static char apache_buffer[ABUFFER_SIZE];
-static int  apache_buffer_len = 0;
-static char apache_curl_error[CURL_ERROR_SIZE];
+static char  *apache_buffer = NULL;
+static size_t apache_buffer_size = 0;
+static size_t apache_buffer_fill = 0;
+static char   apache_curl_error[CURL_ERROR_SIZE];
 
 static const char *config_keys[] =
 {
 	"URL",
 	"User",
 	"Password",
+	"VerifyPeer",
+	"VerifyHost",
 	"CACert"
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
-static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb, void *stream)
+static size_t apache_curl_callback (void *buf, size_t size, size_t nmemb,
+		void *stream)
 {
 	size_t len = size * nmemb;
 
-	if ((apache_buffer_len + len) >= ABUFFER_SIZE)
-	{
-		len = (ABUFFER_SIZE - 1) - apache_buffer_len;
-	}
-
 	if (len <= 0)
 		return (len);
 
-	memcpy (apache_buffer + apache_buffer_len, (char *) buf, len);
-	apache_buffer_len += len;
-	apache_buffer[apache_buffer_len] = '\0';
+	if ((apache_buffer_fill + len) >= apache_buffer_size)
+	{
+		char *temp;
+
+		temp = (char *) realloc (apache_buffer,
+				apache_buffer_fill + len + 1);
+		if (temp == NULL)
+		{
+			ERROR ("apache plugin: realloc failed.");
+			return (0);
+		}
+		apache_buffer = temp;
+		apache_buffer_size = apache_buffer_fill + len + 1;
+	}
+
+	memcpy (apache_buffer + apache_buffer_fill, (char *) buf, len);
+	apache_buffer_fill += len;
+	apache_buffer[apache_buffer_fill] = 0;
 
 	return (len);
 }
@@ -91,6 +106,10 @@ static int config (const char *key, const char *value)
 		return (config_set (&user, value));
 	else if (strcasecmp (key, "password") == 0)
 		return (config_set (&pass, value));
+	else if (strcasecmp (key, "verifypeer") == 0)
+		return (config_set (&verify_peer, value));
+	else if (strcasecmp (key, "verifyhost") == 0)
+		return (config_set (&verify_host, value));
 	else if (strcasecmp (key, "cacert") == 0)
 		return (config_set (&cacert, value));
 	else
@@ -127,7 +146,7 @@ static int init (void)
 	{
 		int status;
 
-		status = snprintf (credentials, sizeof (credentials), "%s:%s",
+		status = ssnprintf (credentials, sizeof (credentials), "%s:%s",
 				user, (pass == NULL) ? "" : pass);
 		if (status >= sizeof (credentials))
 		{
@@ -136,13 +155,30 @@ static int init (void)
 					"truncated.");
 			return (-1);
 		}
-		credentials[sizeof (credentials) - 1] = '\0';
 
 		curl_easy_setopt (curl, CURLOPT_USERPWD, credentials);
 	}
 
 	curl_easy_setopt (curl, CURLOPT_URL, url);
 
+	if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
+	{
+		curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);
+	}
+	else
+	{
+		curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0);
+	}
+
+	if ((verify_host == NULL) || (strcmp (verify_host, "true") == 0))
+	{
+		curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2);
+	}
+	else
+	{
+		curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0);
+	}
+
 	if (cacert != NULL)
 	{
 		curl_easy_setopt (curl, CURLOPT_CAINFO, cacert);
@@ -162,18 +198,16 @@ static void submit_counter (const char *type, const char *type_instance,
 	vl.values = values;
 	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "apache");
-	strcpy (vl.plugin_instance, "");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "apache", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
 
 	if (type_instance != NULL)
-	{
-		strncpy (vl.type_instance, type_instance,
+		sstrncpy (vl.type_instance, type_instance,
 				sizeof (vl.type_instance));
-		vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
-	}
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void submit_counter */
 
 static void submit_gauge (const char *type, const char *type_instance,
@@ -187,18 +221,16 @@ static void submit_gauge (const char *type, const char *type_instance,
 	vl.values = values;
 	vl.values_len = 1;
 	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "apache");
-	strcpy (vl.plugin_instance, "");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "apache", sizeof (vl.plugin));
+	sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
 
 	if (type_instance != NULL)
-	{
-		strncpy (vl.type_instance, type_instance,
+		sstrncpy (vl.type_instance, type_instance,
 				sizeof (vl.type_instance));
-		vl.type_instance[sizeof (vl.type_instance) - 1] = '\0';
-	}
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void submit_counter */
 
 static void submit_scoreboard (char *buf)
@@ -269,7 +301,7 @@ static int apache_read (void)
 	if (url == NULL)
 		return (-1);
 
-	apache_buffer_len = 0;
+	apache_buffer_fill = 0;
 	if (curl_easy_perform (curl) != 0)
 	{
 		ERROR ("apache: curl_easy_perform failed: %s",
@@ -312,7 +344,7 @@ static int apache_read (void)
 		}
 	}
 
-	apache_buffer_len = 0;
+	apache_buffer_fill = 0;
 
 	return (0);
 } /* int apache_read */