--- embedaddon/sudo/plugins/sudoers/ldap.c 2012/05/29 12:26:49 1.1.1.2 +++ embedaddon/sudo/plugins/sudoers/ldap.c 2014/06/15 16:12:54 1.1.1.6 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2011 Todd C. Miller + * Copyright (c) 2003-2014 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 @@ -40,15 +39,16 @@ #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ -#if TIME_WITH_SYS_TIME +#ifdef TIME_WITH_SYS_TIME # include #endif #include +#include #include #include +#include #include #include -#include #ifdef HAVE_LBER_H # include #endif @@ -64,27 +64,22 @@ # else # include # endif -# if HAVE_GSS_KRB5_CCACHE_NAME -# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H) -# include -# include -# elif defined(HAVE_GSSAPI_GSSAPI_H) -# include -# else -# include -# endif -# endif -#endif +#endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */ #include "sudoers.h" #include "parse.h" #include "lbuf.h" +#include "sudo_dso.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 @@ -116,7 +111,29 @@ extern int ldapssl_set_strength(LDAP *ldap, int streng (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 @@ -128,26 +145,27 @@ extern int ldapssl_set_strength(LDAP *ldap, int streng #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 +/* Default search filter. */ +#define DEFAULT_SEARCH_FILTER "(objectClass=sudoRole)" + +/* 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 * search result pointers, which allows us to remove them after * all search results have been combined in memory. - * XXX - should probably be a tailq since we do appends */ -struct ldap_search_list { +struct ldap_search_result { + STAILQ_ENTRY(ldap_search_result) entries; LDAP *ldap; LDAPMessage *searchresult; - struct ldap_search_list *next; }; +STAILQ_HEAD(ldap_search_list, ldap_search_result); /* * The ldap_entry_wrapper structure is used to implement sorted result entries. @@ -166,7 +184,7 @@ struct ldap_entry_wrapper { * well as an array of all result entries sorted by the sudoOrder attribute. */ struct ldap_result { - struct ldap_search_list *searches; + struct ldap_search_list searches; struct ldap_entry_wrapper *entries; int allocated_entries; int nentries; @@ -182,11 +200,13 @@ struct ldap_config_table { void *valp; /* pointer into ldap_conf */ }; -struct ldap_config_list_str { - struct ldap_config_list_str *next; +struct ldap_config_str { + STAILQ_ENTRY(ldap_config_str) entries; char val[1]; }; +STAILQ_HEAD(ldap_config_str_list, ldap_config_str); + /* LDAP configuration structure */ static struct ldap_config { int port; @@ -203,11 +223,11 @@ static struct ldap_config { int timed; int deref; char *host; - struct ldap_config_list_str *uri; + struct ldap_config_str_list uri; char *binddn; char *bindpw; char *rootbinddn; - struct ldap_config_list_str *base; + struct ldap_config_str_list base; char *search_filter; char *ssl; char *tls_cacertfile; @@ -216,6 +236,7 @@ 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; @@ -255,6 +276,9 @@ static struct ldap_config_table ldap_conf_global[] = { #ifdef 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, LDAP_OPT_X_TLS_CERTFILE, @@ -268,6 +292,9 @@ static struct ldap_config_table ldap_conf_global[] = { #else { "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 }, @@ -346,8 +373,7 @@ struct sudo_ldap_handle { }; struct sudo_nss sudo_nss_ldap = { - &sudo_nss_ldap, - NULL, + { NULL, NULL }, sudo_ldap_open, sudo_ldap_close, sudo_ldap_parse, @@ -371,11 +397,13 @@ sudo_ldap_conf_add_ports(void) char *host, *port, defport[13]; char hostbuf[LINE_MAX * 2]; + int len; 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")); + len = snprintf(defport, sizeof(defport), ":%d", ldap_conf.port); + if (len <= 0 || (size_t)len >= sizeof(defport)) + fatalx(U_("sudo_ldap_conf_add_ports: port too large")); for ((host = strtok(ldap_conf.host, " \t")); host; (host = strtok(NULL, " \t"))) { if (hostbuf[0] != '\0') { @@ -398,7 +426,7 @@ sudo_ldap_conf_add_ports(void) debug_return; toobig: - errorx(1, _("sudo_ldap_conf_add_ports: out of space expanding hostbuf")); + fatalx(U_("sudo_ldap_conf_add_ports: out of space expanding hostbuf")); } #endif @@ -407,19 +435,21 @@ toobig: * For each uri, convert to host:port pairs. For ldaps:// enable SSL * Accepts: uris of the form ldap:/// or ldap://hostname:portnum/ * where the trailing slash is optional. + * Returns LDAP_SUCCESS on success, else non-zero. */ static int -sudo_ldap_parse_uri(const struct ldap_config_list_str *uri_list) +sudo_ldap_parse_uri(const struct ldap_config_str_list *uri_list) { + const struct ldap_config_str *entry; char *buf, *uri, *host, *cp, *port; 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); - hostbuf[0] = '\0'; + hostbuf[0] = '\0'; + STAILQ_FOREACH(entry, uri_list, entries) { + buf = estrdup(entry->val); for ((uri = strtok(buf, " \t")); uri != NULL; (uri = strtok(NULL, " \t"))) { if (strncasecmp(uri, "ldap://", 7) == 0) { nldap++; @@ -428,7 +458,7 @@ sudo_ldap_parse_uri(const struct ldap_config_list_str nldaps++; host = uri + 8; } else { - warningx(_("unsupported LDAP uri type: %s"), uri); + warningx(U_("unsupported LDAP uri type: %s"), uri); goto done; } @@ -456,57 +486,54 @@ sudo_ldap_parse_uri(const struct ldap_config_list_str goto toobig; } } - if (hostbuf[0] == '\0') { - warningx(_("invalid uri: %s"), uri_list->val); - goto done; - } if (nldaps != 0) { if (nldap != 0) { - warningx(_("unable to mix ldap and ldaps URIs")); + warningx(U_("unable to mix ldap and ldaps URIs")); goto done; } - if (ldap_conf.ssl_mode == SUDO_LDAP_STARTTLS) { - warningx(_("unable to mix ldaps and starttls")); - goto done; - } + if (ldap_conf.ssl_mode == SUDO_LDAP_STARTTLS) + warningx(U_("starttls not supported when using ldaps")); ldap_conf.ssl_mode = SUDO_LDAP_SSL; } - - efree(ldap_conf.host); - ldap_conf.host = estrdup(hostbuf); efree(buf); - } while ((uri_list = uri_list->next)); - + } buf = NULL; - rc = 0; + /* Store parsed URI(s) in host for ldap_create() or ldap_init(). */ + efree(ldap_conf.host); + ldap_conf.host = estrdup(hostbuf); + + rc = LDAP_SUCCESS; + done: efree(buf); debug_return_int(rc); toobig: - errorx(1, _("sudo_ldap_parse_uri: out of space building hostbuf")); + fatalx(U_("sudo_ldap_parse_uri: out of space building hostbuf")); } #else static char * -sudo_ldap_join_uri(struct ldap_config_list_str *uri_list) +sudo_ldap_join_uri(struct ldap_config_str_list *uri_list) { - struct ldap_config_list_str *uri; + struct ldap_config_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) - debug_return_str(estrdup(uri_list->val)); - - for (uri = uri_list; uri != NULL; uri = uri->next) { + STAILQ_FOREACH(uri, uri_list, entries) { + if (ldap_conf.ssl_mode == SUDO_LDAP_STARTTLS) { + if (strncasecmp(uri->val, "ldaps://", 8) == 0) { + warningx(U_("starttls not supported when using ldaps")); + ldap_conf.ssl_mode = SUDO_LDAP_SSL; + } + } len += strlen(uri->val) + 1; } buf = cp = emalloc(len); buf[0] = '\0'; - for (uri = uri_list; uri != NULL; uri = uri->next) { + STAILQ_FOREACH(uri, uri_list, entries) { cp += strlcpy(cp, uri->val, len - (cp - buf)); *cp++ = ' '; } @@ -515,19 +542,24 @@ sudo_ldap_join_uri(struct ldap_config_list_str *uri_li } #endif /* HAVE_LDAP_INITIALIZE */ +/* + * Wrapper for ldap_create() or ldap_init() that handles + * SSL/TLS initialization as well. + * Returns LDAP_SUCCESS on success, else non-zero. + */ static int sudo_ldap_init(LDAP **ldp, const char *host, int port) { - LDAP *ld = NULL; + LDAP *ld; int rc = LDAP_CONNECT_ERROR; debug_decl(sudo_ldap_init, SUDO_DEBUG_LDAP) #ifdef HAVE_LDAPSSL_INIT if (ldap_conf.ssl_mode != SUDO_LDAP_CLEAR) { const int defsecure = ldap_conf.ssl_mode == SUDO_LDAP_SSL; - DPRINTF(("ldapssl_clientauth_init(%s, %s)", + 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); /* @@ -552,57 +584,72 @@ sudo_ldap_init(LDAP **ldp, const char *host, int port) } } if (retry) { - DPRINTF(("ldapssl_clientauth_init(%s, %s)", + 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); } } if (rc != LDAP_SUCCESS) { - warningx(_("unable to initialize SSL cert and key db: %s"), + warningx(U_("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); + warningx(U_("you must set TLS_CERT in %s to use SSL"), + path_ldap_conf); goto done; } - DPRINTF(("ldapssl_init(%s, %d, %d)", host, port, defsecure), 2); + 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) { + int sslrc; + rc = ldap_ssl_client_init(ldap_conf.tls_keyfile, ldap_conf.tls_keypw, + 0, &sslrc); + if (rc != LDAP_SUCCESS) { + warningx("ldap_ssl_client_init(): %s (SSL reason code %d)", + ldap_err2string(rc), sslrc); + goto done; + } + 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) - rc = LDAP_SUCCESS; + DPRINTF2("ldap_init(%s, %d)", host, port); + if ((ld = ldap_init((char *)host, port)) == NULL) + goto done; + rc = LDAP_SUCCESS; #endif } -done: *ldp = ld; +done: debug_return_int(rc); } /* * Walk through search results and return true if we have a matching - * netgroup, else false. + * non-Unix group (including netgroups), else false. */ static bool -sudo_ldap_check_user_netgroup(LDAP *ld, LDAPMessage *entry, char *user) +sudo_ldap_check_non_unix_group(LDAP *ld, LDAPMessage *entry, struct passwd *pw) { struct berval **bv, **p; char *val; int ret = false; - debug_decl(sudo_ldap_check_user_netgroup, SUDO_DEBUG_LDAP) + debug_decl(sudo_ldap_check_non_unix_group, SUDO_DEBUG_LDAP) if (!entry) debug_return_bool(ret); @@ -615,11 +662,17 @@ sudo_ldap_check_user_netgroup(LDAP *ld, LDAPMessage *e /* 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 */ @@ -655,8 +708,7 @@ sudo_ldap_check_host(LDAP *ld, LDAPMessage *entry) 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); + DPRINTF2("ldap sudoHost '%s' ... %s", val, ret ? "MATCH!" : "not"); } ldap_value_free_len(bv); /* cleanup */ @@ -723,12 +775,11 @@ sudo_ldap_check_runas_user(LDAP *ld, LDAPMessage *entr } /* FALLTHROUGH */ default: - if (strcasecmp(val, runas_pw->pw_name) == 0) + 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 */ @@ -758,8 +809,8 @@ sudo_ldap_check_runas_group(LDAP *ld, LDAPMessage *ent 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); + DPRINTF2("ldap sudoRunAsGroup '%s' ... %s", + val, ret ? "MATCH!" : "not"); } ldap_value_free_len(bv); /* cleanup */ @@ -786,6 +837,65 @@ sudo_ldap_check_runas(LDAP *ld, LDAPMessage *entry) 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. @@ -793,6 +903,7 @@ sudo_ldap_check_runas(LDAP *ld, LDAPMessage *entry) 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; bool foundbang; @@ -813,10 +924,13 @@ sudo_ldap_check_command(LDAP *ld, LDAPMessage *entry, ret = true; if (setenv_implied != NULL) *setenv_implied = true; - DPRINTF(("ldap sudoCommand '%s' ... MATCH!", val), 2); + 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; @@ -832,17 +946,19 @@ 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; } - 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 */ @@ -872,7 +988,7 @@ sudo_ldap_check_bool(LDAP *ld, LDAPMessage *entry, cha /* 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++; @@ -906,7 +1022,7 @@ sudo_ldap_parse_options(LDAP *ld, LDAPMessage *entry) /* 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, '='); @@ -963,28 +1079,28 @@ 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); if ((tp = gmtime(&now)) == NULL) { - warning(_("unable to get GMT time")); + warning(U_("unable to get GMT time")); goto done; } /* 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(U_("unable to format timestamp")); goto done; } /* Build filter. */ bytes = snprintf(buffer, buffersize, "(&(|(!(sudoNotAfter=*))(sudoNotAfter>=%s))(|(!(sudoNotBefore=*))(sudoNotBefore<=%s)))", timebuffer, timebuffer); - if (bytes < 0 || bytes >= buffersize) { - warning(_("unable to build time filter")); + if (bytes <= 0 || (size_t)bytes >= buffersize) { + warning(U_("unable to build time filter")); bytes = 0; } @@ -1108,15 +1224,19 @@ static char * sudo_ldap_build_pass1(struct passwd *pw) { struct group *grp; - char *buf, timebuffer[TIMEFILTER_LENGTH], gidbuf[MAX_UID_T_LEN]; + 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 + sudo_ldap_value_len(pw->pw_name); @@ -1126,7 +1246,7 @@ sudo_ldap_build_pass1(struct passwd *pw) sz += 12 + sudo_ldap_value_len(grp->gr_name); } sz += 13 + MAX_UID_T_LEN; - if ((grlist = get_group_list(pw)) != NULL) { + 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; @@ -1193,13 +1313,13 @@ sudo_ldap_build_pass1(struct passwd *pw) /* 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(U_("sudo_ldap_build_pass1 allocation mismatch")); /* Add the time restriction, or simply end the global OR. */ if (ldap_conf.timed) { @@ -1215,27 +1335,42 @@ sudo_ldap_build_pass1(struct passwd *pw) } /* - * 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) + /* Short circuit if no non-Unix group support. */ + if (!def_use_netgroups && !def_group_plugin) { + debug_return_str(NULL); + } + 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=%s*)(sudoUser=%%:*))%s%s", + (ldap_conf.timed || ldap_conf.search_filter) ? "(&" : "", + ldap_conf.search_filter ? ldap_conf.search_filter : "", + def_use_netgroups ? "+" : "", + ldap_conf.timed ? timebuffer : "", + (ldap_conf.timed || ldap_conf.search_filter) ? ")" : ""); + } else { + 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) ? ")" : ""); + } debug_return_str(filt); } @@ -1247,7 +1382,7 @@ sudo_ldap_read_secret(const char *path) 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'; @@ -1272,6 +1407,7 @@ sudo_ldap_parse_keyword(const char *keyword, const cha struct ldap_config_table *table) { struct ldap_config_table *cur; + const char *errstr; debug_decl(sudo_ldap_parse_keyword, SUDO_DEBUG_LDAP) /* Look up keyword in config tables */ @@ -1292,24 +1428,27 @@ sudo_ldap_parse_keyword(const char *keyword, const cha *(int *)(cur->valp) = atobool(value) == true; break; case CONF_INT: - *(int *)(cur->valp) = atoi(value); + *(int *)(cur->valp) = strtonum(value, INT_MIN, INT_MAX, &errstr); + if (errstr != NULL) { + warningx(U_("%s: %s: %s: %s"), + path_ldap_conf, keyword, value, U_(errstr)); + } break; case CONF_STR: efree(*(char **)(cur->valp)); - *(char **)(cur->valp) = estrdup(value); + *(char **)(cur->valp) = *value ? estrdup(value) : NULL; break; case CONF_LIST_STR: { - struct ldap_config_list_str **p; + struct ldap_config_str_list *head; + struct ldap_config_str *str; 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; + head = (struct ldap_config_str_list *)cur->valp; + str = emalloc(sizeof(*str) + len); + memcpy(str->val, value, len + 1); + STAILQ_INSERT_TAIL(head, str, entries); } } break; @@ -1320,11 +1459,67 @@ sudo_ldap_parse_keyword(const char *keyword, const cha debug_return_bool(false); } +#ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S +static const char * +sudo_krb5_ccname_path(const char *old_ccname) +{ + const char *ccname = old_ccname; + debug_decl(sudo_krb5_ccname_path, SUDO_DEBUG_LDAP) + + /* Strip off leading FILE: or WRFILE: prefix. */ + switch (ccname[0]) { + case 'F': + case 'f': + if (strncasecmp(ccname, "FILE:", 5) == 0) + ccname += 5; + break; + case 'W': + case 'w': + if (strncasecmp(ccname, "WRFILE:", 7) == 0) + ccname += 7; + break; + } + sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO, + "ccache %s -> %s", old_ccname, ccname); + + /* Credential cache must be a fully-qualified path name. */ + debug_return_const_str(*ccname == '/' ? ccname : NULL); +} + static bool +sudo_check_krb5_ccname(const char *ccname) +{ + int fd = -1; + const char *ccname_path; + debug_decl(sudo_check_krb5_ccname, SUDO_DEBUG_LDAP) + + /* Strip off prefix to get path name. */ + ccname_path = sudo_krb5_ccname_path(ccname); + if (ccname_path == NULL) { + sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_LINENO, + "unsupported krb5 credential cache path: %s", ccname); + debug_return_bool(false); + } + /* Make sure credential cache is fully-qualified and exists. */ + fd = open(ccname_path, O_RDONLY|O_NONBLOCK, 0); + if (fd == -1) { + sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_LINENO, + "unable to open krb5 credential cache: %s", ccname_path); + debug_return_bool(false); + } + close(fd); + sudo_debug_printf(SUDO_DEBUG_INFO, + "using krb5 credential cache: %s", ccname_path); + debug_return_bool(true); +} +#endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */ + +static bool sudo_ldap_read_config(void) { FILE *fp; - char *cp, *keyword, *value; + char *cp, *keyword, *value, *line = NULL; + size_t linesize = 0; debug_decl(sudo_ldap_read_config, SUDO_DEBUG_LDAP) /* defaults */ @@ -1337,16 +1532,19 @@ sudo_ldap_read_config(void) ldap_conf.use_sasl = -1; ldap_conf.rootuse_sasl = -1; ldap_conf.deref = -1; + ldap_conf.search_filter = estrdup(DEFAULT_SEARCH_FILTER); + STAILQ_INIT(&ldap_conf.uri); + STAILQ_INIT(&ldap_conf.base); - if ((fp = fopen(_PATH_LDAP_CONF, "r")) == NULL) + 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) @@ -1361,109 +1559,92 @@ sudo_ldap_read_config(void) 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 (!STAILQ_EMPTY(&ldap_conf.uri)) { + struct ldap_config_str *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); + STAILQ_FOREACH(uri, &ldap_conf.uri, entries) { + DPRINTF1("uri %s", uri->val); } - sudo_printf(SUDO_CONV_ERROR_MSG, "ldap_version %d\n", - ldap_conf.version); + } 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 (!STAILQ_EMPTY(&ldap_conf.base)) { + struct ldap_config_str *base; + STAILQ_FOREACH(base, &ldap_conf.base, entries) { + DPRINTF1("sudoers_base %s", base->val); } - 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); - } + } 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)"); } - if (!ldap_conf.base) +#endif + DPRINTF1("==================="); + + if (STAILQ_EMPTY(&ldap_conf.base)) debug_return_bool(false); /* if no base is defined, ignore LDAP */ if (ldap_conf.bind_timelimit > 0) @@ -1488,19 +1669,20 @@ sudo_ldap_read_config(void) #ifndef HAVE_LDAP_INITIALIZE /* Convert uri list to host list if no ldap_initialize(). */ - if (ldap_conf.uri) { - struct ldap_config_list_str *uri = ldap_conf.uri; - if (sudo_ldap_parse_uri(uri) != 0) + if (!STAILQ_EMPTY(&ldap_conf.uri)) { + struct ldap_config_str *uri; + + if (sudo_ldap_parse_uri(&ldap_conf.uri) != LDAP_SUCCESS) debug_return_bool(false); - do { - ldap_conf.uri = uri->next; + while ((uri = STAILQ_FIRST(&ldap_conf.uri)) != NULL) { + STAILQ_REMOVE_HEAD(&ldap_conf.uri, entries); efree(uri); - } while ((uri = ldap_conf.uri)); + } ldap_conf.port = LDAP_PORT; } #endif - if (!ldap_conf.uri) { + if (STAILQ_EMPTY(&ldap_conf.uri)) { /* Use port 389 for plaintext LDAP and port 636 for SSL LDAP */ if (ldap_conf.port < 0) ldap_conf.port = @@ -1530,29 +1712,18 @@ 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 /* * Make sure we can open the file specified by krb5_ccname. */ if (ldap_conf.krb5_ccname != NULL) { - if (strncasecmp(ldap_conf.krb5_ccname, "FILE:", 5) == 0 || - strncasecmp(ldap_conf.krb5_ccname, "WRFILE:", 7) == 0) { - 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); - fclose(fp); - } else { - /* Can't open it, just ignore the entry. */ - DPRINTF(("unable to open krb5 credential cache: %s", value), 1); - efree(ldap_conf.krb5_ccname); - ldap_conf.krb5_ccname = NULL; - } - } + if (!sudo_check_krb5_ccname(ldap_conf.krb5_ccname)) + ldap_conf.krb5_ccname = NULL; } #endif + debug_return_bool(true); } @@ -1596,7 +1767,7 @@ sudo_ldap_display_defaults(struct sudo_nss *nss, struc { struct berval **bv, **p; struct timeval tv, *tvp = NULL; - struct ldap_config_list_str *base; + struct ldap_config_str *base; struct sudo_ldap_handle *handle = nss->handle; LDAP *ld; LDAPMessage *entry, *result; @@ -1609,7 +1780,7 @@ sudo_ldap_display_defaults(struct sudo_nss *nss, struc ld = handle->ld; filt = sudo_ldap_build_default_filter(); - for (base = ldap_conf.base; base != NULL; base = base->next) { + STAILQ_FOREACH(base, &ldap_conf.base, entries) { if (ldap_conf.timeout > 0) { tv.tv_sec = ldap_conf.timeout; tv.tv_usec = 0; @@ -1821,7 +1992,7 @@ sudo_ldap_display_privs(struct sudo_nss *nss, struct p 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. */ @@ -1856,7 +2027,7 @@ 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; @@ -1875,17 +2046,121 @@ done: } #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S +static unsigned int (*sudo_gss_krb5_ccache_name)(unsigned int *minor_status, const char *name, const char **old_name); + static int +sudo_set_krb5_ccache_name(const char *name, const char **old_name) +{ + int rc = 0; + unsigned int junk; + static bool initialized; + debug_decl(sudo_set_krb5_ccache_name, SUDO_DEBUG_LDAP) + + if (!initialized) { + sudo_gss_krb5_ccache_name = + sudo_dso_findsym(SUDO_DSO_DEFAULT, "gss_krb5_ccache_name"); + initialized = true; + } + + /* + * Try to use gss_krb5_ccache_name() if possible. + * We also need to set KRB5CCNAME since some LDAP libs may not use + * gss_krb5_ccache_name(). + */ + if (sudo_gss_krb5_ccache_name != NULL) { + rc = sudo_gss_krb5_ccache_name(&junk, name, old_name); + } else { + /* No gss_krb5_ccache_name(), fall back on KRB5CCNAME. */ + if (old_name != NULL) + *old_name = sudo_getenv("KRB5CCNAME"); + } + if (name != NULL && *name != '\0') + sudo_setenv("KRB5CCNAME", name, true); + else + sudo_unsetenv("KRB5CCNAME"); + + debug_return_int(rc); +} + +/* + * Make a copy of the credential cache file specified by KRB5CCNAME + * which must be readable by the user. The resulting cache file + * is root-owned and will be removed after authenticating via SASL. + */ +static char * +sudo_krb5_copy_cc_file(const char *old_ccname) +{ + int ofd, nfd; + ssize_t nread, nwritten = -1; + static char new_ccname[sizeof(_PATH_TMP) + sizeof("sudocc_XXXXXXXX") - 1]; + char buf[10240], *ret = NULL; + debug_decl(sudo_krb5_copy_cc_file, SUDO_DEBUG_LDAP) + + old_ccname = sudo_krb5_ccname_path(old_ccname); + if (old_ccname != NULL) { + /* Open credential cache as user to prevent stolen creds. */ + set_perms(PERM_USER); + ofd = open(old_ccname, O_RDONLY|O_NONBLOCK); + restore_perms(); + + if (ofd != -1) { + (void) fcntl(ofd, F_SETFL, 0); + if (lock_file(ofd, SUDO_LOCK)) { + snprintf(new_ccname, sizeof(new_ccname), "%s%s", + _PATH_TMP, "sudocc_XXXXXXXX"); + nfd = mkstemp(new_ccname); + if (nfd != -1) { + sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO, + "copy ccache %s -> %s", old_ccname, new_ccname); + while ((nread = read(ofd, buf, sizeof(buf))) > 0) { + ssize_t off = 0; + do { + nwritten = write(nfd, buf + off, nread - off); + if (nwritten == -1) { + warning("error writing to %s", new_ccname); + goto write_error; + } + off += nwritten; + } while (off < nread); + } + if (nread == -1) + warning("unable to read %s", new_ccname); +write_error: + close(nfd); + if (nread != -1 && nwritten != -1) { + ret = new_ccname; /* success! */ + } else { + unlink(new_ccname); /* failed */ + } + } else { + warning("unable to create temp file %s", new_ccname); + } + } + close(ofd); + } else { + sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_LINENO|SUDO_DEBUG_ERRNO, + "unable to open %s", old_ccname); + } + } + debug_return_str(ret); +} + +static int sudo_ldap_sasl_interact(LDAP *ld, unsigned int flags, void *_auth_id, void *_interact) { char *auth_id = (char *)_auth_id; sasl_interact_t *interact = (sasl_interact_t *)_interact; + int rc = LDAP_SUCCESS; debug_decl(sudo_ldap_sasl_interact, SUDO_DEBUG_LDAP) for (; interact->id != SASL_CB_LIST_END; interact++) { - if (interact->id != SASL_CB_USER) - debug_return_int(LDAP_PARAM_ERROR); + if (interact->id != SASL_CB_USER) { + warningx("sudo_ldap_sasl_interact: unexpected interact id %lu", + interact->id); + rc = LDAP_PARAM_ERROR; + break; + } if (auth_id != NULL) interact->result = auth_id; @@ -1896,22 +2171,28 @@ sudo_ldap_sasl_interact(LDAP *ld, unsigned int flags, interact->len = strlen(interact->result); #if SASL_VERSION_MAJOR < 2 - interact->result = estrdup(interact->result); + interact->result = strdup(interact->result); + if (interact->result == NULL) { + rc = LDAP_NO_MEMORY; + break; + } #endif /* SASL_VERSION_MAJOR < 2 */ + DPRINTF2("sudo_ldap_sasl_interact: SASL_CB_USER %s", + (const char *)interact->result); } - debug_return_int(LDAP_SUCCESS); + debug_return_int(rc); } #endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */ - /* * Set LDAP options from the specified options table + * Returns LDAP_SUCCESS on success, else non-zero. */ static int sudo_ldap_set_options_table(LDAP *ld, struct ldap_config_table *table) { struct ldap_config_table *cur; - int ival, rc; + int ival, rc, errors = 0; char *sval; debug_decl(sudo_ldap_set_options_table, SUDO_DEBUG_LDAP) @@ -1924,34 +2205,35 @@ sudo_ldap_set_options_table(LDAP *ld, struct ldap_conf case CONF_INT: ival = *(int *)(cur->valp); if (ival >= 0) { + 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)); - debug_return_int(-1); + errors++; } - DPRINTF(("ldap_set_option: %s -> %d", cur->conf_str, ival), 1); } break; case CONF_STR: sval = *(char **)(cur->valp); if (sval != NULL) { + 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)); - debug_return_int(-1); + errors++; } - DPRINTF(("ldap_set_option: %s -> %s", cur->conf_str, sval), 1); } break; } } - debug_return_int(0); + debug_return_int(errors ? -1 : LDAP_SUCCESS); } /* * Set LDAP options based on the global config table. + * Returns LDAP_SUCCESS on success, else non-zero. */ static int sudo_ldap_set_options_global(void) @@ -1967,13 +2249,12 @@ sudo_ldap_set_options_global(void) /* 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); + debug_return_int(rc); } /* * Set LDAP options based on the per-connection config table. + * Returns LDAP_SUCCESS on success, else non-zero. */ static int sudo_ldap_set_options_conn(LDAP *ld) @@ -1992,14 +2273,12 @@ sudo_ldap_set_options_conn(LDAP *ld) 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)); - debug_return_int(-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 @@ -2008,30 +2287,32 @@ sudo_ldap_set_options_conn(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)); - debug_return_int(-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)); debug_return_int(-1); } - DPRINTF(("ldap_set_option(LDAP_OPT_X_TLS, LDAP_OPT_X_TLS_HARD)"), 1); } #endif - debug_return_int(0); + debug_return_int(LDAP_SUCCESS); } /* @@ -2043,7 +2324,10 @@ sudo_ldap_result_alloc(void) struct ldap_result *result; debug_decl(sudo_ldap_result_alloc, SUDO_DEBUG_LDAP) - debug_return_ptr(ecalloc(1, sizeof(*result))); + result = ecalloc(1, sizeof(*result)); + STAILQ_INIT(&result->searches); + + debug_return_ptr(result); } /* @@ -2052,7 +2336,7 @@ sudo_ldap_result_alloc(void) static void sudo_ldap_result_free(struct ldap_result *lres) { - struct ldap_search_list *s; + struct ldap_search_result *s; debug_decl(sudo_ldap_result_free, SUDO_DEBUG_LDAP) if (lres != NULL) { @@ -2060,12 +2344,10 @@ sudo_ldap_result_free(struct ldap_result *lres) efree(lres->entries); lres->entries = NULL; } - if (lres->searches) { - while ((s = lres->searches) != NULL) { - ldap_msgfree(s->searchresult); - lres->searches = s->next; - efree(s); - } + while ((s = STAILQ_FIRST(&lres->searches)) != NULL) { + STAILQ_REMOVE_HEAD(&lres->searches, entries); + ldap_msgfree(s->searchresult); + efree(s); } efree(lres); } @@ -2075,80 +2357,82 @@ sudo_ldap_result_free(struct ldap_result *lres) /* * Add a search result to the ldap_result structure. */ -static struct ldap_search_list * +static struct ldap_search_result * sudo_ldap_result_add_search(struct ldap_result *lres, LDAP *ldap, LDAPMessage *searchresult) { - struct ldap_search_list *s, *news; + struct ldap_search_result *news; debug_decl(sudo_ldap_result_add_search, SUDO_DEBUG_LDAP) - news = ecalloc(1, sizeof(struct ldap_search_list)); + /* Create new entry and add it to the end of the chain. */ + news = ecalloc(1, sizeof(*news)); news->ldap = ldap; news->searchresult = searchresult; - /* news->next = NULL; */ + STAILQ_INSERT_TAIL(&lres->searches, news, entries); - /* Add entry to the end of the chain (XXX - tailq instead?). */ - if (lres->searches) { - for (s = lres->searches; s->next != NULL; s = s->next) - continue; - s->next = news; - } else { - lres->searches = news; - } debug_return_ptr(news); } /* - * Connect to the LDAP server specified by ld + * Connect to the LDAP server specified by ld. + * Returns LDAP_SUCCESS on success, else non-zero. */ static int sudo_ldap_bind_s(LDAP *ld) { int rc; -#ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S - const char *old_ccname = user_ccname; -# ifdef HAVE_GSS_KRB5_CCACHE_NAME - 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)) { + const char *old_ccname = NULL; + const char *new_ccname = ldap_conf.krb5_ccname; + const char *tmp_ccname = NULL; void *auth_id = ldap_conf.rootsasl_auth_id ? ldap_conf.rootsasl_auth_id : ldap_conf.sasl_auth_id; - if (ldap_conf.krb5_ccname != NULL) { -# ifdef HAVE_GSS_KRB5_CCACHE_NAME - 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); + /* Make temp copy of the user's credential cache as needed. */ + if (ldap_conf.krb5_ccname == NULL && user_ccname != NULL) { + new_ccname = tmp_ccname = sudo_krb5_copy_cc_file(user_ccname); + if (tmp_ccname == NULL) { + sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO, + "unable to copy user ccache %s", user_ccname); } -# else - sudo_setenv("KRB5CCNAME", ldap_conf.krb5_ccname, true); -# endif } + + if (new_ccname != NULL) { + rc = sudo_set_krb5_ccache_name(new_ccname, &old_ccname); + if (rc == 0) { + sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO, + "set ccache name %s -> %s", + old_ccname ? old_ccname : "(none)", new_ccname); + } else { + sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_LINENO, + "gss_krb5_ccache_name() failed: %d", rc); + } + } rc = ldap_sasl_interactive_bind_s(ld, ldap_conf.binddn, "GSSAPI", NULL, NULL, LDAP_SASL_QUIET, sudo_ldap_sasl_interact, auth_id); - 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); -# else - if (old_ccname != NULL) - sudo_setenv("KRB5CCNAME", old_ccname, true); - else - sudo_unsetenv("KRB5CCNAME"); -# endif + if (new_ccname != NULL) { + rc = sudo_set_krb5_ccache_name(old_ccname, NULL); + if (rc == 0) { + sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO, + "restore ccache name %s -> %s", new_ccname, old_ccname); + } else { + sudo_debug_printf(SUDO_DEBUG_WARN|SUDO_DEBUG_LINENO, + "gss_krb5_ccache_name() failed: %d", rc); + } + /* Remove temporary copy of user's credential cache. */ + if (tmp_ccname != NULL) + unlink(tmp_ccname); } if (rc != LDAP_SUCCESS) { warningx("ldap_sasl_interactive_bind_s(): %s", ldap_err2string(rc)); - debug_return_int(-1); + goto done; } - 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 @@ -2162,21 +2446,22 @@ sudo_ldap_bind_s(LDAP *ld) NULL, NULL, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_sasl_bind_s(): %s", ldap_err2string(rc)); - debug_return_int(-1); + goto done; } - 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)); - debug_return_int(-1); + goto done; } - DPRINTF(("ldap_simple_bind_s() ok"), 1); + DPRINTF1("ldap_simple_bind_s() ok"); } #endif - debug_return_int(0); +done: + debug_return_int(rc); } /* @@ -2187,13 +2472,20 @@ static int sudo_ldap_open(struct sudo_nss *nss) { LDAP *ld; - int rc; + int rc = -1; + sigaction_t sa, saved_sa_pipe; bool ldapnoinit = false; struct sudo_ldap_handle *handle; debug_decl(sudo_ldap_open, SUDO_DEBUG_LDAP) + /* Ignore SIGPIPE if we cannot bind to the server. */ + memset(&sa, 0, sizeof(sa)); + sigemptyset(&sa.sa_mask); + sa.sa_handler = SIG_IGN; + (void) sigaction(SIGPIPE, &sa, &saved_sa_pipe); + if (!sudo_ldap_read_config()) - debug_return_int(-1); + goto done; /* Prevent reading of user ldaprc and system defaults. */ if (sudo_getenv("LDAPNOINIT") == NULL) { @@ -2202,27 +2494,32 @@ sudo_ldap_open(struct sudo_nss *nss) } /* Set global LDAP options */ - if (sudo_ldap_set_options_global() < 0) - debug_return_int(-1); + if (sudo_ldap_set_options_global() != LDAP_SUCCESS) + goto done; /* 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); - rc = ldap_initialize(&ld, buf); - efree(buf); - if (rc != LDAP_SUCCESS) - warningx(_("unable to initialize LDAP: %s"), ldap_err2string(rc)); + if (!STAILQ_EMPTY(&ldap_conf.uri)) { + char *buf = sudo_ldap_join_uri(&ldap_conf.uri); + if (buf != NULL) { + DPRINTF2("ldap_initialize(ld, %s)", buf); + rc = ldap_initialize(&ld, buf); + efree(buf); + if (rc != LDAP_SUCCESS) { + warningx(U_("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) - debug_return_int(-1); + goto done; /* Set LDAP per-connection options */ - if (sudo_ldap_set_options_conn(ld) < 0) - debug_return_int(-1); + rc = sudo_ldap_set_options_conn(ld); + if (rc != LDAP_SUCCESS) + goto done; if (ldapnoinit) sudo_unsetenv("LDAPNOINIT"); @@ -2232,28 +2529,33 @@ sudo_ldap_open(struct sudo_nss *nss) rc = ldap_start_tls_s(ld, NULL, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_start_tls_s(): %s", ldap_err2string(rc)); - debug_return_int(-1); + goto done; } - 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) { - warningx("ldap_ssl_client_init(): %s", ldap_err2string(rc)); - debug_return_int(-1); + int sslrc; + rc = ldap_ssl_client_init(ldap_conf.tls_keyfile, ldap_conf.tls_keypw, + 0, &sslrc); + if (rc != LDAP_SUCCESS) { + warningx("ldap_ssl_client_init(): %s (SSL reason code %d)", + ldap_err2string(rc), sslrc); + goto done; } rc = ldap_start_tls_s_np(ld, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_start_tls_s_np(): %s", ldap_err2string(rc)); - debug_return_int(-1); + goto done; } - 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()")); + warningx(U_("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 */ } /* Actually connect */ - if (sudo_ldap_bind_s(ld) != 0) - debug_return_int(-1); + rc = sudo_ldap_bind_s(ld); + if (rc != LDAP_SUCCESS) + goto done; /* Create a handle container. */ handle = ecalloc(1, sizeof(struct sudo_ldap_handle)); @@ -2263,13 +2565,15 @@ sudo_ldap_open(struct sudo_nss *nss) /* handle->grlist = NULL; */ nss->handle = handle; - debug_return_int(0); +done: + (void) sigaction(SIGPIPE, &saved_sa_pipe, NULL); + debug_return_int(rc == LDAP_SUCCESS ? 0 : -1); } static int sudo_ldap_setdefs(struct sudo_nss *nss) { - struct ldap_config_list_str *base; + struct ldap_config_str *base; struct sudo_ldap_handle *handle = nss->handle; struct timeval tv, *tvp = NULL; LDAP *ld; @@ -2283,9 +2587,9 @@ sudo_ldap_setdefs(struct sudo_nss *nss) 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) { + STAILQ_FOREACH(base, &ldap_conf.base, entries) { if (ldap_conf.timeout > 0) { tv.tv_sec = ldap_conf.timeout; tv.tv_usec = 0; @@ -2295,11 +2599,11 @@ 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); } @@ -2338,7 +2642,7 @@ 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) || @@ -2377,7 +2681,7 @@ 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; for (i = 0; i < lres->nentries; i++) { @@ -2387,9 +2691,9 @@ 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); + DPRINTF1("Command %sallowed", rc == true ? "" : "NOT "); if (rc == true) { - DPRINTF(("LDAP entry: %p", entry), 1); + DPRINTF1("LDAP entry: %p", entry); /* Apply entry-specific options. */ if (setenv_implied) def_setenv = true; @@ -2412,9 +2716,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. */ @@ -2425,7 +2729,7 @@ 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); debug_return_int(ret); } @@ -2445,21 +2749,15 @@ ldap_entry_compare(const void *a, const void *b) } /* - * Find the last entry in the list of searches, usually the + * Return the last entry in the list of searches, usually the * one currently being used to add entries. - * XXX - use a tailq instead? */ -static struct ldap_search_list * +static struct ldap_search_result * 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; - } - debug_return_ptr(result); + debug_return_ptr(STAILQ_LAST(&lres->searches, ldap_search_result, entries)); } /* @@ -2468,7 +2766,7 @@ sudo_ldap_result_last_search(struct ldap_result *lres) static struct ldap_entry_wrapper * sudo_ldap_result_add_entry(struct ldap_result *lres, LDAPMessage *entry) { - struct ldap_search_list *last; + struct ldap_search_result *last; struct berval **bv; double order = 0.0; char *ep; @@ -2480,13 +2778,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); + warningx(U_("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); } @@ -2518,7 +2816,7 @@ sudo_ldap_result_free_nss(struct sudo_nss *nss) 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); @@ -2538,12 +2836,12 @@ static struct ldap_result * sudo_ldap_result_get(struct sudo_nss *nss, struct passwd *pw) { struct sudo_ldap_handle *handle = nss->handle; - struct ldap_config_list_str *base; + struct ldap_config_str *base; struct ldap_result *lres; 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) @@ -2554,13 +2852,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); + 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); } @@ -2574,52 +2872,55 @@ 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 (base = ldap_conf.base; base != NULL; base = base->next) { - DPRINTF(("searching from base '%s'", base->val), 1); - if (ldap_conf.timeout > 0) { - tv.tv_sec = ldap_conf.timeout; - tv.tv_usec = 0; - tvp = &tv; - } - result = NULL; - 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); - continue; - } - lres->user_matches = true; + for (pass = 0; pass < 2; pass++) { + filt = pass ? sudo_ldap_build_pass2() : sudo_ldap_build_pass1(pw); + if (filt != NULL) { + DPRINTF1("ldap search '%s'", filt); + STAILQ_FOREACH(base, &ldap_conf.base, entries) { + DPRINTF1("searching from base '%s'", + base->val); + if (ldap_conf.timeout > 0) { + tv.tv_sec = ldap_conf.timeout; + tv.tv_usec = 0; + tvp = &tv; + } + result = NULL; + rc = ldap_search_ext_s(ld, base->val, LDAP_SCOPE_SUBTREE, filt, + NULL, 0, NULL, NULL, tvp, 0, &result); + if (rc != LDAP_SUCCESS) { + DPRINTF1("nothing found for '%s'", filt); + continue; + } + lres->user_matches = true; - /* Add the seach result to list of search results. */ - DPRINTF(("adding search result"), 1); - 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)) && - sudo_ldap_check_host(ld, entry)) { - lres->host_matches = true; - sudo_ldap_result_add_entry(lres, entry); + /* Add the seach result to list of search results. */ + DPRINTF1("adding search result"); + sudo_ldap_result_add_search(lres, ld, result); + LDAP_FOREACH(entry, ld, result) { + if ((!pass || + sudo_ldap_check_non_unix_group(ld, entry, pw)) && + sudo_ldap_check_host(ld, entry)) { + lres->host_matches = true; + sudo_ldap_result_add_entry(lres, entry); + } } + DPRINTF1("result now has %d entries", lres->nentries); } - DPRINTF(("result now has %d entries", lres->nentries), 1); + efree(filt); } - 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); @@ -2688,7 +2989,7 @@ sudo_ldap_result_from_search(LDAP *ldap, LDAPMessage * * Build a new list node for the search result, this creates the * list node. */ - struct ldap_search_list *last = sudo_ldap_result_add_search(result, + struct ldap_search_result *last = sudo_ldap_result_add_search(result, ldap, searchresult); /* @@ -2699,8 +3000,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