X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fopenldap.c;h=d424cb457557fe563ebc4cf997604d42a19ada53;hb=6fc6255c95b966014ee02a2a37666b2c4880ff8d;hp=31b47f92022149fc1b9f48d13457629a863e66dd;hpb=ce767b861935267efe5763fa4a42541e25e4751d;p=collectd.git diff --git a/src/openldap.c b/src/openldap.c index 31b47f92..d424cb45 100644 --- a/src/openldap.c +++ b/src/openldap.c @@ -1,36 +1,50 @@ /** * collectd - src/openldap.c * Copyright (C) 2011 Kimo Rosenbaum + * Copyright (C) 2014-2015 Marc Fournier * - * 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 - * Free Software Foundation; only version 2 of the License is applicable. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Authors: * Kimo Rosenbaum + * Marc Fournier **/ #include "collectd.h" + #include "common.h" #include "plugin.h" -#include "configfile.h" + +#if defined(__APPLE__) +#pragma clang diagnostic push +#pragma clang diagnostic warning "-Wdeprecated-declarations" +#endif #include #include -struct ldap_s /* {{{ */ +struct cldap_s /* {{{ */ { char *name; + char *binddn; + char *password; char *cacert; char *host; int state; @@ -41,15 +55,19 @@ struct ldap_s /* {{{ */ int version; LDAP *ld; - char *dn; }; -typedef struct ldap_s ldap_t; /* }}} */ +typedef struct cldap_s cldap_t; /* }}} */ -static void ldap_free (ldap_t *st) /* {{{ */ +static cldap_t **databases = NULL; +static size_t databases_num = 0; + +static void cldap_free (cldap_t *st) /* {{{ */ { if (st == NULL) return; + sfree (st->binddn); + sfree (st->password); sfree (st->cacert); sfree (st->host); sfree (st->name); @@ -57,19 +75,27 @@ static void ldap_free (ldap_t *st) /* {{{ */ if (st->ld) ldap_memfree (st->ld); sfree (st); -} /* }}} void ldap_free */ +} /* }}} void cldap_free */ /* initialize ldap for each host */ -static int ldap_init_host (ldap_t *st) /* {{{ */ +static int cldap_init_host (cldap_t *st) /* {{{ */ { LDAP *ld; int rc; + + if (st->state && st->ld) + { + DEBUG ("openldap plugin: Already connected to %s", st->url); + return (0); + } + rc = ldap_initialize (&ld, st->url); if (rc != LDAP_SUCCESS) { ERROR ("openldap plugin: ldap_initialize failed: %s", ldap_err2string (rc)); st->state = 0; + ldap_unbind_ext_s (ld, NULL, NULL); return (-1); } @@ -80,6 +106,8 @@ static int ldap_init_host (ldap_t *st) /* {{{ */ ldap_set_option (st->ld, LDAP_OPT_TIMEOUT, &(const struct timeval){st->timeout, 0}); + ldap_set_option (st->ld, LDAP_OPT_RESTART, LDAP_OPT_ON); + if (st->cacert != NULL) ldap_set_option (st->ld, LDAP_OPT_X_TLS_CACERTFILE, st->cacert); @@ -103,10 +131,19 @@ static int ldap_init_host (ldap_t *st) /* {{{ */ } struct berval cred; - cred.bv_val = ""; - cred.bv_len = 0; + if (st->password != NULL) + { + cred.bv_val = st->password; + cred.bv_len = strlen (st->password); + } + else + { + cred.bv_val = ""; + cred.bv_len = 0; + } - rc = ldap_sasl_bind_s (st->ld, NULL, NULL, &cred, NULL, NULL, NULL); + rc = ldap_sasl_bind_s (st->ld, st->binddn, LDAP_SASL_SIMPLE, &cred, + NULL, NULL, NULL); if (rc != LDAP_SUCCESS) { ERROR ("openldap plugin: Failed to bind to %s: %s", @@ -122,10 +159,10 @@ static int ldap_init_host (ldap_t *st) /* {{{ */ st->state = 1; return (0); } -} /* }}} static ldap_init_host */ +} /* }}} static cldap_init_host */ -static void ldap_submit_value (const char *type, const char *type_instance, /* {{{ */ - value_t value, ldap_t *st) +static void cldap_submit_value (const char *type, const char *type_instance, /* {{{ */ + value_t value, cldap_t *st) { value_list_t vl = VALUE_LIST_INIT; @@ -135,13 +172,9 @@ static void ldap_submit_value (const char *type, const char *type_instance, /* { if ((st->host == NULL) || (strcmp ("", st->host) == 0) || (strcmp ("localhost", st->host) == 0)) - { sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - } else - { sstrncpy (vl.host, st->host, sizeof (vl.host)); - } sstrncpy (vl.plugin, "openldap", sizeof (vl.plugin)); if (st->name != NULL) @@ -154,28 +187,28 @@ static void ldap_submit_value (const char *type, const char *type_instance, /* { sizeof (vl.type_instance)); plugin_dispatch_values (&vl); -} /* }}} void ldap_submit_value */ +} /* }}} void cldap_submit_value */ -static void ldap_submit_derive (const char *type, const char *type_instance, /* {{{ */ - derive_t d, ldap_t *st) +static void cldap_submit_derive (const char *type, const char *type_instance, /* {{{ */ + derive_t d, cldap_t *st) { value_t v; v.derive = d; - ldap_submit_value (type, type_instance, v, st); -} /* }}} void ldap_submit_derive */ + cldap_submit_value (type, type_instance, v, st); +} /* }}} void cldap_submit_derive */ -static void ldap_submit_gauge (const char *type, const char *type_instance, /* {{{ */ - gauge_t g, ldap_t *st) +static void cldap_submit_gauge (const char *type, const char *type_instance, /* {{{ */ + gauge_t g, cldap_t *st) { value_t v; v.gauge = g; - ldap_submit_value (type, type_instance, v, st); -} /* }}} void ldap_submit_gauge */ + cldap_submit_value (type, type_instance, v, st); +} /* }}} void cldap_submit_gauge */ -static int ldap_read_host (user_data_t *ud) /* {{{ */ +static int cldap_read_host (user_data_t *ud) /* {{{ */ { - ldap_t *st; - LDAPMessage *e, *result; + cldap_t *st; + LDAPMessage *result; char *dn; int rc; int status; @@ -192,13 +225,13 @@ static int ldap_read_host (user_data_t *ud) /* {{{ */ if ((ud == NULL) || (ud->data == NULL)) { - ERROR ("openldap plugin: ldap_read_host: Invalid user data."); + ERROR ("openldap plugin: cldap_read_host: Invalid user data."); return (-1); } - st = (ldap_t *) ud->data; + st = (cldap_t *) ud->data; - status = ldap_init_host (st); + status = cldap_init_host (st); if (status != 0) return (-1); @@ -211,10 +244,12 @@ static int ldap_read_host (user_data_t *ud) /* {{{ */ ERROR ("openldap plugin: Failed to execute search: %s", ldap_err2string (rc)); ldap_msgfree (result); + st->state = 0; + ldap_unbind_ext_s (st->ld, NULL, NULL); return (-1); } - for (e = ldap_first_entry (st->ld, result); e != NULL; + for (LDAPMessage *e = ldap_first_entry (st->ld, result); e != NULL; e = ldap_next_entry (st->ld, e)) { if ((dn = ldap_get_dn (st->ld, e)) != NULL) @@ -269,112 +304,112 @@ static int ldap_read_host (user_data_t *ud) /* {{{ */ if (strcmp (dn, "cn=Total,cn=Connections,cn=Monitor") == 0) { - ldap_submit_derive ("total_connections", NULL, + cldap_submit_derive ("total_connections", NULL, counter, st); } else if (strcmp (dn, "cn=Current,cn=Connections,cn=Monitor") == 0) { - ldap_submit_gauge ("current_connections", NULL, + cldap_submit_gauge ("current_connections", NULL, counter, st); } else if (strcmp (dn, "cn=Operations,cn=Monitor") == 0) { - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "completed", opc, st); - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "initiated", opi, st); } else if (strcmp (dn, "cn=Bind,cn=Operations,cn=Monitor") == 0) { - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "bind-completed", opc, st); - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "bind-initiated", opi, st); } else if (strcmp (dn, "cn=UnBind,cn=Operations,cn=Monitor") == 0) { - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "unbind-completed", opc, st); - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "unbind-initiated", opi, st); } else if (strcmp (dn, "cn=Search,cn=Operations,cn=Monitor") == 0) { - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "search-completed", opc, st); - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "search-initiated", opi, st); } else if (strcmp (dn, "cn=Compare,cn=Operations,cn=Monitor") == 0) { - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "compare-completed", opc, st); - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "compare-initiated", opi, st); } else if (strcmp (dn, "cn=Modify,cn=Operations,cn=Monitor") == 0) { - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "modify-completed", opc, st); - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "modify-initiated", opi, st); } else if (strcmp (dn, "cn=Modrdn,cn=Operations,cn=Monitor") == 0) { - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "modrdn-completed", opc, st); - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "modrdn-initiated", opi, st); } else if (strcmp (dn, "cn=Add,cn=Operations,cn=Monitor") == 0) { - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "add-completed", opc, st); - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "add-initiated", opi, st); } else if (strcmp (dn, "cn=Delete,cn=Operations,cn=Monitor") == 0) { - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "delete-completed", opc, st); - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "delete-initiated", opi, st); } else if (strcmp (dn, "cn=Abandon,cn=Operations,cn=Monitor") == 0) { - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "abandon-completed", opc, st); - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "abandon-initiated", opi, st); } else if (strcmp (dn, "cn=Extended,cn=Operations,cn=Monitor") == 0) { - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "extended-completed", opc, st); - ldap_submit_derive ("operations", + cldap_submit_derive ("operations", "extended-initiated", opi, st); } else if ((strncmp (dn, "cn=Database", 11) == 0) @@ -390,7 +425,7 @@ static int ldap_read_host (user_data_t *ud) /* {{{ */ olmbdb_data = *olmbdb_list[0]; ssnprintf (typeinst, sizeof (typeinst), "bdbentrycache-%s", nc_data.bv_val); - ldap_submit_gauge ("cache_size", typeinst, + cldap_submit_gauge ("cache_size", typeinst, atoll (olmbdb_data.bv_val), st); ldap_value_free_len (olmbdb_list); } @@ -401,7 +436,7 @@ static int ldap_read_host (user_data_t *ud) /* {{{ */ olmbdb_data = *olmbdb_list[0]; ssnprintf (typeinst, sizeof (typeinst), "bdbdncache-%s", nc_data.bv_val); - ldap_submit_gauge ("cache_size", typeinst, + cldap_submit_gauge ("cache_size", typeinst, atoll (olmbdb_data.bv_val), st); ldap_value_free_len (olmbdb_list); } @@ -412,7 +447,7 @@ static int ldap_read_host (user_data_t *ud) /* {{{ */ olmbdb_data = *olmbdb_list[0]; ssnprintf (typeinst, sizeof (typeinst), "bdbidlcache-%s", nc_data.bv_val); - ldap_submit_gauge ("cache_size", typeinst, + cldap_submit_gauge ("cache_size", typeinst, atoll (olmbdb_data.bv_val), st); ldap_value_free_len (olmbdb_list); } @@ -423,77 +458,77 @@ static int ldap_read_host (user_data_t *ud) /* {{{ */ "cn=Bytes,cn=Statistics,cn=Monitor") == 0) { - ldap_submit_derive ("derive", "statistics-bytes", + cldap_submit_derive ("derive", "statistics-bytes", counter, st); } else if (strcmp (dn, "cn=PDU,cn=Statistics,cn=Monitor") == 0) { - ldap_submit_derive ("derive", "statistics-pdu", + cldap_submit_derive ("derive", "statistics-pdu", counter, st); } else if (strcmp (dn, "cn=Entries,cn=Statistics,cn=Monitor") == 0) { - ldap_submit_derive ("derive", "statistics-entries", + cldap_submit_derive ("derive", "statistics-entries", counter, st); } else if (strcmp (dn, "cn=Referrals,cn=Statistics,cn=Monitor") == 0) { - ldap_submit_derive ("derive", "statistics-referrals", + cldap_submit_derive ("derive", "statistics-referrals", counter, st); } else if (strcmp (dn, "cn=Open,cn=Threads,cn=Monitor") == 0) { - ldap_submit_gauge ("threads", "threads-open", + cldap_submit_gauge ("threads", "threads-open", info, st); } else if (strcmp (dn, "cn=Starting,cn=Threads,cn=Monitor") == 0) { - ldap_submit_gauge ("threads", "threads-starting", + cldap_submit_gauge ("threads", "threads-starting", info, st); } else if (strcmp (dn, "cn=Active,cn=Threads,cn=Monitor") == 0) { - ldap_submit_gauge ("threads", "threads-active", + cldap_submit_gauge ("threads", "threads-active", info, st); } else if (strcmp (dn, "cn=Pending,cn=Threads,cn=Monitor") == 0) { - ldap_submit_gauge ("threads", "threads-pending", + cldap_submit_gauge ("threads", "threads-pending", info, st); } else if (strcmp (dn, "cn=Backload,cn=Threads,cn=Monitor") == 0) { - ldap_submit_gauge ("threads", "threads-backload", + cldap_submit_gauge ("threads", "threads-backload", info, st); } else if (strcmp (dn, "cn=Read,cn=Waiters,cn=Monitor") == 0) { - ldap_submit_derive ("derive", "waiters-read", + cldap_submit_derive ("derive", "waiters-read", counter, st); } else if (strcmp (dn, "cn=Write,cn=Waiters,cn=Monitor") == 0) { - ldap_submit_derive ("derive", "waiters-write", + cldap_submit_derive ("derive", "waiters-write", counter, st); } @@ -507,9 +542,8 @@ static int ldap_read_host (user_data_t *ud) /* {{{ */ } ldap_msgfree (result); - ldap_unbind_ext_s (st->ld, NULL, NULL); return (0); -} /* }}} int ldap_read_host */ +} /* }}} int cldap_read_host */ /* Configuration handling functions {{{ * @@ -521,19 +555,17 @@ static int ldap_read_host (user_data_t *ud) /* {{{ */ * */ -static int ldap_config_add (oconfig_item_t *ci) /* {{{ */ +static int cldap_config_add (oconfig_item_t *ci) /* {{{ */ { - ldap_t *st; - int i; + cldap_t *st; int status; - st = malloc (sizeof (*st)); + st = calloc (1, sizeof (*st)); if (st == NULL) { - ERROR ("openldap plugin: malloc failed."); + ERROR ("openldap plugin: calloc failed."); return (-1); } - memset (st, 0, sizeof (*st)); status = cf_util_get_string (ci, &st->name); if (status != 0) @@ -543,15 +575,19 @@ static int ldap_config_add (oconfig_item_t *ci) /* {{{ */ } st->starttls = 0; - st->timeout = -1; + st->timeout = (long) (CDTIME_T_TO_MS(plugin_get_interval()) / 1000); st->verifyhost = 1; st->version = LDAP_VERSION3; - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("CACert", child->key) == 0) + if (strcasecmp ("BindDN", child->key) == 0) + status = cf_util_get_string (child, &st->binddn); + else if (strcasecmp ("Password", child->key) == 0) + status = cf_util_get_string (child, &st->password); + else if (strcasecmp ("CACert", child->key) == 0) status = cf_util_get_string (child, &st->cacert); else if (strcasecmp ("StartTLS", child->key) == 0) status = cf_util_get_boolean (child, &st->starttls); @@ -587,64 +623,77 @@ static int ldap_config_add (oconfig_item_t *ci) /* {{{ */ if ((status == 0) && (st->url != NULL)) { LDAPURLDesc *ludpp; - int rc; - if ((rc = ldap_url_parse (st->url, &ludpp)) != 0) + if (ldap_url_parse (st->url, &ludpp) != 0) { ERROR ("openldap plugin: Instance `%s': " "Invalid URL: `%s'", st->name, st->url); status = -1; } - else - { + + if ((status == 0) && (ludpp->lud_host != NULL)) st->host = strdup (ludpp->lud_host); - } ldap_free_urldesc (ludpp); } if (status == 0) { - user_data_t ud; - char callback_name[3*DATA_MAX_NAME_LEN]; - - memset (&ud, 0, sizeof (ud)); - ud.data = st; - - memset (callback_name, 0, sizeof (callback_name)); - ssnprintf (callback_name, sizeof (callback_name), - "openldap/%s/%s", - (st->host != NULL) ? st->host : hostname_g, - (st->name != NULL) ? st->name : "default"), - - status = plugin_register_complex_read (/* group = */ NULL, - /* name = */ callback_name, - /* callback = */ ldap_read_host, - /* interval = */ NULL, - /* user_data = */ &ud); + cldap_t **temp; + + temp = (cldap_t **) realloc (databases, + sizeof (*databases) * (databases_num + 1)); + + if (temp == NULL) + { + ERROR ("openldap plugin: realloc failed"); + status = -1; + } + else + { + char callback_name[3*DATA_MAX_NAME_LEN] = { 0 }; + + databases = temp; + databases[databases_num] = st; + databases_num++; + + ssnprintf (callback_name, sizeof (callback_name), + "openldap/%s/%s", + (st->host != NULL) ? st->host : hostname_g, + (st->name != NULL) ? st->name : "default"); + + user_data_t ud = { + .data = st + }; + + status = plugin_register_complex_read (/* group = */ NULL, + /* name = */ callback_name, + /* callback = */ cldap_read_host, + /* interval = */ 0, + /* user_data = */ &ud); + } } if (status != 0) { - ldap_free (st); + cldap_free (st); return (-1); } return (0); -} /* }}} int ldap_config_add */ +} /* }}} int cldap_config_add */ -static int ldap_config (oconfig_item_t *ci) /* {{{ */ +static int cldap_config (oconfig_item_t *ci) /* {{{ */ { - int i; int status = 0; - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; if (strcasecmp ("Instance", child->key) == 0) - ldap_config_add (child); + cldap_config_add (child); else WARNING ("openldap plugin: The configuration option " "\"%s\" is not allowed here. Did you " @@ -654,21 +703,37 @@ static int ldap_config (oconfig_item_t *ci) /* {{{ */ } /* for (ci->children) */ return (status); -} /* }}} int ldap_config */ +} /* }}} int cldap_config */ /* }}} End of configuration handling functions */ -static int ldap_init (void) /* {{{ */ +static int cldap_init (void) /* {{{ */ { /* Initialize LDAP library while still single-threaded as recommended in * ldap_initialize(3) */ int debug_level; ldap_get_option (NULL, LDAP_OPT_DEBUG_LEVEL, &debug_level); return (0); -} /* }}} int ldap_init */ +} /* }}} int cldap_init */ + +static int cldap_shutdown (void) /* {{{ */ +{ + for (size_t i = 0; i < databases_num; i++) + if (databases[i]->ld != NULL) + ldap_unbind_ext_s (databases[i]->ld, NULL, NULL); + sfree (databases); + databases_num = 0; + + return (0); +} /* }}} int cldap_shutdown */ void module_register (void) /* {{{ */ { - plugin_register_complex_config ("openldap", ldap_config); - plugin_register_init ("openldap", ldap_init); + plugin_register_complex_config ("openldap", cldap_config); + plugin_register_init ("openldap", cldap_init); + plugin_register_shutdown ("openldap", cldap_shutdown); } /* }}} void module_register */ + +#if defined(__APPLE__) +#pragma clang diagnostic pop +#endif