X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-passwd%2Fsearch.c;h=23a74ab53aedaa0ec8e49534cfd3b034654a97e8;hb=f96e6378d6cd06c744a47af5e5e551cbb494826a;hp=7c32656ec2d39b75496070f38e3db95fa6385637;hpb=2a869f5a99f537b246ba8640502e2a86117cb6e8;p=openldap

diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c
index 7c32656ec2..23a74ab53a 100644
--- a/servers/slapd/back-passwd/search.c
+++ b/servers/slapd/back-passwd/search.c
@@ -1,9 +1,42 @@
 /* search.c - /etc/passwd backend search function */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2006 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).  Additional significant contributors
+ * include:
+ *     Hallvard B. Furuseth
+ *     Howard Chu
+ *     Kurt D. Zeilenga
+ */
 
 #include "portable.h"
 
 #include <stdio.h>
 
+#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -11,146 +44,315 @@
 #include <pwd.h>
 
 #include "slap.h"
+#include "back-passwd.h"
 
-extern time_t		currenttime;
-extern pthread_mutex_t	currenttime_mutex;
+static void pw_start( Backend *be );
 
-static Entry	*pw2entry();
+static int pw2entry(
+	Backend		*be,
+	struct passwd	*pw,
+	Entry		*ep );
 
 int
 passwd_back_search(
-    Backend	*be,
-    Connection	*conn,
     Operation	*op,
-    char	*base,
-    int		scope,
-    int		deref,
-    int		slimit,
-    int		tlimit,
-    Filter	*filter,
-    char	*filterstr,
-    char	**attrs,
-    int		attrsonly
-)
+    SlapReply	*rs )
 {
 	struct passwd	*pw;
-	Entry		*e;
-	char		*s;
-	time_t		stoptime;
+	time_t		stoptime = (time_t)-1;
 
-	tlimit = (tlimit > be->be_timelimit || tlimit < 1) ? be->be_timelimit
-	    : tlimit;
-	stoptime = op->o_time + tlimit;
-	slimit = (slimit > be->be_sizelimit || slimit < 1) ? be->be_sizelimit
-	    : slimit;
+	LDAPRDN rdn = NULL;
+	struct berval parent = BER_BVNULL;
 
-#ifdef HAVE_SETPWFILE
-	if ( be->be_private != NULL ) {
-		endpwent();
-		(void) setpwfile( (char *) be->be_private );
+	AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
+
+	if ( op->ors_tlimit != SLAP_NO_LIMIT ) {
+		stoptime = op->o_time + op->ors_tlimit;
 	}
-#endif /* HAVE_SETPWFILE */
 
-	if ( scope == LDAP_SCOPE_BASE ) {
-		if ( (s = strchr( base, '@' )) != NULL ) {
-			*s = '\0';
-		}
+	/* Handle a query for the base of this backend */
+	if ( be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
+		struct berval	val;
 
-		if ( (pw = getpwnam( base )) == NULL ) {
-			send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT,
-			    s != NULL ? s + 1 : NULL, NULL );
-			return( -1 );
-		}
+		rs->sr_matched = op->o_req_dn.bv_val;
+
+		if( op->ors_scope != LDAP_SCOPE_ONELEVEL ) {
+			AttributeDescription	*desc = NULL;
+			char			*next;
+			Entry			e = { 0 };
 
-		e = pw2entry( be, pw );
-		if ( test_filter( be, conn, op, e, filter ) == 0 ) {
-			send_search_entry( be, conn, op, e, attrs, attrsonly );
+			/* Create an entry corresponding to the base DN */
+			e.e_name.bv_val = ch_strdup( op->o_req_dn.bv_val );
+			e.e_name.bv_len = op->o_req_dn.bv_len;
+			e.e_nname.bv_val =  ch_strdup( op->o_req_ndn.bv_val );
+			e.e_nname.bv_len = op->o_req_ndn.bv_len;
+
+			/* Use the first attribute of the DN
+		 	* as an attribute within the entry itself.
+		 	*/
+			if( ldap_bv2rdn( &op->o_req_dn, &rdn, &next, 
+				LDAP_DN_FORMAT_LDAP ) )
+			{
+				rs->sr_err = LDAP_INVALID_DN_SYNTAX;
+				goto done;
+			}
+
+			if( slap_bv2ad( &rdn[0]->la_attr, &desc, &rs->sr_text )) {
+				rs->sr_err = LDAP_NO_SUCH_OBJECT;
+				ldap_rdnfree(rdn);
+				goto done;
+			}
+
+			attr_merge_normalize_one( &e, desc, &rdn[0]->la_value, NULL );
+
+			ldap_rdnfree(rdn);
+			rdn = NULL;
+
+			/* Every entry needs an objectclass. We don't really
+			 * know if our hardcoded choice here agrees with the
+			 * DN that was configured for this backend, but it's
+			 * better than nothing.
+			 *
+			 * should be a configuratable item
+			 */
+			BER_BVSTR( &val, "organizationalUnit" );
+			attr_merge_one( &e, ad_objectClass, &val, NULL );
+	
+			if ( test_filter( op, &e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
+				rs->sr_entry = &e;
+				rs->sr_attrs = op->ors_attrs;
+				rs->sr_flags = REP_ENTRY_MODIFIABLE;
+				send_search_entry( op, rs );
+			}
+
+			entry_clean( &e );
 		}
-		entry_free( e );
 
-		send_ldap_result( conn, op, LDAP_SUCCESS, "", "" );
+		if ( op->ors_scope != LDAP_SCOPE_BASE ) {
+			/* check all our "children" */
 
-		return( 0 );
-	}
+			ldap_pvt_thread_mutex_lock( &passwd_mutex );
+			pw_start( op->o_bd );
+			for ( pw = getpwent(); pw != NULL; pw = getpwent() ) {
+				Entry		e = { 0 };
+
+				/* check for abandon */
+				if ( op->o_abandon ) {
+					endpwent();
+					ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+					return( SLAPD_ABANDON );
+				}
 
-	for ( pw = getpwent(); pw != NULL; pw = getpwent() ) {
-		/* check for abandon */
-		pthread_mutex_lock( &op->o_abandonmutex );
-		if ( op->o_abandon ) {
-			pthread_mutex_unlock( &op->o_abandonmutex );
+				/* check time limit */
+				if ( op->ors_tlimit != SLAP_NO_LIMIT
+						&& slap_get_time() > stoptime )
+				{
+					send_ldap_error( op, rs, LDAP_TIMELIMIT_EXCEEDED, NULL );
+					endpwent();
+					ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+					return( 0 );
+				}
+
+				if ( pw2entry( op->o_bd, pw, &e ) ) {
+					rs->sr_err = LDAP_OTHER;
+					endpwent();
+					ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+					goto done;
+				}
+
+				if ( test_filter( op, &e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
+					/* check size limit */
+					if ( --op->ors_slimit == -1 ) {
+						send_ldap_error( op, rs, LDAP_SIZELIMIT_EXCEEDED, NULL );
+						endpwent();
+						ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+						return( 0 );
+					}
+
+					rs->sr_entry = &e;
+					rs->sr_attrs = op->ors_attrs;
+					rs->sr_flags = REP_ENTRY_MODIFIABLE;
+					send_search_entry( op, rs );
+				}
+
+				entry_clean( &e );
+			}
 			endpwent();
-			return( -1 );
+			ldap_pvt_thread_mutex_unlock( &passwd_mutex );
 		}
-		pthread_mutex_unlock( &op->o_abandonmutex );
 
-		/* check size limit */
-		if ( --slimit == -1 ) {
-			send_ldap_result( conn, op, LDAP_SIZELIMIT_EXCEEDED,
-			    NULL, NULL );
-			endpwent();
-			return( 0 );
+	} else {
+		char	*next;
+		Entry	e = { 0 };
+		int	rc;
+
+		if (! be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
+			dnParent( &op->o_req_ndn, &parent );
 		}
 
-		/* check time limit */
-		pthread_mutex_lock( &currenttime_mutex );
-		time( &currenttime );
-		if ( currenttime > stoptime ) {
-			pthread_mutex_unlock( &currenttime_mutex );
-			send_ldap_result( conn, op, LDAP_TIMELIMIT_EXCEEDED,
-			    NULL, NULL );
-			endpwent();
-			return( 0 );
+		/* This backend is only one layer deep. Don't answer requests for
+		 * anything deeper than that.
+		 */
+		if( !be_issuffix( op->o_bd, &parent ) ) {
+			int i;
+			for( i=0; op->o_bd->be_nsuffix[i].bv_val != NULL; i++ ) {
+				if( dnIsSuffix( &op->o_req_ndn, &op->o_bd->be_nsuffix[i] ) ) {
+					rs->sr_matched = op->o_bd->be_suffix[i].bv_val;
+					break;
+				}
+			}
+			rs->sr_err = LDAP_NO_SUCH_OBJECT;
+			goto done;
+		}
+
+		if( op->ors_scope == LDAP_SCOPE_ONELEVEL ) {
+			goto done;
+		}
+
+		if ( ldap_bv2rdn( &op->o_req_dn, &rdn, &next,
+			LDAP_DN_FORMAT_LDAP ))
+		{ 
+			rs->sr_err = LDAP_OTHER;
+			goto done;
+		}
+
+		ldap_pvt_thread_mutex_lock( &passwd_mutex );
+		pw_start( op->o_bd );
+		pw = getpwnam( rdn[0]->la_value.bv_val );
+		if ( pw == NULL ) {
+			rs->sr_matched = parent.bv_val;
+			rs->sr_err = LDAP_NO_SUCH_OBJECT;
+			ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+			goto done;
 		}
-		pthread_mutex_unlock( &currenttime_mutex );
 
-		e = pw2entry( be, pw );
+		rc = pw2entry( op->o_bd, pw, &e );
+		ldap_pvt_thread_mutex_unlock( &passwd_mutex );
+		if ( rc ) {
+			rs->sr_err = LDAP_OTHER;
+			goto done;
+		}
 
-		if ( test_filter( be, conn, op, e, filter ) == 0 ) {
-			send_search_entry( be, conn, op, e, attrs, attrsonly );
+		if ( test_filter( op, &e, op->ors_filter ) == LDAP_COMPARE_TRUE ) {
+			rs->sr_entry = &e;
+			rs->sr_attrs = op->ors_attrs;
+			rs->sr_flags = REP_ENTRY_MODIFIABLE;
+			send_search_entry( op, rs );
 		}
 
-		entry_free( e );
+		entry_clean( &e );
 	}
-	endpwent();
-	send_ldap_result( conn, op, LDAP_SUCCESS, "", "" );
+
+done:
+	if( rs->sr_err != LDAP_NO_SUCH_OBJECT ) rs->sr_matched = NULL;
+	send_ldap_result( op, rs );
+
+	if( rdn != NULL ) ldap_rdnfree( rdn );
 
 	return( 0 );
 }
 
-static Entry *
-pw2entry( Backend *be, struct passwd *pw )
+static void
+pw_start(
+	Backend *be
+)
 {
-	Entry		*e;
-	char		buf[256];
+	endpwent();
+
+#ifdef HAVE_SETPWFILE
+	if ( be->be_private != NULL ) {
+		(void) setpwfile( (char *) be->be_private );
+	}
+#endif /* HAVE_SETPWFILE */
+}
+
+static int
+pw2entry( Backend *be, struct passwd *pw, Entry *e )
+{
+	size_t		pwlen;
 	struct berval	val;
-	struct berval	*vals[2];
+	struct berval	bv;
 
-	vals[0] = &val;
-	vals[1] = NULL;
+	int		rc;
 
 	/*
-	 * from pw we get pw_name and make it uid and cn and sn and
-	 * we get pw_gecos and make it cn and we give it an objectclass
-	 * of person.
+	 * from pw we get pw_name and make it cn
+	 * give it an objectclass of person.
 	 */
 
-	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+	pwlen = strlen( pw->pw_name );
+	val.bv_len = STRLENOF("uid=,") + ( pwlen + be->be_suffix[0].bv_len );
+	val.bv_val = ch_malloc( val.bv_len + 1 );
+
+	/* rdn attribute type should be a configuratable item */
+	sprintf( val.bv_val, "uid=%s,%s",
+		pw->pw_name, be->be_suffix[0].bv_val );
+
+	rc = dnNormalize( 0, NULL, NULL, &val, &bv, NULL );
+	if( rc != LDAP_SUCCESS ) {
+		free( val.bv_val );
+		return( -1 );
+	}
+
+	e->e_name = val;
+	e->e_nname = bv;
+
 	e->e_attrs = NULL;
 
-	sprintf( buf, "%s@%s", pw->pw_name, be->be_suffix[0] );
-	e->e_dn = strdup( buf );
+	/* objectclasses should be configurable items */
+	BER_BVSTR( &val, "person" );
+	attr_merge_one( e, slap_schema.si_ad_objectClass, &val, NULL );
+
+	BER_BVSTR( &val, "uidObject" );
+	attr_merge_one( e, slap_schema.si_ad_objectClass, &val, NULL );
 
 	val.bv_val = pw->pw_name;
-	val.bv_len = strlen( pw->pw_name );
-	attr_merge( e, "cn", vals );
-	attr_merge( e, "sn", vals );
-	attr_merge( e, "uid", vals );
-	val.bv_val = pw->pw_gecos;
-	val.bv_len = strlen( pw->pw_gecos );
-	attr_merge( e, "cn", vals );
-	val.bv_val = "person";
-	val.bv_len = strlen( val.bv_val );
-	attr_merge( e, "objectclass", vals );
-
-	return( e );
+	val.bv_len = pwlen;
+	attr_merge_normalize_one( e, slap_schema.si_ad_uid, &val, NULL );	/* required by uidObject */
+	attr_merge_normalize_one( e, slap_schema.si_ad_cn, &val, NULL );	/* required by person */
+	attr_merge_normalize_one( e, ad_sn, &val, NULL );	/* required by person */
+
+#ifdef HAVE_STRUCT_PASSWD_PW_GECOS
+	/*
+	 * if gecos is present, add it as a cn. first process it
+	 * according to standard BSD usage. If the processed cn has
+	 * a space, use the tail as the surname.
+	 */
+	if (pw->pw_gecos[0]) {
+		char *s;
+
+		ber_str2bv( pw->pw_gecos, 0, 0, &val );
+		attr_merge_normalize_one( e, ad_desc, &val, NULL );
+
+		s = ber_bvchr( &val, ',' );
+		if ( s ) *s = '\0';
+
+		s = ber_bvchr( &val, '&' );
+		if ( s ) {
+			char buf[1024];
+
+			if( val.bv_len + pwlen < sizeof(buf) ) {
+				int i = s - val.bv_val;
+				strncpy( buf, val.bv_val, i );
+				s = buf + i;
+				strcpy( s, pw->pw_name );
+				*s = TOUPPER((unsigned char)*s);
+				strcat( s, val.bv_val + i + 1 );
+				val.bv_val = buf;
+			}
+		}
+		val.bv_len = strlen( val.bv_val );
+
+		if ( val.bv_len && strcasecmp( val.bv_val, pw->pw_name ) ) {
+			attr_merge_normalize_one( e, slap_schema.si_ad_cn, &val, NULL );
+		}
+
+		if ( ( s = strrchr(val.bv_val, ' ' ) ) ) {
+			ber_str2bv( s + 1, 0, 0, &val );
+			attr_merge_normalize_one( e, ad_sn, &val, NULL );
+		}
+	}
+#endif /* HAVE_STRUCT_PASSWD_PW_GECOS */
+
+	return( 0 );
 }