--- embedaddon/sudo/plugins/sudoers/ldap.c 2012/02/21 16:23:02 1.1 +++ embedaddon/sudo/plugins/sudoers/ldap.c 2013/07/22 10:46:12 1.1.1.4 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2011 Todd C. Miller + * Copyright (c) 2003-2013 Todd C. Miller * * This code is derived from software contributed by Aaron Spangler. * @@ -20,7 +20,6 @@ #include #include -#include #include #include #ifdef STDC_HEADERS @@ -48,7 +47,6 @@ #include #include #include -#include #ifdef HAVE_LBER_H # include #endif @@ -80,6 +78,15 @@ #include "parse.h" #include "lbuf.h" +/* Older Netscape LDAP SDKs don't prototype ldapssl_set_strength() */ +#if defined(HAVE_LDAPSSL_SET_STRENGTH) && !defined(HAVE_LDAP_SSL_H) && !defined(HAVE_MPS_LDAP_SSL_H) +extern int ldapssl_set_strength(LDAP *ldap, int strength); +#endif + +#if !defined(LDAP_OPT_NETWORK_TIMEOUT) && defined(LDAP_OPT_CONNECT_TIMEOUT) +# define LDAP_OPT_NETWORK_TIMEOUT LDAP_OPT_CONNECT_TIMEOUT +#endif + #ifndef LDAP_OPT_SUCCESS # define LDAP_OPT_SUCCESS LDAP_SUCCESS #endif @@ -111,7 +118,29 @@ (var) != NULL; \ (var) = ldap_next_entry((ld), (var))) -#define DPRINTF(args, level) if (ldap_conf.debug >= level) warningx args +#if defined(__GNUC__) && __GNUC__ == 2 +# define DPRINTF1(fmt...) do { \ + if (ldap_conf.debug >= 1) \ + warningx(__VA_ARGS__); \ + sudo_debug_printf(SUDO_DEBUG_DIAG, fmt); \ +} while (0) +# define DPRINTF2(fmt...) do { \ + if (ldap_conf.debug >= 2) \ + warningx(__VA_ARGS__); \ + sudo_debug_printf(SUDO_DEBUG_INFO, fmt); \ +} while (0) +#else +# define DPRINTF1(...) do { \ + if (ldap_conf.debug >= 1) \ + warningx(__VA_ARGS__); \ + sudo_debug_printf(SUDO_DEBUG_DIAG, __VA_ARGS__); \ +} while (0) +# define DPRINTF2(...) do { \ + if (ldap_conf.debug >= 2) \ + warningx(__VA_ARGS__); \ + sudo_debug_printf(SUDO_DEBUG_INFO, __VA_ARGS__); \ +} while (0) +#endif #define CONF_BOOL 0 #define CONF_INT 1 @@ -119,17 +148,16 @@ #define CONF_LIST_STR 4 #define CONF_DEREF_VAL 5 +#define SUDO_LDAP_CLEAR 0 #define SUDO_LDAP_SSL 1 #define SUDO_LDAP_STARTTLS 2 -/* The TIMEFILTER_LENGTH includes the filter itself plus the global AND - wrapped around the user filter and the time filter when timed entries +/* The TIMEFILTER_LENGTH is the length of the filter when timed entries are used. The length is computed as follows: - 85 for the filter - + 2 * 13 for the now timestamp - + 3 for the global AND + 81 for the filter itself + + 2 * 17 for the now timestamp */ -#define TIMEFILTER_LENGTH 114 +#define TIMEFILTER_LENGTH 115 /* * The ldap_search structure implements a linked list of ldap and @@ -171,8 +199,7 @@ struct ldap_result { struct ldap_config_table { const char *conf_str; /* config file string */ - short type; /* CONF_BOOL, CONF_INT, CONF_STR */ - short connected; /* connection-specific value? */ + int type; /* CONF_BOOL, CONF_INT, CONF_STR */ int opt_val; /* LDAP_OPT_* (or -1 for sudo internal) */ void *valp; /* pointer into ldap_conf */ }; @@ -211,98 +238,109 @@ static struct ldap_config { char *tls_cipher_suite; char *tls_certfile; char *tls_keyfile; + char *tls_keypw; char *sasl_auth_id; char *rootsasl_auth_id; char *sasl_secprops; char *krb5_ccname; } ldap_conf; -static struct ldap_config_table ldap_conf_table[] = { - { "sudoers_debug", CONF_INT, FALSE, -1, &ldap_conf.debug }, - { "host", CONF_STR, FALSE, -1, &ldap_conf.host }, - { "port", CONF_INT, FALSE, -1, &ldap_conf.port }, - { "ssl", CONF_STR, FALSE, -1, &ldap_conf.ssl }, - { "sslpath", CONF_STR, FALSE, -1, &ldap_conf.tls_certfile }, - { "uri", CONF_LIST_STR, FALSE, -1, &ldap_conf.uri }, +static struct ldap_config_table ldap_conf_global[] = { + { "sudoers_debug", CONF_INT, -1, &ldap_conf.debug }, + { "host", CONF_STR, -1, &ldap_conf.host }, + { "port", CONF_INT, -1, &ldap_conf.port }, + { "ssl", CONF_STR, -1, &ldap_conf.ssl }, + { "sslpath", CONF_STR, -1, &ldap_conf.tls_certfile }, + { "uri", CONF_LIST_STR, -1, &ldap_conf.uri }, #ifdef LDAP_OPT_DEBUG_LEVEL - { "debug", CONF_INT, FALSE, LDAP_OPT_DEBUG_LEVEL, &ldap_conf.ldap_debug }, + { "debug", CONF_INT, LDAP_OPT_DEBUG_LEVEL, &ldap_conf.ldap_debug }, #endif -#ifdef LDAP_OPT_PROTOCOL_VERSION - { "ldap_version", CONF_INT, TRUE, LDAP_OPT_PROTOCOL_VERSION, - &ldap_conf.version }, -#endif #ifdef LDAP_OPT_X_TLS_REQUIRE_CERT - { "tls_checkpeer", CONF_BOOL, FALSE, LDAP_OPT_X_TLS_REQUIRE_CERT, + { "tls_checkpeer", CONF_BOOL, LDAP_OPT_X_TLS_REQUIRE_CERT, &ldap_conf.tls_checkpeer }, #else - { "tls_checkpeer", CONF_BOOL, FALSE, -1, &ldap_conf.tls_checkpeer }, + { "tls_checkpeer", CONF_BOOL, -1, &ldap_conf.tls_checkpeer }, #endif #ifdef LDAP_OPT_X_TLS_CACERTFILE - { "tls_cacertfile", CONF_STR, FALSE, LDAP_OPT_X_TLS_CACERTFILE, + { "tls_cacertfile", CONF_STR, LDAP_OPT_X_TLS_CACERTFILE, &ldap_conf.tls_cacertfile }, - { "tls_cacert", CONF_STR, FALSE, LDAP_OPT_X_TLS_CACERTFILE, + { "tls_cacert", CONF_STR, LDAP_OPT_X_TLS_CACERTFILE, &ldap_conf.tls_cacertfile }, #endif #ifdef LDAP_OPT_X_TLS_CACERTDIR - { "tls_cacertdir", CONF_STR, FALSE, LDAP_OPT_X_TLS_CACERTDIR, + { "tls_cacertdir", CONF_STR, LDAP_OPT_X_TLS_CACERTDIR, &ldap_conf.tls_cacertdir }, #endif #ifdef LDAP_OPT_X_TLS_RANDOM_FILE - { "tls_randfile", CONF_STR, FALSE, LDAP_OPT_X_TLS_RANDOM_FILE, + { "tls_randfile", CONF_STR, LDAP_OPT_X_TLS_RANDOM_FILE, &ldap_conf.tls_random_file }, #endif #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE - { "tls_ciphers", CONF_STR, FALSE, LDAP_OPT_X_TLS_CIPHER_SUITE, + { "tls_ciphers", CONF_STR, LDAP_OPT_X_TLS_CIPHER_SUITE, &ldap_conf.tls_cipher_suite }, +#elif defined(LDAP_OPT_SSL_CIPHER) + { "tls_ciphers", CONF_STR, LDAP_OPT_SSL_CIPHER, + &ldap_conf.tls_cipher_suite }, #endif #ifdef LDAP_OPT_X_TLS_CERTFILE - { "tls_cert", CONF_STR, FALSE, LDAP_OPT_X_TLS_CERTFILE, + { "tls_cert", CONF_STR, LDAP_OPT_X_TLS_CERTFILE, &ldap_conf.tls_certfile }, #else - { "tls_cert", CONF_STR, FALSE, -1, &ldap_conf.tls_certfile }, + { "tls_cert", CONF_STR, -1, &ldap_conf.tls_certfile }, #endif #ifdef LDAP_OPT_X_TLS_KEYFILE - { "tls_key", CONF_STR, FALSE, LDAP_OPT_X_TLS_KEYFILE, + { "tls_key", CONF_STR, LDAP_OPT_X_TLS_KEYFILE, &ldap_conf.tls_keyfile }, #else - { "tls_key", CONF_STR, FALSE, -1, &ldap_conf.tls_keyfile }, + { "tls_key", CONF_STR, -1, &ldap_conf.tls_keyfile }, #endif +#ifdef HAVE_LDAP_SSL_CLIENT_INIT + { "tls_keypw", CONF_STR, -1, &ldap_conf.tls_keypw }, +#endif + { "binddn", CONF_STR, -1, &ldap_conf.binddn }, + { "bindpw", CONF_STR, -1, &ldap_conf.bindpw }, + { "rootbinddn", CONF_STR, -1, &ldap_conf.rootbinddn }, + { "sudoers_base", CONF_LIST_STR, -1, &ldap_conf.base }, + { "sudoers_timed", CONF_BOOL, -1, &ldap_conf.timed }, + { "sudoers_search_filter", CONF_STR, -1, &ldap_conf.search_filter }, +#ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S + { "use_sasl", CONF_BOOL, -1, &ldap_conf.use_sasl }, + { "sasl_auth_id", CONF_STR, -1, &ldap_conf.sasl_auth_id }, + { "rootuse_sasl", CONF_BOOL, -1, &ldap_conf.rootuse_sasl }, + { "rootsasl_auth_id", CONF_STR, -1, &ldap_conf.rootsasl_auth_id }, + { "krb5_ccname", CONF_STR, -1, &ldap_conf.krb5_ccname }, +#endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */ + { NULL } +}; + +static struct ldap_config_table ldap_conf_conn[] = { +#ifdef LDAP_OPT_PROTOCOL_VERSION + { "ldap_version", CONF_INT, LDAP_OPT_PROTOCOL_VERSION, + &ldap_conf.version }, +#endif #ifdef LDAP_OPT_NETWORK_TIMEOUT - { "bind_timelimit", CONF_INT, TRUE, -1 /* needs timeval, set manually */, + { "bind_timelimit", CONF_INT, -1 /* needs timeval, set manually */, &ldap_conf.bind_timelimit }, - { "network_timeout", CONF_INT, TRUE, -1 /* needs timeval, set manually */, + { "network_timeout", CONF_INT, -1 /* needs timeval, set manually */, &ldap_conf.bind_timelimit }, #elif defined(LDAP_X_OPT_CONNECT_TIMEOUT) - { "bind_timelimit", CONF_INT, TRUE, LDAP_X_OPT_CONNECT_TIMEOUT, + { "bind_timelimit", CONF_INT, LDAP_X_OPT_CONNECT_TIMEOUT, &ldap_conf.bind_timelimit }, - { "network_timeout", CONF_INT, TRUE, LDAP_X_OPT_CONNECT_TIMEOUT, + { "network_timeout", CONF_INT, LDAP_X_OPT_CONNECT_TIMEOUT, &ldap_conf.bind_timelimit }, #endif - { "timelimit", CONF_INT, TRUE, LDAP_OPT_TIMELIMIT, &ldap_conf.timelimit }, + { "timelimit", CONF_INT, LDAP_OPT_TIMELIMIT, &ldap_conf.timelimit }, #ifdef LDAP_OPT_TIMEOUT - { "timeout", CONF_INT, TRUE, -1 /* needs timeval, set manually */, + { "timeout", CONF_INT, -1 /* needs timeval, set manually */, &ldap_conf.timeout }, #endif #ifdef LDAP_OPT_DEREF - { "deref", CONF_DEREF_VAL, TRUE, LDAP_OPT_DEREF, &ldap_conf.deref }, + { "deref", CONF_DEREF_VAL, LDAP_OPT_DEREF, &ldap_conf.deref }, #endif - { "binddn", CONF_STR, FALSE, -1, &ldap_conf.binddn }, - { "bindpw", CONF_STR, FALSE, -1, &ldap_conf.bindpw }, - { "rootbinddn", CONF_STR, FALSE, -1, &ldap_conf.rootbinddn }, - { "sudoers_base", CONF_LIST_STR, FALSE, -1, &ldap_conf.base }, - { "sudoers_timed", CONF_BOOL, FALSE, -1, &ldap_conf.timed }, - { "sudoers_search_filter", CONF_STR, FALSE, -1, &ldap_conf.search_filter }, -#ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S - { "use_sasl", CONF_BOOL, FALSE, -1, &ldap_conf.use_sasl }, - { "sasl_auth_id", CONF_STR, FALSE, -1, &ldap_conf.sasl_auth_id }, - { "rootuse_sasl", CONF_BOOL, FALSE, -1, &ldap_conf.rootuse_sasl }, - { "rootsasl_auth_id", CONF_STR, FALSE, -1, &ldap_conf.rootsasl_auth_id }, -# ifdef LDAP_OPT_X_SASL_SECPROPS - { "sasl_secprops", CONF_STR, TRUE, LDAP_OPT_X_SASL_SECPROPS, +#ifdef LDAP_OPT_X_SASL_SECPROPS + { "sasl_secprops", CONF_STR, LDAP_OPT_X_SASL_SECPROPS, &ldap_conf.sasl_secprops }, -# endif - { "krb5_ccname", CONF_STR, FALSE, -1, &ldap_conf.krb5_ccname }, -#endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */ +#endif { NULL } }; @@ -362,10 +400,11 @@ sudo_ldap_conf_add_ports(void) char *host, *port, defport[13]; char hostbuf[LINE_MAX * 2]; + debug_decl(sudo_ldap_conf_add_ports, SUDO_DEBUG_LDAP) hostbuf[0] = '\0'; if (snprintf(defport, sizeof(defport), ":%d", ldap_conf.port) >= sizeof(defport)) - errorx(1, _("sudo_ldap_conf_add_ports: port too large")); + fatalx(_("sudo_ldap_conf_add_ports: port too large")); for ((host = strtok(ldap_conf.host, " \t")); host; (host = strtok(NULL, " \t"))) { if (hostbuf[0] != '\0') { @@ -385,10 +424,10 @@ sudo_ldap_conf_add_ports(void) efree(ldap_conf.host); ldap_conf.host = estrdup(hostbuf); - return; + debug_return; toobig: - errorx(1, _("sudo_ldap_conf_add_ports: out of space expanding hostbuf")); + fatalx(_("sudo_ldap_conf_add_ports: out of space expanding hostbuf")); } #endif @@ -405,6 +444,7 @@ sudo_ldap_parse_uri(const struct ldap_config_list_str char hostbuf[LINE_MAX]; int nldap = 0, nldaps = 0; int rc = -1; + debug_decl(sudo_ldap_parse_uri, SUDO_DEBUG_LDAP) do { buf = estrdup(uri_list->val); @@ -446,7 +486,7 @@ sudo_ldap_parse_uri(const struct ldap_config_list_str } } if (hostbuf[0] == '\0') { - warningx(_("invalid uri: %s"), uri_list); + warningx(_("invalid uri: %s"), uri_list->val); goto done; } @@ -472,10 +512,10 @@ sudo_ldap_parse_uri(const struct ldap_config_list_str done: efree(buf); - return rc; + debug_return_int(rc); toobig: - errorx(1, _("sudo_ldap_parse_uri: out of space building hostbuf")); + fatalx(_("sudo_ldap_parse_uri: out of space building hostbuf")); } #else static char * @@ -484,10 +524,11 @@ sudo_ldap_join_uri(struct ldap_config_list_str *uri_li struct ldap_config_list_str *uri; size_t len = 0; char *buf, *cp; + debug_decl(sudo_ldap_join_uri, SUDO_DEBUG_LDAP) /* Usually just a single entry. */ if (uri_list->next == NULL) - return estrdup(uri_list->val); + debug_return_str(estrdup(uri_list->val)); for (uri = uri_list; uri != NULL; uri = uri->next) { len += strlen(uri->val) + 1; @@ -499,7 +540,7 @@ sudo_ldap_join_uri(struct ldap_config_list_str *uri_li *cp++ = ' '; } cp[-1] = '\0'; - return buf; + debug_return_str(buf); } #endif /* HAVE_LDAP_INITIALIZE */ @@ -508,118 +549,148 @@ sudo_ldap_init(LDAP **ldp, const char *host, int port) { LDAP *ld = NULL; int rc = LDAP_CONNECT_ERROR; + debug_decl(sudo_ldap_init, SUDO_DEBUG_LDAP) #ifdef HAVE_LDAPSSL_INIT - if (ldap_conf.ssl_mode == SUDO_LDAP_SSL) { - DPRINTF(("ldapssl_clientauth_init(%s, %s)", + if (ldap_conf.ssl_mode != SUDO_LDAP_CLEAR) { + const int defsecure = ldap_conf.ssl_mode == SUDO_LDAP_SSL; + DPRINTF2("ldapssl_clientauth_init(%s, %s)", ldap_conf.tls_certfile ? ldap_conf.tls_certfile : "NULL", - ldap_conf.tls_keyfile ? ldap_conf.tls_keyfile : "NULL"), 2); + ldap_conf.tls_keyfile ? ldap_conf.tls_keyfile : "NULL"); rc = ldapssl_clientauth_init(ldap_conf.tls_certfile, NULL, ldap_conf.tls_keyfile != NULL, ldap_conf.tls_keyfile, NULL); /* - * Mozilla-derived SDKs have a bug starting with version 5.0 - * where the path can no longer be a file name and must be a dir. + * Starting with version 5.0, Mozilla-derived LDAP SDKs require + * the cert and key paths to be a directory, not a file. + * If the user specified a file and it fails, try the parent dir. */ if (rc != LDAP_SUCCESS) { - char *cp; - if (ldap_conf.tls_certfile) { - cp = strrchr(ldap_conf.tls_certfile, '/'); - if (cp != NULL && strncmp(cp + 1, "cert", 4) == 0) + bool retry = false; + if (ldap_conf.tls_certfile != NULL) { + char *cp = strrchr(ldap_conf.tls_certfile, '/'); + if (cp != NULL && strncmp(cp + 1, "cert", 4) == 0) { *cp = '\0'; + retry = true; + } } - if (ldap_conf.tls_keyfile) { - cp = strrchr(ldap_conf.tls_keyfile, '/'); - if (cp != NULL && strncmp(cp + 1, "key", 3) == 0) + if (ldap_conf.tls_keyfile != NULL) { + char *cp = strrchr(ldap_conf.tls_keyfile, '/'); + if (cp != NULL && strncmp(cp + 1, "key", 3) == 0) { *cp = '\0'; + retry = true; + } } - DPRINTF(("ldapssl_clientauth_init(%s, %s)", - ldap_conf.tls_certfile ? ldap_conf.tls_certfile : "NULL", - ldap_conf.tls_keyfile ? ldap_conf.tls_keyfile : "NULL"), 2); - rc = ldapssl_clientauth_init(ldap_conf.tls_certfile, NULL, - ldap_conf.tls_keyfile != NULL, ldap_conf.tls_keyfile, NULL); - if (rc != LDAP_SUCCESS) { - warningx(_("unable to initialize SSL cert and key db: %s"), - ldapssl_err2string(rc)); - goto done; + if (retry) { + DPRINTF2("ldapssl_clientauth_init(%s, %s)", + ldap_conf.tls_certfile ? ldap_conf.tls_certfile : "NULL", + ldap_conf.tls_keyfile ? ldap_conf.tls_keyfile : "NULL"); + rc = ldapssl_clientauth_init(ldap_conf.tls_certfile, NULL, + ldap_conf.tls_keyfile != NULL, ldap_conf.tls_keyfile, NULL); } } + if (rc != LDAP_SUCCESS) { + warningx(_("unable to initialize SSL cert and key db: %s"), + ldapssl_err2string(rc)); + if (ldap_conf.tls_certfile == NULL) + warningx(_("you must set TLS_CERT in %s to use SSL"), + path_ldap_conf); + goto done; + } - DPRINTF(("ldapssl_init(%s, %d, 1)", host, port), 2); - if ((ld = ldapssl_init(host, port, 1)) != NULL) + DPRINTF2("ldapssl_init(%s, %d, %d)", host, port, defsecure); + if ((ld = ldapssl_init(host, port, defsecure)) != NULL) rc = LDAP_SUCCESS; } else +#elif defined(HAVE_LDAP_SSL_INIT) && defined(HAVE_LDAP_SSL_CLIENT_INIT) + if (ldap_conf.ssl_mode == SUDO_LDAP_SSL) { + if (ldap_ssl_client_init(ldap_conf.tls_keyfile, ldap_conf.tls_keypw, 0, &rc) != LDAP_SUCCESS) { + warningx("ldap_ssl_client_init(): %s", ldap_err2string(rc)); + debug_return_int(-1); + } + DPRINTF2("ldap_ssl_init(%s, %d, NULL)", host, port); + if ((ld = ldap_ssl_init((char *)host, port, NULL)) != NULL) + rc = LDAP_SUCCESS; + } else #endif { #ifdef HAVE_LDAP_CREATE - DPRINTF(("ldap_create()"), 2); + DPRINTF2("ldap_create()"); if ((rc = ldap_create(&ld)) != LDAP_SUCCESS) goto done; - DPRINTF(("ldap_set_option(LDAP_OPT_HOST_NAME, %s)", host), 2); + DPRINTF2("ldap_set_option(LDAP_OPT_HOST_NAME, %s)", host); rc = ldap_set_option(ld, LDAP_OPT_HOST_NAME, host); #else - DPRINTF(("ldap_init(%s, %d)", host, port), 2); - if ((ld = ldap_init(host, port)) != NULL) + DPRINTF2("ldap_init(%s, %d)", host, port); + if ((ld = ldap_init((char *)host, port)) != NULL) rc = LDAP_SUCCESS; #endif } done: *ldp = ld; - return rc; + debug_return_int(rc); } /* - * Walk through search results and return TRUE if we have a matching - * netgroup, else FALSE. + * Walk through search results and return true if we have a matching + * non-Unix group (including netgroups), else false. */ -static int -sudo_ldap_check_user_netgroup(LDAP *ld, LDAPMessage *entry, char *user) +static bool +sudo_ldap_check_non_unix_group(LDAP *ld, LDAPMessage *entry, struct passwd *pw) { struct berval **bv, **p; char *val; - int ret = FALSE; + int ret = false; + debug_decl(sudo_ldap_check_non_unix_group, SUDO_DEBUG_LDAP) if (!entry) - return ret; + debug_return_bool(ret); /* get the values from the entry */ bv = ldap_get_values_len(ld, entry, "sudoUser"); if (bv == NULL) - return ret; + debug_return_bool(ret); /* walk through values */ for (p = bv; *p != NULL && !ret; p++) { val = (*p)->bv_val; - /* match any */ - if (netgr_matches(val, NULL, NULL, user)) - ret = TRUE; - DPRINTF(("ldap sudoUser netgroup '%s' ... %s", val, - ret ? "MATCH!" : "not"), 2 + ((ret) ? 0 : 1)); + if (*val == '+') { + if (netgr_matches(val, NULL, NULL, pw->pw_name)) + ret = true; + DPRINTF2("ldap sudoUser netgroup '%s' ... %s", val, + ret ? "MATCH!" : "not"); + } else { + if (group_plugin_query(pw->pw_name, val + 2, pw)) + ret = true; + DPRINTF2("ldap sudoUser non-Unix group '%s' ... %s", val, + ret ? "MATCH!" : "not"); + } } ldap_value_free_len(bv); /* cleanup */ - return ret; + debug_return_bool(ret); } /* - * Walk through search results and return TRUE if we have a - * host match, else FALSE. - */ -static int +* Walk through search results and return true if we have a +* host match, else false. +*/ +static bool sudo_ldap_check_host(LDAP *ld, LDAPMessage *entry) { struct berval **bv, **p; char *val; - int ret = FALSE; + bool ret = false; + debug_decl(sudo_ldap_check_host, SUDO_DEBUG_LDAP) if (!entry) - return ret; + debug_return_bool(ret); /* get the values from the entry */ bv = ldap_get_values_len(ld, entry, "sudoHost"); if (bv == NULL) - return ret; + debug_return_bool(ret); /* walk through values */ for (p = bv; *p != NULL && !ret; p++) { @@ -628,14 +699,13 @@ sudo_ldap_check_host(LDAP *ld, LDAPMessage *entry) if (!strcmp(val, "ALL") || addr_matches(val) || netgr_matches(val, user_host, user_shost, NULL) || hostname_matches(user_shost, user_host, val)) - ret = TRUE; - DPRINTF(("ldap sudoHost '%s' ... %s", val, - ret ? "MATCH!" : "not"), 2); + ret = true; + DPRINTF2("ldap sudoHost '%s' ... %s", val, ret ? "MATCH!" : "not"); } ldap_value_free_len(bv); /* cleanup */ - return ret; + debug_return_bool(ret); } static int @@ -643,10 +713,11 @@ sudo_ldap_check_runas_user(LDAP *ld, LDAPMessage *entr { struct berval **bv, **p; char *val; - int ret = FALSE; + bool ret = false; + debug_decl(sudo_ldap_check_runas_user, SUDO_DEBUG_LDAP) if (!runas_pw) - return UNSPEC; + debug_return_bool(UNSPEC); /* get the runas user from the entry */ bv = ldap_get_values_len(ld, entry, "sudoRunAsUser"); @@ -675,7 +746,7 @@ sudo_ldap_check_runas_user(LDAP *ld, LDAPMessage *entr * what the user specified on the command line. */ if (bv == NULL) - return !strcasecmp(runas_pw->pw_name, def_runas_default); + debug_return_bool(!strcasecmp(runas_pw->pw_name, def_runas_default)); /* walk through values returned, looking for a match */ for (p = bv; *p != NULL && !ret; p++) { @@ -683,30 +754,29 @@ sudo_ldap_check_runas_user(LDAP *ld, LDAPMessage *entr switch (val[0]) { case '+': if (netgr_matches(val, NULL, NULL, runas_pw->pw_name)) - ret = TRUE; + ret = true; break; case '%': if (usergr_matches(val, runas_pw->pw_name, runas_pw)) - ret = TRUE; + ret = true; break; case 'A': if (strcmp(val, "ALL") == 0) { - ret = TRUE; + ret = true; break; } /* FALLTHROUGH */ default: - if (strcasecmp(val, runas_pw->pw_name) == 0) - ret = TRUE; + if (userpw_matches(val, runas_pw->pw_name, runas_pw)) + ret = true; break; } - DPRINTF(("ldap sudoRunAsUser '%s' ... %s", val, - ret ? "MATCH!" : "not"), 2); + DPRINTF2("ldap sudoRunAsUser '%s' ... %s", val, ret ? "MATCH!" : "not"); } ldap_value_free_len(bv); /* cleanup */ - return ret; + debug_return_bool(ret); } static int @@ -714,84 +784,151 @@ sudo_ldap_check_runas_group(LDAP *ld, LDAPMessage *ent { struct berval **bv, **p; char *val; - int ret = FALSE; + bool ret = false; + debug_decl(sudo_ldap_check_runas_group, SUDO_DEBUG_LDAP) /* runas_gr is only set if the user specified the -g flag */ if (!runas_gr) - return UNSPEC; + debug_return_bool(UNSPEC); /* get the values from the entry */ bv = ldap_get_values_len(ld, entry, "sudoRunAsGroup"); if (bv == NULL) - return ret; + debug_return_bool(ret); /* walk through values returned, looking for a match */ for (p = bv; *p != NULL && !ret; p++) { val = (*p)->bv_val; if (strcmp(val, "ALL") == 0 || group_matches(val, runas_gr)) - ret = TRUE; - DPRINTF(("ldap sudoRunAsGroup '%s' ... %s", val, - ret ? "MATCH!" : "not"), 2); + ret = true; + DPRINTF2("ldap sudoRunAsGroup '%s' ... %s", + val, ret ? "MATCH!" : "not"); } ldap_value_free_len(bv); /* cleanup */ - return ret; + debug_return_bool(ret); } /* - * Walk through search results and return TRUE if we have a runas match, - * else FALSE. RunAs info is optional. + * Walk through search results and return true if we have a runas match, + * else false. RunAs info is optional. */ -static int +static bool sudo_ldap_check_runas(LDAP *ld, LDAPMessage *entry) { - int ret; + bool ret; + debug_decl(sudo_ldap_check_runas, SUDO_DEBUG_LDAP) if (!entry) - return FALSE; + debug_return_bool(false); - ret = sudo_ldap_check_runas_user(ld, entry) != FALSE && - sudo_ldap_check_runas_group(ld, entry) != FALSE; + ret = sudo_ldap_check_runas_user(ld, entry) != false && + sudo_ldap_check_runas_group(ld, entry) != false; - return ret; + debug_return_bool(ret); } +static struct sudo_digest * +sudo_ldap_extract_digest(char **cmnd, struct sudo_digest *digest) +{ + char *ep, *cp = *cmnd; + int digest_type = SUDO_DIGEST_INVALID; + debug_decl(sudo_ldap_check_command, SUDO_DEBUG_LDAP) + + /* + * Check for and extract a digest prefix, e.g. + * sha224:d06a2617c98d377c250edd470fd5e576327748d82915d6e33b5f8db1 /bin/ls + */ + if (cp[0] == 's' && cp[1] == 'h' && cp[2] == 'a') { + switch (cp[3]) { + case '2': + if (cp[4] == '2' && cp[5] == '4') + digest_type = SUDO_DIGEST_SHA224; + else if (cp[4] == '5' && cp[5] == '6') + digest_type = SUDO_DIGEST_SHA256; + break; + case '3': + if (cp[4] == '8' && cp[5] == '4') + digest_type = SUDO_DIGEST_SHA384; + break; + case '5': + if (cp[4] == '1' && cp[5] == '2') + digest_type = SUDO_DIGEST_SHA512; + break; + } + if (digest_type != SUDO_DIGEST_INVALID) { + cp += 6; + while (isblank((unsigned char)*cp)) + cp++; + if (*cp == ':') { + cp++; + while (isblank((unsigned char)*cp)) + cp++; + ep = cp; + while (*ep != '\0' && !isblank((unsigned char)*ep)) + ep++; + if (*ep != '\0') { + digest->digest_type = digest_type; + digest->digest_str = estrndup(cp, (size_t)(ep - cp)); + cp = ep + 1; + while (isblank((unsigned char)*cp)) + cp++; + *cmnd = cp; + DPRINTF1("%s digest %s for %s", + digest_type == SUDO_DIGEST_SHA224 ? "sha224" : + digest_type == SUDO_DIGEST_SHA256 ? "sha256" : + digest_type == SUDO_DIGEST_SHA384 ? "sha384" : + "sha512", digest->digest_str, cp); + debug_return_ptr(digest); + } + } + } + } + debug_return_ptr(NULL); +} + /* - * Walk through search results and return TRUE if we have a command match, - * FALSE if disallowed and UNSPEC if not matched. + * Walk through search results and return true if we have a command match, + * false if disallowed and UNSPEC if not matched. */ static int sudo_ldap_check_command(LDAP *ld, LDAPMessage *entry, int *setenv_implied) { + struct sudo_digest digest, *allowed_digest = NULL; struct berval **bv, **p; char *allowed_cmnd, *allowed_args, *val; - int foundbang, ret = UNSPEC; + bool foundbang; + int ret = UNSPEC; + debug_decl(sudo_ldap_check_command, SUDO_DEBUG_LDAP) if (!entry) - return ret; + debug_return_bool(ret); bv = ldap_get_values_len(ld, entry, "sudoCommand"); if (bv == NULL) - return ret; + debug_return_bool(ret); - for (p = bv; *p != NULL && ret != FALSE; p++) { + for (p = bv; *p != NULL && ret != false; p++) { val = (*p)->bv_val; /* Match against ALL ? */ if (!strcmp(val, "ALL")) { - ret = TRUE; + ret = true; if (setenv_implied != NULL) - *setenv_implied = TRUE; - DPRINTF(("ldap sudoCommand '%s' ... MATCH!", val), 2); + *setenv_implied = true; + DPRINTF2("ldap sudoCommand '%s' ... MATCH!", val); continue; } + /* check for sha-2 digest */ + allowed_digest = sudo_ldap_extract_digest(&val, &digest); + /* check for !command */ if (*val == '!') { - foundbang = TRUE; + foundbang = true; allowed_cmnd = estrdup(1 + val); /* !command */ } else { - foundbang = FALSE; + foundbang = false; allowed_cmnd = estrdup(val); /* command */ } @@ -801,27 +938,29 @@ sudo_ldap_check_command(LDAP *ld, LDAPMessage *entry, *allowed_args++ = '\0'; /* check the command like normal */ - if (command_matches(allowed_cmnd, allowed_args)) { + if (command_matches(allowed_cmnd, allowed_args, allowed_digest)) { /* * If allowed (no bang) set ret but keep on checking. * If disallowed (bang), exit loop. */ - ret = foundbang ? FALSE : TRUE; + ret = foundbang ? false : true; } - DPRINTF(("ldap sudoCommand '%s' ... %s", val, - ret == TRUE ? "MATCH!" : "not"), 2); + DPRINTF2("ldap sudoCommand '%s' ... %s", + val, ret == true ? "MATCH!" : "not"); efree(allowed_cmnd); /* cleanup */ + if (allowed_digest != NULL) + efree(allowed_digest->digest_str); } ldap_value_free_len(bv); /* more cleanup */ - return ret; + debug_return_bool(ret); } /* * Search for boolean "option" in sudoOption. - * Returns TRUE if found and allowed, FALSE if negated, else UNSPEC. + * Returns true if found and allowed, false if negated, else UNSPEC. */ static int sudo_ldap_check_bool(LDAP *ld, LDAPMessage *entry, char *option) @@ -829,18 +968,19 @@ sudo_ldap_check_bool(LDAP *ld, LDAPMessage *entry, cha struct berval **bv, **p; char ch, *var; int ret = UNSPEC; + debug_decl(sudo_ldap_check_bool, SUDO_DEBUG_LDAP) if (entry == NULL) - return UNSPEC; + debug_return_bool(ret); bv = ldap_get_values_len(ld, entry, "sudoOption"); if (bv == NULL) - return ret; + debug_return_bool(ret); /* walk through options */ for (p = bv; *p != NULL; p++) { var = (*p)->bv_val;; - DPRINTF(("ldap sudoOption: '%s'", var), 2); + DPRINTF2("ldap sudoOption: '%s'", var); if ((ch = *var) == '!') var++; @@ -850,7 +990,7 @@ sudo_ldap_check_bool(LDAP *ld, LDAPMessage *entry, cha ldap_value_free_len(bv); - return ret; + debug_return_bool(ret); } /* @@ -862,18 +1002,19 @@ sudo_ldap_parse_options(LDAP *ld, LDAPMessage *entry) { struct berval **bv, **p; char op, *var, *val; + debug_decl(sudo_ldap_parse_options, SUDO_DEBUG_LDAP) if (entry == NULL) - return; + debug_return; bv = ldap_get_values_len(ld, entry, "sudoOption"); if (bv == NULL) - return; + debug_return; /* walk through options */ for (p = bv; *p != NULL; p++) { var = estrdup((*p)->bv_val); - DPRINTF(("ldap sudoOption: '%s'", var), 2); + DPRINTF2("ldap sudoOption: '%s'", var); /* check for equals sign past first char */ val = strchr(var, '='); @@ -886,19 +1027,21 @@ sudo_ldap_parse_options(LDAP *ld, LDAPMessage *entry) set_default(var, val, (int) op); } else { /* case var=val */ - set_default(var, val, TRUE); + set_default(var, val, true); } } else if (*var == '!') { /* case !var Boolean False */ - set_default(var + 1, NULL, FALSE); + set_default(var + 1, NULL, false); } else { /* case var Boolean True */ - set_default(var, NULL, TRUE); + set_default(var, NULL, true); } efree(var); } ldap_value_free_len(bv); + + debug_return; } /* @@ -928,8 +1071,9 @@ sudo_ldap_timefilter(char *buffer, size_t buffersize) { struct tm *tp; time_t now; - char timebuffer[16]; + char timebuffer[sizeof("20120727121554.0Z")]; int bytes = 0; + debug_decl(sudo_ldap_timefilter, SUDO_DEBUG_LDAP) /* Make sure we have a formatted timestamp for __now__. */ time(&now); @@ -939,8 +1083,8 @@ sudo_ldap_timefilter(char *buffer, size_t buffersize) } /* Format the timestamp according to the RFC. */ - if (strftime(timebuffer, sizeof(timebuffer), "%Y%m%d%H%M%SZ", tp) == 0) { - warning(_("unable to format timestamp")); + if (strftime(timebuffer, sizeof(timebuffer), "%Y%m%d%H%M%S.0Z", tp) == 0) { + warningx(_("unable to format timestamp")); goto done; } @@ -953,53 +1097,158 @@ sudo_ldap_timefilter(char *buffer, size_t buffersize) } done: - return bytes; + debug_return_int(bytes); } /* * Builds up a filter to search for default settings */ static char * -sudo_ldap_build_default_filter() +sudo_ldap_build_default_filter(void) { char *filt; + debug_decl(sudo_ldap_build_default_filter, SUDO_DEBUG_LDAP) if (ldap_conf.search_filter) easprintf(&filt, "(&%s(cn=defaults))", ldap_conf.search_filter); else filt = estrdup("cn=defaults"); - return filt; + debug_return_str(filt); } /* + * Determine length of query value after escaping characters + * as per RFC 4515. + */ +static size_t +sudo_ldap_value_len(const char *value) +{ + const char *s; + size_t len = 0; + + for (s = value; *s != '\0'; s++) { + switch (*s) { + case '\\': + case '(': + case ')': + case '*': + len += 2; + break; + } + } + len += (size_t)(s - value); + return len; +} + +/* + * Like strlcat() but escapes characters as per RFC 4515. + */ +static size_t +sudo_ldap_value_cat(char *dst, const char *src, size_t size) +{ + char *d = dst; + const char *s = src; + size_t n = size; + size_t dlen; + + /* Find the end of dst and adjust bytes left but don't go past end */ + while (n-- != 0 && *d != '\0') + d++; + dlen = d - dst; + n = size - dlen; + + if (n == 0) + return dlen + strlen(s); + while (*s != '\0') { + switch (*s) { + case '\\': + if (n < 3) + goto done; + *d++ = '\\'; + *d++ = '5'; + *d++ = 'c'; + n -= 3; + break; + case '(': + if (n < 3) + goto done; + *d++ = '\\'; + *d++ = '2'; + *d++ = '8'; + n -= 3; + break; + case ')': + if (n < 3) + goto done; + *d++ = '\\'; + *d++ = '2'; + *d++ = '9'; + n -= 3; + break; + case '*': + if (n < 3) + goto done; + *d++ = '\\'; + *d++ = '2'; + *d++ = 'a'; + n -= 3; + break; + default: + if (n < 1) + goto done; + *d++ = *s; + n--; + break; + } + s++; + } +done: + *d = '\0'; + while (*s != '\0') + s++; + return dlen + (s - src); /* count does not include NUL */ +} + +/* * Builds up a filter to check against LDAP. */ static char * sudo_ldap_build_pass1(struct passwd *pw) { struct group *grp; - char *buf, timebuffer[TIMEFILTER_LENGTH]; + char *buf, timebuffer[TIMEFILTER_LENGTH + 1], gidbuf[MAX_UID_T_LEN + 1]; struct group_list *grlist; size_t sz = 0; int i; + debug_decl(sudo_ldap_build_pass1, SUDO_DEBUG_LDAP) - /* Start with LDAP search filter length + 3 */ + /* If there is a filter, allocate space for the global AND. */ + if (ldap_conf.timed || ldap_conf.search_filter) + sz += 3; + + /* Add LDAP search filter if present. */ if (ldap_conf.search_filter) - sz += strlen(ldap_conf.search_filter) + 3; + sz += strlen(ldap_conf.search_filter); /* Then add (|(sudoUser=USERNAME)(sudoUser=ALL)) + NUL */ - sz += 29 + strlen(pw->pw_name); + sz += 29 + sudo_ldap_value_len(pw->pw_name); - /* Add space for primary and supplementary groups */ + /* Add space for primary and supplementary groups and gids */ if ((grp = sudo_getgrgid(pw->pw_gid)) != NULL) { - sz += 12 + strlen(grp->gr_name); + sz += 12 + sudo_ldap_value_len(grp->gr_name); } - if ((grlist = get_group_list(pw)) != NULL) { + sz += 13 + MAX_UID_T_LEN; + if ((grlist = sudo_get_grlist(pw)) != NULL) { for (i = 0; i < grlist->ngroups; i++) { if (grp != NULL && strcasecmp(grlist->groups[i], grp->gr_name) == 0) continue; - sz += 12 + strlen(grlist->groups[i]); + sz += 12 + sudo_ldap_value_len(grlist->groups[i]); } + for (i = 0; i < grlist->ngids; i++) { + if (pw->pw_gid == grlist->gids[i]) + continue; + sz += 13 + MAX_UID_T_LEN; + } } /* If timed, add space for time limits. */ @@ -1020,36 +1269,49 @@ sudo_ldap_build_pass1(struct passwd *pw) /* Global OR + sudoUser=user_name filter */ (void) strlcat(buf, "(|(sudoUser=", sz); - (void) strlcat(buf, pw->pw_name, sz); + (void) sudo_ldap_value_cat(buf, pw->pw_name, sz); (void) strlcat(buf, ")", sz); - /* Append primary group */ + /* Append primary group and gid */ if (grp != NULL) { (void) strlcat(buf, "(sudoUser=%", sz); - (void) strlcat(buf, grp->gr_name, sz); + (void) sudo_ldap_value_cat(buf, grp->gr_name, sz); (void) strlcat(buf, ")", sz); } + (void) snprintf(gidbuf, sizeof(gidbuf), "%u", (unsigned int)pw->pw_gid); + (void) strlcat(buf, "(sudoUser=%#", sz); + (void) strlcat(buf, gidbuf, sz); + (void) strlcat(buf, ")", sz); - /* Append supplementary groups */ + /* Append supplementary groups and gids */ if (grlist != NULL) { for (i = 0; i < grlist->ngroups; i++) { if (grp != NULL && strcasecmp(grlist->groups[i], grp->gr_name) == 0) continue; (void) strlcat(buf, "(sudoUser=%", sz); - (void) strlcat(buf, grlist->groups[i], sz); + (void) sudo_ldap_value_cat(buf, grlist->groups[i], sz); (void) strlcat(buf, ")", sz); } + for (i = 0; i < grlist->ngids; i++) { + if (pw->pw_gid == grlist->gids[i]) + continue; + (void) snprintf(gidbuf, sizeof(gidbuf), "%u", + (unsigned int)grlist->gids[i]); + (void) strlcat(buf, "(sudoUser=%#", sz); + (void) strlcat(buf, gidbuf, sz); + (void) strlcat(buf, ")", sz); + } } /* Done with groups. */ if (grlist != NULL) - grlist_delref(grlist); + sudo_grlist_delref(grlist); if (grp != NULL) - gr_delref(grp); + sudo_gr_delref(grp); /* Add ALL to list and end the global OR */ if (strlcat(buf, "(sudoUser=ALL)", sz) >= sz) - errorx(1, _("sudo_ldap_build_pass1 allocation mismatch")); + fatalx(_("sudo_ldap_build_pass1 allocation mismatch")); /* Add the time restriction, or simply end the global OR. */ if (ldap_conf.timed) { @@ -1061,32 +1323,42 @@ sudo_ldap_build_pass1(struct passwd *pw) } strlcat(buf, ")", sz); /* closes the global OR or the global AND */ - return buf; + debug_return_str(buf); } /* - * Builds up a filter to check against netgroup entries in LDAP. + * Builds up a filter to check against non-Unix group + * entries in LDAP, including netgroups. */ static char * sudo_ldap_build_pass2(void) { - char *filt, timebuffer[TIMEFILTER_LENGTH]; + char *filt, timebuffer[TIMEFILTER_LENGTH + 1]; + debug_decl(sudo_ldap_build_pass2, SUDO_DEBUG_LDAP) if (ldap_conf.timed) sudo_ldap_timefilter(timebuffer, sizeof(timebuffer)); /* - * Match all sudoUsers beginning with a '+'. + * Match all sudoUsers beginning with '+' or '%:'. * If a search filter or time restriction is specified, * those get ANDed in to the expression. */ - easprintf(&filt, "%s%s(sudoUser=+*)%s%s", - (ldap_conf.timed || ldap_conf.search_filter) ? "(&" : "", - ldap_conf.search_filter ? ldap_conf.search_filter : "", - ldap_conf.timed ? timebuffer : "", - (ldap_conf.timed || ldap_conf.search_filter) ? ")" : ""); + if (def_group_plugin) { + easprintf(&filt, "%s%s(|(sudoUser=+*)(sudoUser=%%:*))%s%s", + (ldap_conf.timed || ldap_conf.search_filter) ? "(&" : "", + ldap_conf.search_filter ? ldap_conf.search_filter : "", + ldap_conf.timed ? timebuffer : "", + (ldap_conf.timed || ldap_conf.search_filter) ? ")" : ""); + } else { + easprintf(&filt, "%s%s(sudoUser=+*)%s%s", + (ldap_conf.timed || ldap_conf.search_filter) ? "(&" : "", + ldap_conf.search_filter ? ldap_conf.search_filter : "", + ldap_conf.timed ? timebuffer : "", + (ldap_conf.timed || ldap_conf.search_filter) ? ")" : ""); + } - return filt; + debug_return_str(filt); } static void @@ -1094,8 +1366,9 @@ sudo_ldap_read_secret(const char *path) { FILE *fp; char buf[LINE_MAX], *cp; + debug_decl(sudo_ldap_read_secret, SUDO_DEBUG_LDAP) - if ((fp = fopen(_PATH_LDAP_SECRET, "r")) != NULL) { + if ((fp = fopen(path_ldap_secret, "r")) != NULL) { if (fgets(buf, sizeof(buf), fp) != NULL) { if ((cp = strchr(buf, '\n')) != NULL) *cp = '\0'; @@ -1108,14 +1381,73 @@ sudo_ldap_read_secret(const char *path) } fclose(fp); } + debug_return; } -static int +/* + * Look up keyword in config tables. + * Returns true if found, else false. + */ +static bool +sudo_ldap_parse_keyword(const char *keyword, const char *value, + struct ldap_config_table *table) +{ + struct ldap_config_table *cur; + debug_decl(sudo_ldap_parse_keyword, SUDO_DEBUG_LDAP) + + /* Look up keyword in config tables */ + for (cur = table; cur->conf_str != NULL; cur++) { + if (strcasecmp(keyword, cur->conf_str) == 0) { + switch (cur->type) { + case CONF_DEREF_VAL: + if (strcasecmp(value, "searching") == 0) + *(int *)(cur->valp) = LDAP_DEREF_SEARCHING; + else if (strcasecmp(value, "finding") == 0) + *(int *)(cur->valp) = LDAP_DEREF_FINDING; + else if (strcasecmp(value, "always") == 0) + *(int *)(cur->valp) = LDAP_DEREF_ALWAYS; + else + *(int *)(cur->valp) = LDAP_DEREF_NEVER; + break; + case CONF_BOOL: + *(int *)(cur->valp) = atobool(value) == true; + break; + case CONF_INT: + *(int *)(cur->valp) = atoi(value); + break; + case CONF_STR: + efree(*(char **)(cur->valp)); + *(char **)(cur->valp) = estrdup(value); + break; + case CONF_LIST_STR: + { + struct ldap_config_list_str **p; + size_t len = strlen(value); + + if (len > 0) { + p = (struct ldap_config_list_str **)cur->valp; + while (*p != NULL) + p = &(*p)->next; + *p = emalloc(sizeof(struct ldap_config_list_str) + len); + memcpy((*p)->val, value, len + 1); + (*p)->next = NULL; + } + } + break; + } + debug_return_bool(true); + } + } + debug_return_bool(false); +} + +static bool sudo_ldap_read_config(void) { FILE *fp; - char *cp, *keyword, *value; - struct ldap_config_table *cur; + char *cp, *keyword, *value, *line = NULL; + size_t linesize = 0; + debug_decl(sudo_ldap_read_config, SUDO_DEBUG_LDAP) /* defaults */ ldap_conf.version = 3; @@ -1128,15 +1460,15 @@ sudo_ldap_read_config(void) ldap_conf.rootuse_sasl = -1; ldap_conf.deref = -1; - if ((fp = fopen(_PATH_LDAP_CONF, "r")) == NULL) - return FALSE; + if ((fp = fopen(path_ldap_conf, "r")) == NULL) + debug_return_bool(false); - while ((cp = sudo_parseln(fp)) != NULL) { - if (*cp == '\0') + while (sudo_parseln(&line, &linesize, NULL, fp) != -1) { + if (*line == '\0') continue; /* skip empty line */ /* split into keyword and value */ - keyword = cp; + keyword = cp = line; while (*cp && !isblank((unsigned char) *cp)) cp++; if (*cp) @@ -1147,154 +1479,97 @@ sudo_ldap_read_config(void) cp++; value = cp; - /* Look up keyword in config table. */ - for (cur = ldap_conf_table; cur->conf_str != NULL; cur++) { - if (strcasecmp(keyword, cur->conf_str) == 0) { - switch (cur->type) { - case CONF_DEREF_VAL: - if (strcasecmp(value, "searching") == 0) - *(int *)(cur->valp) = LDAP_DEREF_SEARCHING; - else if (strcasecmp(value, "finding") == 0) - *(int *)(cur->valp) = LDAP_DEREF_FINDING; - else if (strcasecmp(value, "always") == 0) - *(int *)(cur->valp) = LDAP_DEREF_ALWAYS; - else - *(int *)(cur->valp) = LDAP_DEREF_NEVER; - break; - case CONF_BOOL: - *(int *)(cur->valp) = atobool(value) == TRUE; - break; - case CONF_INT: - *(int *)(cur->valp) = atoi(value); - break; - case CONF_STR: - efree(*(char **)(cur->valp)); - *(char **)(cur->valp) = estrdup(value); - break; - case CONF_LIST_STR: - { - struct ldap_config_list_str **p; - size_t len = strlen(value); - - if (len > 0) { - p = (struct ldap_config_list_str **)cur->valp; - while (*p != NULL) - p = &(*p)->next; - *p = emalloc(sizeof(struct ldap_config_list_str) + len); - memcpy((*p)->val, value, len + 1); - (*p)->next = NULL; - } - } - break; - } - break; - } - } + /* Look up keyword in config tables */ + if (!sudo_ldap_parse_keyword(keyword, value, ldap_conf_global)) + sudo_ldap_parse_keyword(keyword, value, ldap_conf_conn); } + free(line); fclose(fp); if (!ldap_conf.host) ldap_conf.host = estrdup("localhost"); - if (ldap_conf.debug > 1) { - sudo_printf(SUDO_CONV_ERROR_MSG, "LDAP Config Summary\n"); - sudo_printf(SUDO_CONV_ERROR_MSG, "===================\n"); - if (ldap_conf.uri) { - struct ldap_config_list_str *uri = ldap_conf.uri; + DPRINTF1("LDAP Config Summary"); + DPRINTF1("==================="); + if (ldap_conf.uri) { + struct ldap_config_list_str *uri = ldap_conf.uri; - do { - sudo_printf(SUDO_CONV_ERROR_MSG, "uri %s\n", - uri->val); - } while ((uri = uri->next) != NULL); - } else { - sudo_printf(SUDO_CONV_ERROR_MSG, "host %s\n", - ldap_conf.host ? ldap_conf.host : "(NONE)"); - sudo_printf(SUDO_CONV_ERROR_MSG, "port %d\n", - ldap_conf.port); - } - sudo_printf(SUDO_CONV_ERROR_MSG, "ldap_version %d\n", - ldap_conf.version); + do { + DPRINTF1("uri %s", uri->val); + } while ((uri = uri->next) != NULL); + } else { + DPRINTF1("host %s", + ldap_conf.host ? ldap_conf.host : "(NONE)"); + DPRINTF1("port %d", ldap_conf.port); + } + DPRINTF1("ldap_version %d", ldap_conf.version); - if (ldap_conf.base) { - struct ldap_config_list_str *base = ldap_conf.base; - do { - sudo_printf(SUDO_CONV_ERROR_MSG, "sudoers_base %s\n", - base->val); - } while ((base = base->next) != NULL); - } else { - sudo_printf(SUDO_CONV_ERROR_MSG, "sudoers_base %s\n", - "(NONE: LDAP disabled)"); - } - if (ldap_conf.search_filter) { - sudo_printf(SUDO_CONV_ERROR_MSG, "search_filter %s\n", - ldap_conf.search_filter); - } - sudo_printf(SUDO_CONV_ERROR_MSG, "binddn %s\n", - ldap_conf.binddn ? ldap_conf.binddn : "(anonymous)"); - sudo_printf(SUDO_CONV_ERROR_MSG, "bindpw %s\n", - ldap_conf.bindpw ? ldap_conf.bindpw : "(anonymous)"); - if (ldap_conf.bind_timelimit > 0) { - sudo_printf(SUDO_CONV_ERROR_MSG, "bind_timelimit %d\n", - ldap_conf.bind_timelimit); - } - if (ldap_conf.timelimit > 0) { - sudo_printf(SUDO_CONV_ERROR_MSG, "timelimit %d\n", - ldap_conf.timelimit); - } - if (ldap_conf.deref != -1) { - sudo_printf(SUDO_CONV_ERROR_MSG, "deref %d\n", - ldap_conf.deref); - } - sudo_printf(SUDO_CONV_ERROR_MSG, "ssl %s\n", - ldap_conf.ssl ? ldap_conf.ssl : "(no)"); - if (ldap_conf.tls_checkpeer != -1) { - sudo_printf(SUDO_CONV_ERROR_MSG, "tls_checkpeer %s\n", - ldap_conf.tls_checkpeer ? "(yes)" : "(no)"); - } - if (ldap_conf.tls_cacertfile != NULL) { - sudo_printf(SUDO_CONV_ERROR_MSG, "tls_cacertfile %s\n", - ldap_conf.tls_cacertfile); - } - if (ldap_conf.tls_cacertdir != NULL) { - sudo_printf(SUDO_CONV_ERROR_MSG, "tls_cacertdir %s\n", - ldap_conf.tls_cacertdir); - } - if (ldap_conf.tls_random_file != NULL) { - sudo_printf(SUDO_CONV_ERROR_MSG, "tls_random_file %s\n", - ldap_conf.tls_random_file); - } - if (ldap_conf.tls_cipher_suite != NULL) { - sudo_printf(SUDO_CONV_ERROR_MSG, "tls_cipher_suite %s\n", - ldap_conf.tls_cipher_suite); - } - if (ldap_conf.tls_certfile != NULL) { - sudo_printf(SUDO_CONV_ERROR_MSG, "tls_certfile %s\n", - ldap_conf.tls_certfile); - } - if (ldap_conf.tls_keyfile != NULL) { - sudo_printf(SUDO_CONV_ERROR_MSG, "tls_keyfile %s\n", - ldap_conf.tls_keyfile); - } + if (ldap_conf.base) { + struct ldap_config_list_str *base = ldap_conf.base; + do { + DPRINTF1("sudoers_base %s", base->val); + } while ((base = base->next) != NULL); + } else { + DPRINTF1("sudoers_base %s", "(NONE: LDAP disabled)"); + } + if (ldap_conf.search_filter) { + DPRINTF1("search_filter %s", ldap_conf.search_filter); + } + DPRINTF1("binddn %s", + ldap_conf.binddn ? ldap_conf.binddn : "(anonymous)"); + DPRINTF1("bindpw %s", + ldap_conf.bindpw ? ldap_conf.bindpw : "(anonymous)"); + if (ldap_conf.bind_timelimit > 0) { + DPRINTF1("bind_timelimit %d", ldap_conf.bind_timelimit); + } + if (ldap_conf.timelimit > 0) { + DPRINTF1("timelimit %d", ldap_conf.timelimit); + } + if (ldap_conf.deref != -1) { + DPRINTF1("deref %d", ldap_conf.deref); + } + DPRINTF1("ssl %s", ldap_conf.ssl ? ldap_conf.ssl : "(no)"); + if (ldap_conf.tls_checkpeer != -1) { + DPRINTF1("tls_checkpeer %s", + ldap_conf.tls_checkpeer ? "(yes)" : "(no)"); + } + if (ldap_conf.tls_cacertfile != NULL) { + DPRINTF1("tls_cacertfile %s", ldap_conf.tls_cacertfile); + } + if (ldap_conf.tls_cacertdir != NULL) { + DPRINTF1("tls_cacertdir %s", ldap_conf.tls_cacertdir); + } + if (ldap_conf.tls_random_file != NULL) { + DPRINTF1("tls_random_file %s", ldap_conf.tls_random_file); + } + if (ldap_conf.tls_cipher_suite != NULL) { + DPRINTF1("tls_cipher_suite %s", ldap_conf.tls_cipher_suite); + } + if (ldap_conf.tls_certfile != NULL) { + DPRINTF1("tls_certfile %s", ldap_conf.tls_certfile); + } + if (ldap_conf.tls_keyfile != NULL) { + DPRINTF1("tls_keyfile %s", ldap_conf.tls_keyfile); + } #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S - if (ldap_conf.use_sasl != -1) { - sudo_printf(SUDO_CONV_ERROR_MSG, "use_sasl %s\n", - ldap_conf.use_sasl ? "yes" : "no"); - sudo_printf(SUDO_CONV_ERROR_MSG, "sasl_auth_id %s\n", - ldap_conf.sasl_auth_id ? ldap_conf.sasl_auth_id : "(NONE)"); - sudo_printf(SUDO_CONV_ERROR_MSG, "rootuse_sasl %d\n", - ldap_conf.rootuse_sasl); - sudo_printf(SUDO_CONV_ERROR_MSG, "rootsasl_auth_id %s\n", - ldap_conf.rootsasl_auth_id ? ldap_conf.rootsasl_auth_id : "(NONE)"); - sudo_printf(SUDO_CONV_ERROR_MSG, "sasl_secprops %s\n", - ldap_conf.sasl_secprops ? ldap_conf.sasl_secprops : "(NONE)"); - sudo_printf(SUDO_CONV_ERROR_MSG, "krb5_ccname %s\n", - ldap_conf.krb5_ccname ? ldap_conf.krb5_ccname : "(NONE)"); - } -#endif - sudo_printf(SUDO_CONV_ERROR_MSG, "===================\n"); + if (ldap_conf.use_sasl != -1) { + DPRINTF1("use_sasl %s", ldap_conf.use_sasl ? "yes" : "no"); + DPRINTF1("sasl_auth_id %s", + ldap_conf.sasl_auth_id ? ldap_conf.sasl_auth_id : "(NONE)"); + DPRINTF1("rootuse_sasl %d", + ldap_conf.rootuse_sasl); + DPRINTF1("rootsasl_auth_id %s", + ldap_conf.rootsasl_auth_id ? ldap_conf.rootsasl_auth_id : "(NONE)"); + DPRINTF1("sasl_secprops %s", + ldap_conf.sasl_secprops ? ldap_conf.sasl_secprops : "(NONE)"); + DPRINTF1("krb5_ccname %s", + ldap_conf.krb5_ccname ? ldap_conf.krb5_ccname : "(NONE)"); } +#endif + DPRINTF1("==================="); + if (!ldap_conf.base) - return FALSE; /* if no base is defined, ignore LDAP */ + debug_return_bool(false); /* if no base is defined, ignore LDAP */ if (ldap_conf.bind_timelimit > 0) ldap_conf.bind_timelimit *= 1000; /* convert to ms */ @@ -1305,7 +1580,7 @@ sudo_ldap_read_config(void) if (ldap_conf.ssl != NULL) { if (strcasecmp(ldap_conf.ssl, "start_tls") == 0) ldap_conf.ssl_mode = SUDO_LDAP_STARTTLS; - else if (atobool(ldap_conf.ssl) == TRUE) + else if (atobool(ldap_conf.ssl) == true) ldap_conf.ssl_mode = SUDO_LDAP_SSL; } @@ -1321,7 +1596,7 @@ sudo_ldap_read_config(void) if (ldap_conf.uri) { struct ldap_config_list_str *uri = ldap_conf.uri; if (sudo_ldap_parse_uri(uri) != 0) - return FALSE; + debug_return_bool(false); do { ldap_conf.uri = uri->next; efree(uri); @@ -1360,7 +1635,7 @@ sudo_ldap_read_config(void) /* If rootbinddn set, read in /etc/ldap.secret if it exists. */ if (ldap_conf.rootbinddn) - sudo_ldap_read_secret(_PATH_LDAP_SECRET); + sudo_ldap_read_secret(path_ldap_secret); #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S /* @@ -1372,18 +1647,20 @@ sudo_ldap_read_config(void) value = ldap_conf.krb5_ccname + (ldap_conf.krb5_ccname[4] == ':' ? 5 : 7); if ((fp = fopen(value, "r")) != NULL) { - DPRINTF(("using krb5 credential cache: %s", value), 1); + sudo_debug_printf(SUDO_DEBUG_INFO, + "using krb5 credential cache: %s", value); fclose(fp); } else { /* Can't open it, just ignore the entry. */ - DPRINTF(("unable to open krb5 credential cache: %s", value), 1); + sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_LINENO, + "unable to open krb5 credential cache: %s", value); efree(ldap_conf.krb5_ccname); ldap_conf.krb5_ccname = NULL; } } } #endif - return TRUE; + debug_return_bool(true); } /* @@ -1395,23 +1672,25 @@ sudo_ldap_get_first_rdn(LDAP *ld, LDAPMessage *entry) #ifdef HAVE_LDAP_STR2DN char *dn, *rdn = NULL; LDAPDN tmpDN; + debug_decl(sudo_ldap_get_first_rdn, SUDO_DEBUG_LDAP) if ((dn = ldap_get_dn(ld, entry)) == NULL) - return NULL; + debug_return_str(NULL); if (ldap_str2dn(dn, &tmpDN, LDAP_DN_FORMAT_LDAP) == LDAP_SUCCESS) { ldap_rdn2str(tmpDN[0], &rdn, LDAP_DN_FORMAT_UFN); ldap_dnfree(tmpDN); } ldap_memfree(dn); - return rdn; + debug_return_str(rdn); #else char *dn, **edn; + debug_decl(sudo_ldap_get_first_rdn, SUDO_DEBUG_LDAP) if ((dn = ldap_get_dn(ld, entry)) == NULL) return NULL; edn = ldap_explode_dn(dn, 1); ldap_memfree(dn); - return edn ? edn[0] : NULL; + debug_return_str(edn ? edn[0] : NULL); #endif } @@ -1430,6 +1709,7 @@ sudo_ldap_display_defaults(struct sudo_nss *nss, struc LDAPMessage *entry, *result; char *prefix, *filt; int rc, count = 0; + debug_decl(sudo_ldap_display_defaults, SUDO_DEBUG_LDAP) if (handle == NULL || handle->ld == NULL) goto done; @@ -1465,7 +1745,7 @@ sudo_ldap_display_defaults(struct sudo_nss *nss, struc } efree(filt); done: - return count; + debug_return_int(count); } /* @@ -1475,7 +1755,8 @@ static int sudo_ldap_display_bound_defaults(struct sudo_nss *nss, struct passwd *pw, struct lbuf *lbuf) { - return 0; + debug_decl(sudo_ldap_display_bound_defaults, SUDO_DEBUG_LDAP) + debug_return_int(0); } /* @@ -1486,6 +1767,7 @@ sudo_ldap_display_entry_short(LDAP *ld, LDAPMessage *e { struct berval **bv, **p; int count = 0; + debug_decl(sudo_ldap_display_entry_short, SUDO_DEBUG_LDAP) lbuf_append(lbuf, " ("); @@ -1543,7 +1825,7 @@ sudo_ldap_display_entry_short(LDAP *ld, LDAPMessage *e } lbuf_append(lbuf, "\n"); - return count; + debug_return_int(count); } /* @@ -1555,6 +1837,7 @@ sudo_ldap_display_entry_long(LDAP *ld, LDAPMessage *en struct berval **bv, **p; char *rdn; int count = 0; + debug_decl(sudo_ldap_display_entry_long, SUDO_DEBUG_LDAP) /* extract the dn, only show the first rdn */ rdn = sudo_ldap_get_first_rdn(ld, entry); @@ -1624,7 +1907,7 @@ sudo_ldap_display_entry_long(LDAP *ld, LDAPMessage *en ldap_value_free_len(bv); } - return count; + debug_return_int(count); } /* @@ -1639,12 +1922,13 @@ sudo_ldap_display_privs(struct sudo_nss *nss, struct p struct ldap_result *lres; LDAPMessage *entry; int i, count = 0; + debug_decl(sudo_ldap_display_privs, SUDO_DEBUG_LDAP) if (handle == NULL || handle->ld == NULL) goto done; ld = handle->ld; - DPRINTF(("ldap search for command list"), 1); + DPRINTF1("ldap search for command list"); lres = sudo_ldap_result_get(nss, pw); /* Display all matching entries. */ @@ -1657,7 +1941,7 @@ sudo_ldap_display_privs(struct sudo_nss *nss, struct p } done: - return count; + debug_return_int(count); } static int @@ -1667,7 +1951,9 @@ sudo_ldap_display_cmnd(struct sudo_nss *nss, struct pa LDAP *ld; struct ldap_result *lres; LDAPMessage *entry; - int i, found = FALSE; + bool found = false; + int i; + debug_decl(sudo_ldap_display_cmnd, SUDO_DEBUG_LDAP) if (handle == NULL || handle->ld == NULL) goto done; @@ -1677,13 +1963,13 @@ sudo_ldap_display_cmnd(struct sudo_nss *nss, struct pa * The sudo_ldap_result_get() function returns all nodes that match * the user and the host. */ - DPRINTF(("ldap search for command list"), 1); + DPRINTF1("ldap search for command list"); lres = sudo_ldap_result_get(nss, pw); for (i = 0; i < lres->nentries; i++) { entry = lres->entries[i].entry; if (sudo_ldap_check_command(ld, entry, NULL) && sudo_ldap_check_runas(ld, entry)) { - found = TRUE; + found = true; goto done; } } @@ -1692,7 +1978,7 @@ done: if (found) printf("%s%s%s\n", safe_cmnd ? safe_cmnd : user_cmnd, user_args ? " " : "", user_args ? user_args : ""); - return !found; + debug_return_bool(!found); } #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S @@ -1702,10 +1988,11 @@ sudo_ldap_sasl_interact(LDAP *ld, unsigned int flags, { char *auth_id = (char *)_auth_id; sasl_interact_t *interact = (sasl_interact_t *)_interact; + debug_decl(sudo_ldap_sasl_interact, SUDO_DEBUG_LDAP) for (; interact->id != SASL_CB_LIST_END; interact++) { if (interact->id != SASL_CB_USER) - return LDAP_PARAM_ERROR; + debug_return_int(LDAP_PARAM_ERROR); if (auth_id != NULL) interact->result = auth_id; @@ -1719,78 +2006,105 @@ sudo_ldap_sasl_interact(LDAP *ld, unsigned int flags, interact->result = estrdup(interact->result); #endif /* SASL_VERSION_MAJOR < 2 */ } - return LDAP_SUCCESS; + debug_return_int(LDAP_SUCCESS); } #endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */ + /* - * Set LDAP options based on the config table. + * Set LDAP options from the specified options table */ static int -sudo_ldap_set_options(LDAP *ld) +sudo_ldap_set_options_table(LDAP *ld, struct ldap_config_table *table) { struct ldap_config_table *cur; - int rc; + int ival, rc, errors = 0; + char *sval; + debug_decl(sudo_ldap_set_options_table, SUDO_DEBUG_LDAP) - /* Set ber options */ -#ifdef LBER_OPT_DEBUG_LEVEL - if (ldap_conf.ldap_debug) - ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &ldap_conf.ldap_debug); -#endif - - /* Set simple LDAP options */ - for (cur = ldap_conf_table; cur->conf_str != NULL; cur++) { - LDAP *conn; - int ival; - char *sval; - + for (cur = table; cur->conf_str != NULL; cur++) { if (cur->opt_val == -1) continue; - conn = cur->connected ? ld : NULL; switch (cur->type) { case CONF_BOOL: case CONF_INT: ival = *(int *)(cur->valp); if (ival >= 0) { - rc = ldap_set_option(conn, cur->opt_val, &ival); + DPRINTF1("ldap_set_option: %s -> %d", cur->conf_str, ival); + rc = ldap_set_option(ld, cur->opt_val, &ival); if (rc != LDAP_OPT_SUCCESS) { warningx("ldap_set_option: %s -> %d: %s", cur->conf_str, ival, ldap_err2string(rc)); - return -1; + errors++; } - DPRINTF(("ldap_set_option: %s -> %d", cur->conf_str, ival), 1); } break; case CONF_STR: sval = *(char **)(cur->valp); if (sval != NULL) { - rc = ldap_set_option(conn, cur->opt_val, sval); + DPRINTF1("ldap_set_option: %s -> %s", cur->conf_str, sval); + rc = ldap_set_option(ld, cur->opt_val, sval); if (rc != LDAP_OPT_SUCCESS) { warningx("ldap_set_option: %s -> %s: %s", cur->conf_str, sval, ldap_err2string(rc)); - return -1; + errors++; } - DPRINTF(("ldap_set_option: %s -> %s", cur->conf_str, sval), 1); } break; } } + debug_return_int(errors ? -1 : 0); +} +/* + * Set LDAP options based on the global config table. + */ +static int +sudo_ldap_set_options_global(void) +{ + int rc; + debug_decl(sudo_ldap_set_options_global, SUDO_DEBUG_LDAP) + + /* Set ber options */ +#ifdef LBER_OPT_DEBUG_LEVEL + if (ldap_conf.ldap_debug) + ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &ldap_conf.ldap_debug); +#endif + + /* Parse global LDAP options table. */ + rc = sudo_ldap_set_options_table(NULL, ldap_conf_global); + if (rc == -1) + debug_return_int(-1); + debug_return_int(0); +} + +/* + * Set LDAP options based on the per-connection config table. + */ +static int +sudo_ldap_set_options_conn(LDAP *ld) +{ + int rc; + debug_decl(sudo_ldap_set_options_conn, SUDO_DEBUG_LDAP) + + /* Parse per-connection LDAP options table. */ + rc = sudo_ldap_set_options_table(ld, ldap_conf_conn); + if (rc == -1) + debug_return_int(-1); + #ifdef LDAP_OPT_TIMEOUT /* Convert timeout to a timeval */ if (ldap_conf.timeout > 0) { struct timeval tv; tv.tv_sec = ldap_conf.timeout; tv.tv_usec = 0; + DPRINTF1("ldap_set_option(LDAP_OPT_TIMEOUT, %d)", ldap_conf.timeout); rc = ldap_set_option(ld, LDAP_OPT_TIMEOUT, &tv); if (rc != LDAP_OPT_SUCCESS) { - warningx("ldap_set_option(TIMEOUT, %ld): %s", - (long)tv.tv_sec, ldap_err2string(rc)); - return -1; + warningx("ldap_set_option(TIMEOUT, %d): %s", + ldap_conf.timeout, ldap_err2string(rc)); } - DPRINTF(("ldap_set_option(LDAP_OPT_TIMEOUT, %ld)", - (long)tv.tv_sec), 1); } #endif #ifdef LDAP_OPT_NETWORK_TIMEOUT @@ -1799,30 +2113,32 @@ sudo_ldap_set_options(LDAP *ld) struct timeval tv; tv.tv_sec = ldap_conf.bind_timelimit / 1000; tv.tv_usec = 0; + DPRINTF1("ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT, %d)", + ldap_conf.bind_timelimit / 1000); rc = ldap_set_option(ld, LDAP_OPT_NETWORK_TIMEOUT, &tv); +# if !defined(LDAP_OPT_CONNECT_TIMEOUT) || LDAP_VENDOR_VERSION != 510 + /* Tivoli Directory Server 6.3 libs always return a (bogus) error. */ if (rc != LDAP_OPT_SUCCESS) { - warningx("ldap_set_option(NETWORK_TIMEOUT, %ld): %s", - (long)tv.tv_sec, ldap_err2string(rc)); - return -1; + warningx("ldap_set_option(NETWORK_TIMEOUT, %d): %s", + ldap_conf.bind_timelimit / 1000, ldap_err2string(rc)); } - DPRINTF(("ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT, %ld)", - (long)tv.tv_sec), 1); +# endif } #endif #if defined(LDAP_OPT_X_TLS) && !defined(HAVE_LDAPSSL_INIT) if (ldap_conf.ssl_mode == SUDO_LDAP_SSL) { int val = LDAP_OPT_X_TLS_HARD; + DPRINTF1("ldap_set_option(LDAP_OPT_X_TLS, LDAP_OPT_X_TLS_HARD)"); rc = ldap_set_option(ld, LDAP_OPT_X_TLS, &val); if (rc != LDAP_SUCCESS) { warningx("ldap_set_option(LDAP_OPT_X_TLS, LDAP_OPT_X_TLS_HARD): %s", ldap_err2string(rc)); - return -1; + debug_return_int(-1); } - DPRINTF(("ldap_set_option(LDAP_OPT_X_TLS, LDAP_OPT_X_TLS_HARD)"), 1); } #endif - return 0; + debug_return_int(0); } /* @@ -1832,15 +2148,9 @@ static struct ldap_result * sudo_ldap_result_alloc(void) { struct ldap_result *result; + debug_decl(sudo_ldap_result_alloc, SUDO_DEBUG_LDAP) - result = emalloc(sizeof(*result)); - result->searches = NULL; - result->nentries = 0; - result->entries = NULL; - result->allocated_entries = 0; - result->user_matches = FALSE; - result->host_matches = FALSE; - return result; + debug_return_ptr(ecalloc(1, sizeof(*result))); } /* @@ -1850,6 +2160,7 @@ static void sudo_ldap_result_free(struct ldap_result *lres) { struct ldap_search_list *s; + debug_decl(sudo_ldap_result_free, SUDO_DEBUG_LDAP) if (lres != NULL) { if (lres->nentries) { @@ -1865,6 +2176,7 @@ sudo_ldap_result_free(struct ldap_result *lres) } efree(lres); } + debug_return; } /* @@ -1875,11 +2187,12 @@ sudo_ldap_result_add_search(struct ldap_result *lres, LDAPMessage *searchresult) { struct ldap_search_list *s, *news; + debug_decl(sudo_ldap_result_add_search, SUDO_DEBUG_LDAP) - news = emalloc(sizeof(struct ldap_search_list)); - news->next = NULL; + news = ecalloc(1, sizeof(struct ldap_search_list)); news->ldap = ldap; news->searchresult = searchresult; + /* news->next = NULL; */ /* Add entry to the end of the chain (XXX - tailq instead?). */ if (lres->searches) { @@ -1889,7 +2202,7 @@ sudo_ldap_result_add_search(struct ldap_result *lres, } else { lres->searches = news; } - return news; + debug_return_ptr(news); } /* @@ -1905,10 +2218,11 @@ sudo_ldap_bind_s(LDAP *ld) unsigned int status; # endif #endif + debug_decl(sudo_ldap_bind_s, SUDO_DEBUG_LDAP) #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S - if (ldap_conf.rootuse_sasl == TRUE || - (ldap_conf.rootuse_sasl != FALSE && ldap_conf.use_sasl == TRUE)) { + if (ldap_conf.rootuse_sasl == true || + (ldap_conf.rootuse_sasl != false && ldap_conf.use_sasl == true)) { void *auth_id = ldap_conf.rootsasl_auth_id ? ldap_conf.rootsasl_auth_id : ldap_conf.sasl_auth_id; @@ -1917,10 +2231,11 @@ sudo_ldap_bind_s(LDAP *ld) if (gss_krb5_ccache_name(&status, ldap_conf.krb5_ccname, &old_ccname) != GSS_S_COMPLETE) { old_ccname = NULL; - DPRINTF(("gss_krb5_ccache_name() failed: %d", status), 1); + sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_LINENO, + "gss_krb5_ccache_name() failed: %d", status); } # else - setenv("KRB5CCNAME", ldap_conf.krb5_ccname, TRUE); + sudo_setenv("KRB5CCNAME", ldap_conf.krb5_ccname, true); # endif } rc = ldap_sasl_interactive_bind_s(ld, ldap_conf.binddn, "GSSAPI", @@ -1928,20 +2243,21 @@ sudo_ldap_bind_s(LDAP *ld) if (ldap_conf.krb5_ccname != NULL) { # ifdef HAVE_GSS_KRB5_CCACHE_NAME if (gss_krb5_ccache_name(&status, old_ccname, NULL) != GSS_S_COMPLETE) - DPRINTF(("gss_krb5_ccache_name() failed: %d", status), 1); + sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_LINENO, + "gss_krb5_ccache_name() failed: %d", status); # else if (old_ccname != NULL) - setenv("KRB5CCNAME", old_ccname, TRUE); + sudo_setenv("KRB5CCNAME", old_ccname, true); else - unsetenv("KRB5CCNAME"); + sudo_unsetenv("KRB5CCNAME"); # endif } if (rc != LDAP_SUCCESS) { warningx("ldap_sasl_interactive_bind_s(): %s", ldap_err2string(rc)); - return -1; + debug_return_int(-1); } - DPRINTF(("ldap_sasl_interactive_bind_s() ok"), 1); + DPRINTF1("ldap_sasl_interactive_bind_s() ok"); } else #endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */ #ifdef HAVE_LDAP_SASL_BIND_S @@ -1955,21 +2271,21 @@ sudo_ldap_bind_s(LDAP *ld) NULL, NULL, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_sasl_bind_s(): %s", ldap_err2string(rc)); - return -1; + debug_return_int(-1); } - DPRINTF(("ldap_sasl_bind_s() ok"), 1); + DPRINTF1("ldap_sasl_bind_s() ok"); } #else { rc = ldap_simple_bind_s(ld, ldap_conf.binddn, ldap_conf.bindpw); if (rc != LDAP_SUCCESS) { warningx("ldap_simple_bind_s(): %s", ldap_err2string(rc)); - return -1; + debug_return_int(-1); } - DPRINTF(("ldap_simple_bind_s() ok"), 1); + DPRINTF1("ldap_simple_bind_s() ok"); } #endif - return 0; + debug_return_int(0); } /* @@ -1980,59 +2296,65 @@ static int sudo_ldap_open(struct sudo_nss *nss) { LDAP *ld; - int rc, ldapnoinit = FALSE; - struct sudo_ldap_handle *handle; + int rc; + bool ldapnoinit = false; + struct sudo_ldap_handle *handle; + debug_decl(sudo_ldap_open, SUDO_DEBUG_LDAP) if (!sudo_ldap_read_config()) - return -1; + debug_return_int(-1); /* Prevent reading of user ldaprc and system defaults. */ - if (getenv("LDAPNOINIT") == NULL) { - ldapnoinit = TRUE; - setenv("LDAPNOINIT", "1", TRUE); + if (sudo_getenv("LDAPNOINIT") == NULL) { + ldapnoinit = true; + sudo_setenv("LDAPNOINIT", "1", true); } + /* Set global LDAP options */ + if (sudo_ldap_set_options_global() < 0) + debug_return_int(-1); + /* Connect to LDAP server */ #ifdef HAVE_LDAP_INITIALIZE if (ldap_conf.uri != NULL) { char *buf = sudo_ldap_join_uri(ldap_conf.uri); - DPRINTF(("ldap_initialize(ld, %s)", buf), 2); + DPRINTF2("ldap_initialize(ld, %s)", buf); rc = ldap_initialize(&ld, buf); efree(buf); + if (rc != LDAP_SUCCESS) + warningx(_("unable to initialize LDAP: %s"), ldap_err2string(rc)); } else #endif rc = sudo_ldap_init(&ld, ldap_conf.host, ldap_conf.port); - if (rc != LDAP_SUCCESS) { - warningx(_("unable to initialize LDAP: %s"), ldap_err2string(rc)); - return -1; - } + if (rc != LDAP_SUCCESS) + debug_return_int(-1); + /* Set LDAP per-connection options */ + if (sudo_ldap_set_options_conn(ld) < 0) + debug_return_int(-1); + if (ldapnoinit) - unsetenv("LDAPNOINIT"); + sudo_unsetenv("LDAPNOINIT"); - /* Set LDAP options */ - if (sudo_ldap_set_options(ld) < 0) - return -1; - if (ldap_conf.ssl_mode == SUDO_LDAP_STARTTLS) { #if defined(HAVE_LDAP_START_TLS_S) rc = ldap_start_tls_s(ld, NULL, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_start_tls_s(): %s", ldap_err2string(rc)); - return -1; + debug_return_int(-1); } - DPRINTF(("ldap_start_tls_s() ok"), 1); + DPRINTF1("ldap_start_tls_s() ok"); #elif defined(HAVE_LDAP_SSL_CLIENT_INIT) && defined(HAVE_LDAP_START_TLS_S_NP) - if (ldap_ssl_client_init(NULL, NULL, 0, &rc) != LDAP_SUCCESS) { + if (ldap_ssl_client_init(ldap_conf.tls_keyfile, ldap_conf.tls_keypw, 0, &rc) != LDAP_SUCCESS) { warningx("ldap_ssl_client_init(): %s", ldap_err2string(rc)); - return -1; + debug_return_int(-1); } rc = ldap_start_tls_s_np(ld, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_start_tls_s_np(): %s", ldap_err2string(rc)); - return -1; + debug_return_int(-1); } - DPRINTF(("ldap_start_tls_s_np() ok"), 1); + DPRINTF1("ldap_start_tls_s_np() ok"); #else warningx(_("start_tls specified but LDAP libs do not support ldap_start_tls_s() or ldap_start_tls_s_np()")); #endif /* !HAVE_LDAP_START_TLS_S && !HAVE_LDAP_START_TLS_S_NP */ @@ -2040,17 +2362,17 @@ sudo_ldap_open(struct sudo_nss *nss) /* Actually connect */ if (sudo_ldap_bind_s(ld) != 0) - return -1; + debug_return_int(-1); /* Create a handle container. */ - handle = emalloc(sizeof(struct sudo_ldap_handle)); + handle = ecalloc(1, sizeof(struct sudo_ldap_handle)); handle->ld = ld; - handle->result = NULL; - handle->username = NULL; - handle->grlist = NULL; + /* handle->result = NULL; */ + /* handle->username = NULL; */ + /* handle->grlist = NULL; */ nss->handle = handle; - return 0; + debug_return_int(0); } static int @@ -2063,13 +2385,14 @@ sudo_ldap_setdefs(struct sudo_nss *nss) LDAPMessage *entry, *result; char *filt; int rc; + debug_decl(sudo_ldap_setdefs, SUDO_DEBUG_LDAP) if (handle == NULL || handle->ld == NULL) - return -1; + debug_return_int(-1); ld = handle->ld; filt = sudo_ldap_build_default_filter(); - DPRINTF(("Looking for cn=defaults: %s", filt), 1); + DPRINTF1("Looking for cn=defaults: %s", filt); for (base = ldap_conf.base; base != NULL; base = base->next) { if (ldap_conf.timeout > 0) { @@ -2081,17 +2404,17 @@ sudo_ldap_setdefs(struct sudo_nss *nss) rc = ldap_search_ext_s(ld, base->val, LDAP_SCOPE_SUBTREE, filt, NULL, 0, NULL, NULL, tvp, 0, &result); if (rc == LDAP_SUCCESS && (entry = ldap_first_entry(ld, result))) { - DPRINTF(("found:%s", ldap_get_dn(ld, entry)), 1); + DPRINTF1("found:%s", ldap_get_dn(ld, entry)); sudo_ldap_parse_options(ld, entry); - } else - DPRINTF(("no default options found in %s", base->val), 1); - + } else { + DPRINTF1("no default options found in %s", base->val); + } if (result) ldap_msgfree(result); } efree(filt); - return 0; + debug_return_int(0); } /* @@ -2105,9 +2428,10 @@ sudo_ldap_lookup(struct sudo_nss *nss, int ret, int pw LDAPMessage *entry; int i, rc, setenv_implied; struct ldap_result *lres = NULL; + debug_decl(sudo_ldap_lookup, SUDO_DEBUG_LDAP) if (handle == NULL || handle->ld == NULL) - return ret; + debug_return_int(ret); ld = handle->ld; /* Fetch list of sudoRole entries that match user and host. */ @@ -2123,18 +2447,18 @@ sudo_ldap_lookup(struct sudo_nss *nss, int ret, int pw enum def_tuple pwcheck = (pwflag == -1) ? never : sudo_defs_table[pwflag].sd_un.tuple; - DPRINTF(("perform search for pwflag %d", pwflag), 1); + DPRINTF1("perform search for pwflag %d", pwflag); for (i = 0; i < lres->nentries; i++) { entry = lres->entries[i].entry; - if ((pwcheck == any && doauth != FALSE) || - (pwcheck == all && doauth == FALSE)) { + if ((pwcheck == any && doauth != false) || + (pwcheck == all && doauth == false)) { doauth = sudo_ldap_check_bool(ld, entry, "authenticate"); } /* Only check the command when listing another user. */ if (user_uid == 0 || list_pw == NULL || user_uid == list_pw->pw_uid || sudo_ldap_check_command(ld, entry, NULL)) { - matched = TRUE; + matched = true; break; } } @@ -2148,11 +2472,11 @@ sudo_ldap_lookup(struct sudo_nss *nss, int ret, int pw break; case all: case any: - if (doauth == FALSE) - def_authenticate = FALSE; + if (doauth == false) + def_authenticate = false; break; case never: - def_authenticate = FALSE; + def_authenticate = false; break; default: break; @@ -2162,9 +2486,9 @@ sudo_ldap_lookup(struct sudo_nss *nss, int ret, int pw goto done; } - DPRINTF(("searching LDAP for sudoers entries"), 1); + DPRINTF1("searching LDAP for sudoers entries"); - setenv_implied = FALSE; + setenv_implied = false; for (i = 0; i < lres->nentries; i++) { entry = lres->entries[i].entry; if (!sudo_ldap_check_runas(ld, entry)) @@ -2172,12 +2496,12 @@ sudo_ldap_lookup(struct sudo_nss *nss, int ret, int pw rc = sudo_ldap_check_command(ld, entry, &setenv_implied); if (rc != UNSPEC) { /* We have a match. */ - DPRINTF(("Command %sallowed", rc == TRUE ? "" : "NOT "), 1); - if (rc == TRUE) { - DPRINTF(("LDAP entry: %p", entry), 1); + DPRINTF1("Command %sallowed", rc == true ? "" : "NOT "); + if (rc == true) { + DPRINTF1("LDAP entry: %p", entry); /* Apply entry-specific options. */ if (setenv_implied) - def_setenv = TRUE; + def_setenv = true; sudo_ldap_parse_options(ld, entry); #ifdef HAVE_SELINUX /* Set role and type if not specified on command line. */ @@ -2197,9 +2521,9 @@ sudo_ldap_lookup(struct sudo_nss *nss, int ret, int pw } done: - DPRINTF(("done with LDAP searches"), 1); - DPRINTF(("user_matches=%d", lres->user_matches), 1); - DPRINTF(("host_matches=%d", lres->host_matches), 1); + DPRINTF1("done with LDAP searches"); + DPRINTF1("user_matches=%d", lres->user_matches); + DPRINTF1("host_matches=%d", lres->host_matches); if (!ISSET(ret, VALIDATE_OK)) { /* No matching entries. */ @@ -2210,9 +2534,9 @@ done: CLR(ret, FLAG_NO_USER); if (lres->host_matches) CLR(ret, FLAG_NO_HOST); - DPRINTF(("sudo_ldap_lookup(%d)=0x%02x", pwflag, ret), 1); + DPRINTF1("sudo_ldap_lookup(%d)=0x%02x", pwflag, ret); - return ret; + debug_return_int(ret); } /* @@ -2223,9 +2547,10 @@ ldap_entry_compare(const void *a, const void *b) { const struct ldap_entry_wrapper *aw = a; const struct ldap_entry_wrapper *bw = b; + debug_decl(ldap_entry_compare, SUDO_DEBUG_LDAP) - return bw->order < aw->order ? -1 : - (bw->order > aw->order ? 1 : 0); + debug_return_int(bw->order < aw->order ? -1 : + (bw->order > aw->order ? 1 : 0)); } /* @@ -2237,12 +2562,13 @@ static struct ldap_search_list * sudo_ldap_result_last_search(struct ldap_result *lres) { struct ldap_search_list *result = lres->searches; + debug_decl(sudo_ldap_result_last_search, SUDO_DEBUG_LDAP) if (result) { while (result->next) result = result->next; } - return result; + debug_return_ptr(result); } /* @@ -2255,6 +2581,7 @@ sudo_ldap_result_add_entry(struct ldap_result *lres, L struct berval **bv; double order = 0.0; char *ep; + debug_decl(sudo_ldap_result_add_entry, SUDO_DEBUG_LDAP) /* Determine whether the entry has the sudoOrder attribute. */ last = sudo_ldap_result_last_search(lres); @@ -2262,13 +2589,13 @@ sudo_ldap_result_add_entry(struct ldap_result *lres, L if (bv != NULL) { if (ldap_count_values_len(bv) > 0) { /* Get the value of this attribute, 0 if not present. */ - DPRINTF(("order attribute raw: %s", (*bv)->bv_val), 1); + DPRINTF2("order attribute raw: %s", (*bv)->bv_val); order = strtod((*bv)->bv_val, &ep); if (ep == (*bv)->bv_val || *ep != '\0') { warningx(_("invalid sudoOrder attribute: %s"), (*bv)->bv_val); order = 0.0; } - DPRINTF(("order attribute: %f", order), 1); + DPRINTF2("order attribute: %f", order); } ldap_value_free_len(bv); } @@ -2287,7 +2614,7 @@ sudo_ldap_result_add_entry(struct ldap_result *lres, L lres->entries[lres->nentries - 1].entry = entry; lres->entries[lres->nentries - 1].order = order; - return &lres->entries[lres->nentries - 1]; + debug_return_ptr(&lres->entries[lres->nentries - 1]); } /* @@ -2297,9 +2624,10 @@ static void sudo_ldap_result_free_nss(struct sudo_nss *nss) { struct sudo_ldap_handle *handle = nss->handle; + debug_decl(sudo_ldap_result_free_nss, SUDO_DEBUG_LDAP) if (handle->result != NULL) { - DPRINTF(("removing reusable search result"), 1); + DPRINTF1("removing reusable search result"); sudo_ldap_result_free(handle->result); if (handle->username) { efree(handle->username); @@ -2308,6 +2636,7 @@ sudo_ldap_result_free_nss(struct sudo_nss *nss) handle->grlist = NULL; handle->result = NULL; } + debug_return; } /* @@ -2323,8 +2652,9 @@ sudo_ldap_result_get(struct sudo_nss *nss, struct pass struct timeval tv, *tvp = NULL; LDAPMessage *entry, *result; LDAP *ld = handle->ld; - int do_netgr, rc; + int pass, rc; char *filt; + debug_decl(sudo_ldap_result_get, SUDO_DEBUG_LDAP) /* * If we already have a cached result, return it so we don't have to @@ -2333,13 +2663,13 @@ sudo_ldap_result_get(struct sudo_nss *nss, struct pass if (handle->result) { if (handle->grlist == user_group_list && strcmp(pw->pw_name, handle->username) == 0) { - DPRINTF(("reusing previous result (user %s) with %d entries", - handle->username, handle->result->nentries), 1); - return handle->result; + DPRINTF1("reusing previous result (user %s) with %d entries", + handle->username, handle->result->nentries); + debug_return_ptr(handle->result); } /* User mismatch, cached result cannot be used. */ - DPRINTF(("removing result (user %s), new search (user %s)", - handle->username, pw->pw_name), 1); + DPRINTF1("removing result (user %s), new search (user %s)", + handle->username, pw->pw_name); sudo_ldap_result_free_nss(nss); } @@ -2353,20 +2683,21 @@ sudo_ldap_result_get(struct sudo_nss *nss, struct pass * sudoUser in this pass since the LDAP server already scanned * it for us. * - * The second pass will return all the entries that contain - * user netgroups. Then we take the netgroups returned and - * try to match them against the username. + * The second pass will return all the entries that contain non- + * Unix groups, including netgroups. Then we take the non-Unix + * groups returned and try to match them against the username. * * Since we have to sort the possible entries before we make a * decision, we perform the queries and store all of the results in * an ldap_result object. The results are then sorted by sudoOrder. */ lres = sudo_ldap_result_alloc(); - for (do_netgr = 0; do_netgr < 2; do_netgr++) { - filt = do_netgr ? sudo_ldap_build_pass2() : sudo_ldap_build_pass1(pw); - DPRINTF(("ldap search '%s'", filt), 1); + for (pass = 0; pass < 2; pass++) { + filt = pass ? sudo_ldap_build_pass2() : sudo_ldap_build_pass1(pw); + DPRINTF1("ldap search '%s'", filt); for (base = ldap_conf.base; base != NULL; base = base->next) { - DPRINTF(("searching from base '%s'", base->val), 1); + DPRINTF1("searching from base '%s'", + base->val); if (ldap_conf.timeout > 0) { tv.tv_sec = ldap_conf.timeout; tv.tv_usec = 0; @@ -2376,29 +2707,29 @@ sudo_ldap_result_get(struct sudo_nss *nss, struct pass rc = ldap_search_ext_s(ld, base->val, LDAP_SCOPE_SUBTREE, filt, NULL, 0, NULL, NULL, tvp, 0, &result); if (rc != LDAP_SUCCESS) { - DPRINTF(("nothing found for '%s'", filt), 1); + DPRINTF1("nothing found for '%s'", filt); continue; } - lres->user_matches = TRUE; + lres->user_matches = true; /* Add the seach result to list of search results. */ - DPRINTF(("adding search result"), 1); + DPRINTF1("adding search result"); sudo_ldap_result_add_search(lres, ld, result); LDAP_FOREACH(entry, ld, result) { - if ((!do_netgr || - sudo_ldap_check_user_netgroup(ld, entry, pw->pw_name)) && + if ((!pass || + sudo_ldap_check_non_unix_group(ld, entry, pw)) && sudo_ldap_check_host(ld, entry)) { - lres->host_matches = TRUE; + lres->host_matches = true; sudo_ldap_result_add_entry(lres, entry); } } - DPRINTF(("result now has %d entries", lres->nentries), 1); + DPRINTF1("result now has %d entries", lres->nentries); } efree(filt); } /* Sort the entries by the sudoOrder attribute. */ - DPRINTF(("sorting remaining %d entries", lres->nentries), 1); + DPRINTF1("sorting remaining %d entries", lres->nentries); qsort(lres->entries, lres->nentries, sizeof(lres->entries[0]), ldap_entry_compare); @@ -2407,7 +2738,7 @@ sudo_ldap_result_get(struct sudo_nss *nss, struct pass handle->username = estrdup(pw->pw_name); handle->grlist = user_group_list; - return lres; + debug_return_ptr(lres); } /* @@ -2417,6 +2748,7 @@ static int sudo_ldap_close(struct sudo_nss *nss) { struct sudo_ldap_handle *handle = nss->handle; + debug_decl(sudo_ldap_close, SUDO_DEBUG_LDAP) if (handle != NULL) { /* Free the result before unbinding; it may use the LDAP connection. */ @@ -2432,7 +2764,7 @@ sudo_ldap_close(struct sudo_nss *nss) efree(nss->handle); nss->handle = NULL; } - return 0; + debug_return_int(0); } /* @@ -2477,8 +2809,7 @@ sudo_ldap_result_from_search(LDAP *ldap, LDAPMessage * LDAP_FOREACH(entry, last->ldap, last->searchresult) { sudo_ldap_result_add_entry(result, entry); } - DPRINTF(("sudo_ldap_result_from_search: %d entries found", - result->nentries), 2); + DPRINTF1("sudo_ldap_result_from_search: %d entries found", result->nentries); return result; } #endif