X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fdaemon.c;h=fad697b1dd9f078561a578e3fbe543b1eba787b3;hb=1fbbc1181152a32c1b9b82342ad6d63034ec7fbb;hp=4c297f52d193ee8bb54c131fc0bf7af22d609226;hpb=bf5e3a15ca52a00a1437c9f8f7f26deb449f7a6f;p=openldap diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index 4c297f52d1..fad697b1dd 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -22,10 +22,13 @@ #ifdef HAVE_TCPD #include +#define SLAP_STRING_UNKNOWN STRING_UNKNOWN int allow_severity = LOG_INFO; int deny_severity = LOG_NOTICE; -#endif /* TCP Wrappers */ +#else /* ! TCP Wrappers */ +#define SLAP_STRING_UNKNOWN "unknown" +#endif /* ! TCP Wrappers */ #ifdef LDAP_PF_LOCAL #include @@ -49,7 +52,7 @@ Listener **slap_listeners = NULL; static ber_socket_t wake_sds[2]; -#ifdef NO_THREADS +#if defined(NO_THREADS) || defined(HAVE_GNU_PTH) static int waking; #define WAKE_LISTENER(w) \ ((w && !waking) ? tcp_write( wake_sds[1], "0", 1 ), waking=1 : 0) @@ -95,7 +98,7 @@ static SLPHandle slapd_hslp = 0; void slapd_slp_init( const char* urls ) { int i; - slapd_srvurls = str2charray( urls, " " ); + slapd_srvurls = ldap_str2charray( urls, " " ); if( slapd_srvurls == NULL ) return; @@ -107,7 +110,7 @@ void slapd_slp_init( const char* urls ) { slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i], strlen( host ) + sizeof( LDAP_SRVTYPE_PREFIX ) ); - strcpy( slap_strcopy(slapd_srvurls[i], + strcpy( lutil_strcopy(slapd_srvurls[i], LDAP_SRVTYPE_PREFIX ), host ); ch_free( host ); @@ -119,7 +122,7 @@ void slapd_slp_init( const char* urls ) { slapd_srvurls[i] = (char *) realloc( slapd_srvurls[i], strlen( host ) + sizeof( LDAPS_SRVTYPE_PREFIX ) ); - strcpy( slap_strcopy(slapd_srvurls[i], + strcpy( lutil_strcopy(slapd_srvurls[i], LDAPS_SRVTYPE_PREFIX ), host ); ch_free( host ); @@ -134,7 +137,7 @@ void slapd_slp_init( const char* urls ) { void slapd_slp_deinit() { if( slapd_srvurls == NULL ) return; - charray_free( slapd_srvurls ); + ldap_charray_free( slapd_srvurls ); slapd_srvurls = NULL; /* close the SLP handle */ @@ -311,7 +314,7 @@ static void slap_free_listener_addresses(struct sockaddr **sal) ch_free(sal); } -#ifdef LDAP_PF_LOCAL +#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD) static int get_url_perms( char **exts, mode_t *perms, @@ -334,27 +337,53 @@ static int get_url_perms( } if ( strncasecmp( type, LDAPI_MOD_URLEXT "=", sizeof(LDAPI_MOD_URLEXT "=") - 1 ) == 0 ) { - char *value = type + sizeof(LDAPI_MOD_URLEXT "=") - 1; + char *value = type + + ( sizeof(LDAPI_MOD_URLEXT "=") - 1 ); mode_t p = 0; int j; - if ( strlen(value) != 3 ) { - return LDAP_OTHER; - } + switch (strlen(value)) { + case 4: + /* skip leading '0' */ + if ( value[ 0 ] != '0' ) { + return LDAP_OTHER; + } + value++; - for ( j = 0; j < 3; j++ ) { - static mode_t m[ 3 ] - = { S_IRWXU, S_IRWXG, S_IRWXO }; + case 3: + for ( j = 0; j < 3; j++) { + int v; - switch ( value[ j ] ) { - case 'w': - p |= m[ j ]; - break; - case '-': - break; - default: - return LDAP_OTHER; + v = value[ j ] - '0'; + + if ( v < 0 || v > 7 ) { + return LDAP_OTHER; + } + + p |= v << 3*(2-j); + } + break; + + case 10: + for ( j = 1; j < 10; j++ ) { + static mode_t m[] = { 0, + S_IRUSR, S_IWUSR, S_IXUSR, + S_IRGRP, S_IWGRP, S_IXGRP, + S_IROTH, S_IWOTH, S_IXOTH + }; + static char c[] = "-rwxrwxrwx"; + + if ( value[ j ] == c[ j ] ) { + p |= m[ j ]; + + } else if ( value[ j ] != '-' ) { + return LDAP_OTHER; + } } + break; + + default: + return LDAP_OTHER; } *crit = c; @@ -366,7 +395,7 @@ static int get_url_perms( return LDAP_OTHER; } -#endif /* LDAP_PF_LOCAL */ +#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */ /* port = 0 indicates AF_LOCAL */ static int slap_get_listener_addresses( @@ -561,10 +590,12 @@ static int slap_open_listener( struct sockaddr **sal, **psal; int socktype = SOCK_STREAM; /* default to COTS */ -#ifdef LDAP_PF_LOCAL - mode_t perms = S_IRWXU; +#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD) + /* + * use safe defaults + */ int crit = 1; -#endif +#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */ rc = ldap_url_parse( url, &lud ); @@ -581,6 +612,8 @@ static int slap_open_listener( return rc; } + l.sl_url.bv_val = NULL; + #ifndef HAVE_TLS if( ldap_pvt_url_scheme2tls( lud->lud_scheme ) ) { #ifdef NEW_LOGGING @@ -617,10 +650,6 @@ static int slap_open_listener( } else { err = slap_get_listener_addresses(lud->lud_host, 0, &sal); } - - if ( lud->lud_exts ) { - err = get_url_perms( lud->lud_exts, &perms, &crit ); - } #else #ifdef NEW_LOGGING @@ -646,6 +675,14 @@ static int slap_open_listener( } } +#if defined(LDAP_PF_LOCAL) || defined(SLAP_X_LISTENER_MOD) + if ( lud->lud_exts ) { + err = get_url_perms( lud->lud_exts, &l.sl_perms, &crit ); + } else { + l.sl_perms = S_IRWXU; + } +#endif /* LDAP_PF_LOCAL || SLAP_X_LISTENER_MOD */ + ldap_free_urldesc( lud ); if ( err ) { return -1; @@ -676,8 +713,7 @@ static int slap_open_listener( continue; } #ifdef LDAP_CONNECTIONLESS - if (l.sl_is_udp) - socktype = SOCK_DGRAM; + if( l.sl_is_udp ) socktype = SOCK_DGRAM; #endif l.sl_sd = socket( (*sal)->sa_family, socktype, 0); if ( l.sl_sd == AC_SOCKET_INVALID ) { @@ -790,7 +826,7 @@ static int slap_open_listener( #ifdef LDAP_PF_LOCAL case AF_LOCAL: { char *addr = ((struct sockaddr_un *)*sal)->sun_path; - if ( chmod( addr, perms ) < 0 && crit ) { + if ( chmod( addr, l.sl_perms ) < 0 && crit ) { int err = sock_errno(); #ifdef NEW_LOGGING LDAP_LOG( CONNECTION, INFO, @@ -804,8 +840,10 @@ static int slap_open_listener( slap_free_listener_addresses(psal); return -1; } - l.sl_name = ch_malloc( strlen(addr) + sizeof("PATH=") ); - sprintf( l.sl_name, "PATH=%s", addr ); + l.sl_name.bv_len = strlen(addr) + sizeof("PATH=") - 1; + l.sl_name.bv_val = ber_memalloc( l.sl_name.bv_len + 1 ); + snprintf( l.sl_name.bv_val, l.sl_name.bv_len + 1, + "PATH=%s", addr ); } break; #endif /* LDAP_PF_LOCAL */ @@ -820,9 +858,11 @@ static int slap_open_listener( s = inet_ntoa( ((struct sockaddr_in *) *sal)->sin_addr ); #endif port = ntohs( ((struct sockaddr_in *)*sal) ->sin_port ); - l.sl_name = ch_malloc( sizeof("IP=255.255.255.255:65535") ); - sprintf( l.sl_name, "IP=%s:%d", - s != NULL ? s : "unknown" , port ); + l.sl_name.bv_val = ber_memalloc( sizeof("IP=255.255.255.255:65535") ); + snprintf( l.sl_name.bv_val, sizeof("IP=255.255.255.255:65535"), + "IP=%s:%d", + s != NULL ? s : SLAP_STRING_UNKNOWN, port ); + l.sl_name.bv_len = strlen( l.sl_name.bv_val ); } break; #ifdef LDAP_PF_INET6 @@ -831,8 +871,11 @@ static int slap_open_listener( inet_ntop( AF_INET6, &((struct sockaddr_in6 *)*sal)->sin6_addr, addr, sizeof addr); port = ntohs( ((struct sockaddr_in6 *)*sal)->sin6_port ); - l.sl_name = ch_malloc( strlen(addr) + sizeof("IP= 65535") ); - sprintf( l.sl_name, "IP=%s %d", addr, port ); + l.sl_name.bv_len = strlen(addr) + sizeof("IP= 65535"); + l.sl_name.bv_val = ber_memalloc( l.sl_name.bv_len ); + snprintf( l.sl_name.bv_val, l.sl_name.bv_len, "IP=%s %d", + addr, port ); + l.sl_name.bv_len = strlen( l.sl_name.bv_val ); } break; #endif /* LDAP_PF_INET6 */ @@ -849,7 +892,7 @@ static int slap_open_listener( } AC_MEMCPY(&l.sl_sa, *sal, addrlen); - l.sl_url = ch_strdup( url ); + ber_str2bv( url, 0, 1, &l.sl_url); li = ch_malloc( sizeof( Listener ) ); *li = l; slap_listeners[*cur] = li; @@ -860,13 +903,25 @@ static int slap_open_listener( slap_free_listener_addresses(psal); + if ( l.sl_url.bv_val == NULL ) + { +#ifdef NEW_LOGGING + LDAP_LOG( CONNECTION, RESULTS, + "slap_open_listener: failed on %s\n", url, 0, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "slap_open_listener: failed on %s\n", url, 0, 0 ); +#endif + return -1; + } #ifdef NEW_LOGGING LDAP_LOG( CONNECTION, RESULTS, - "slap_open_listener: daemon initialzed %s\n", l.sl_url, 0, 0 ); + "slap_open_listener: daemon initialized %s\n", + l.sl_url.bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "daemon: initialized %s\n", - l.sl_url, 0, 0 ); + l.sl_url.bv_val, 0, 0 ); #endif return 0; } @@ -927,7 +982,7 @@ int slapd_daemon_init( const char *urls ) urls = "ldap:///"; } - u = str2charray( urls, " " ); + u = ldap_str2charray( urls, " " ); if( u == NULL || u[0] == NULL ) { #ifdef NEW_LOGGING @@ -958,7 +1013,7 @@ int slapd_daemon_init( const char *urls ) Debug( LDAP_DEBUG_ANY, "daemon_init: no listeners to open (%s)\n", urls, 0, 0 ); #endif - charray_free( u ); + ldap_charray_free( u ); return -1; } @@ -973,7 +1028,7 @@ int slapd_daemon_init( const char *urls ) for(n = 0, j = 0; u[n]; n++ ) { if ( slap_open_listener( u[n], &i, &j ) ) { - charray_free( u ); + ldap_charray_free( u ); return -1; } } @@ -992,7 +1047,7 @@ int slapd_daemon_init( const char *urls ) slapd_slp_reg(); #endif - charray_free( u ); + ldap_charray_free( u ); ldap_pvt_thread_mutex_init( &slap_daemon.sd_mutex ); return !i; } @@ -1033,10 +1088,10 @@ close_listeners( #endif /* LDAP_PF_LOCAL */ slapd_close( slap_listeners[l]->sl_sd ); } - if ( slap_listeners[l]->sl_url ) - free ( slap_listeners[l]->sl_url ); - if ( slap_listeners[l]->sl_name ) - free ( slap_listeners[l]->sl_name ); + if ( slap_listeners[l]->sl_url.bv_val ) + ber_memfree( slap_listeners[l]->sl_url.bv_val ); + if ( slap_listeners[l]->sl_name.bv_val ) + ber_memfree( slap_listeners[l]->sl_name.bv_val ); free ( slap_listeners[l] ); slap_listeners[l] = NULL; } @@ -1063,8 +1118,7 @@ slapd_daemon_task( * listening port. The listen() and accept() calls * are unnecessary. */ - if ( slap_listeners[l]->sl_is_udp ) - { + if ( slap_listeners[l]->sl_is_udp ) { slapd_add( slap_listeners[l]->sl_sd ); continue; } @@ -1112,11 +1166,11 @@ slapd_daemon_task( #ifdef NEW_LOGGING LDAP_LOG( CONNECTION, ERR, "slapd_daemon_task: listen( %s, 5 ) failed errno=%d (%s)\n", - slap_listeners[l]->sl_url, err, sock_errstr(err) ); + slap_listeners[l]->sl_url.bv_val, err, sock_errstr(err) ); #else Debug( LDAP_DEBUG_ANY, "daemon: listen(%s, 5) failed errno=%d (%s)\n", - slap_listeners[l]->sl_url, err, + slap_listeners[l]->sl_url.bv_val, err, sock_errstr(err) ); #endif return( (void*)-1 ); @@ -1317,7 +1371,7 @@ slapd_daemon_task( if( FD_ISSET( wake_sds[0], &readfds ) ) { char c[BUFSIZ]; tcp_read( wake_sds[0], c, sizeof(c) ); -#ifdef NO_THREADS +#if defined(NO_THREADS) || defined(HAVE_GNU_PTH) waking = 0; #endif continue; @@ -1329,9 +1383,12 @@ slapd_daemon_task( long id; slap_ssf_t ssf = 0; char *authid = NULL; +#ifdef SLAPD_RLOOKUPS + char *hebuf = NULL; +#endif char *dnsname = NULL; - char *peeraddr; + char *peeraddr = NULL; #ifdef LDAP_PF_LOCAL char peername[MAXPATHLEN + sizeof("PATH=")]; #elif defined(LDAP_PF_INET6) @@ -1349,18 +1406,15 @@ slapd_daemon_task( continue; #ifdef LDAP_CONNECTIONLESS - if ( slap_listeners[l]->sl_is_udp ) - { - /* The first time we receive a query, we set this - * up as a "connection". It remains open for the life - * of the slapd. - */ - if ( slap_listeners[l]->sl_is_udp < 2 ) - { + if ( slap_listeners[l]->sl_is_udp ) { + /* The first time we receive a query, we set this + * up as a "connection". It remains open for the life + * of the slapd. + */ + if ( slap_listeners[l]->sl_is_udp < 2 ) { id = connection_init( - slap_listeners[l]->sl_sd, - slap_listeners[l]->sl_url, "", "", - slap_listeners[l]->sl_name, + slap_listeners[l]->sl_sd, + slap_listeners[l], "", "", 2, ssf, authid ); slap_listeners[l]->sl_is_udp++; } @@ -1504,6 +1558,19 @@ slapd_daemon_task( case AF_LOCAL: sprintf( peername, "PATH=%s", from.sa_un_addr.sun_path ); ssf = LDAP_PVT_SASL_LOCAL_SSF; + { + uid_t uid; + gid_t gid; + + if( getpeereid( s, &uid, &gid ) == 0 ) { + authid = ch_malloc( + sizeof("uidNumber=4294967295+gidNumber=4294967295," + "cn=peercred,cn=external,cn=auth")); + sprintf(authid, "uidNumber=%d+gidNumber=%d," + "cn=peercred,cn=external,cn=auth", + uid, gid); + } + } dnsname = "local"; break; #endif /* LDAP_PF_LOCAL */ @@ -1514,7 +1581,7 @@ slapd_daemon_task( peeraddr = inet_ntoa( *((struct in_addr *) &from.sa_in6_addr.sin6_addr.s6_addr[12]) ); sprintf( peername, "IP=%s:%d", - peeraddr != NULL ? peeraddr : "unknown", + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, (unsigned) ntohs( from.sa_in6_addr.sin6_port ) ); } else { char addr[INET6_ADDRSTRLEN]; @@ -1523,7 +1590,7 @@ slapd_daemon_task( &from.sa_in6_addr.sin6_addr, addr, sizeof addr ); sprintf( peername, "IP=%s %d", - peeraddr != NULL ? peeraddr : "unknown", + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, (unsigned) ntohs( from.sa_in6_addr.sin6_port ) ); } break; @@ -1532,7 +1599,7 @@ slapd_daemon_task( case AF_INET: peeraddr = inet_ntoa( from.sa_in_addr.sin_addr ); sprintf( peername, "IP=%s:%d", - peeraddr != NULL ? peeraddr : "unknown", + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, (unsigned) ntohs( from.sa_in_addr.sin_port ) ); break; @@ -1548,18 +1615,22 @@ slapd_daemon_task( ) { #ifdef SLAPD_RLOOKUPS if ( use_reverse_lookup ) { + struct hostent he; + int herr; + struct hostent *hp = NULL; # ifdef LDAP_PF_INET6 if ( from.sa_addr.sa_family == AF_INET6 ) - hp = gethostbyaddr( + ldap_pvt_gethostbyaddr_a( (char *)&(from.sa_in6_addr.sin6_addr), sizeof(from.sa_in6_addr.sin6_addr), - AF_INET6 ); + AF_INET6, &he, &hebuf, + &hp, &herr ); else # endif /* LDAP_PF_INET6 */ - hp = gethostbyaddr( + ldap_pvt_gethostbyaddr_a( (char *) &(from.sa_in_addr.sin_addr), sizeof(from.sa_in_addr.sin_addr), - AF_INET ); + AF_INET, &he, &hebuf, &hp, &herr ); dnsname = hp ? ldap_pvt_str2lower( hp->h_name ) : NULL; } #else @@ -1568,16 +1639,16 @@ slapd_daemon_task( #ifdef HAVE_TCPD if ( !hosts_ctl("slapd", - dnsname != NULL ? dnsname : STRING_UNKNOWN, - peeraddr != NULL ? peeraddr : STRING_UNKNOWN, - STRING_UNKNOWN )) + dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, + SLAP_STRING_UNKNOWN )) { /* DENY ACCESS */ - Statslog( LDAP_DEBUG_ANY, - "fd=%ld host access from %s (%s) denied.\n", + Statslog( LDAP_DEBUG_STATS, + "fd=%ld DENIED from %s (%s)", (long) s, - dnsname != NULL ? dnsname : "unknown", - peeraddr != NULL ? peeraddr : "unknown", + dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, + peeraddr != NULL ? peeraddr : SLAP_STRING_UNKNOWN, 0, 0 ); slapd_close(s); continue; @@ -1586,10 +1657,9 @@ slapd_daemon_task( } id = connection_init(s, - slap_listeners[l]->sl_url, - dnsname != NULL ? dnsname : "unknown", + slap_listeners[l], + dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN, peername, - slap_listeners[l]->sl_name, #ifdef HAVE_TLS slap_listeners[l]->sl_is_tls, #else @@ -1599,28 +1669,35 @@ slapd_daemon_task( authid ); if( authid ) ch_free(authid); +#ifdef SLAPD_RLOOKUPS + if( hebuf ) ldap_memfree(hebuf); +#endif if( id < 0 ) { #ifdef NEW_LOGGING LDAP_LOG( CONNECTION, INFO, - "slapd_daemon_task: connection_init(%ld, %s, %s) failed.\n", - (long)s, peername, slap_listeners[l]->sl_name ); + "slapd_daemon_task: " + "connection_init(%ld, %s, %s) " + "failed.\n", + (long)s, peername, + slap_listeners[l]->sl_name.bv_val ); #else Debug( LDAP_DEBUG_ANY, - "daemon: connection_init(%ld, %s, %s) failed.\n", + "daemon: connection_init(%ld, %s, %s) " + "failed.\n", (long) s, peername, - slap_listeners[l]->sl_name ); + slap_listeners[l]->sl_name.bv_val ); #endif slapd_close(s); continue; } Statslog( LDAP_DEBUG_STATS, - "daemon: conn=%ld fd=%ld connection from %s (%s) accepted.\n", + "conn=%ld fd=%ld ACCEPT from %s (%s)\n", id, (long) s, peername, - slap_listeners[l]->sl_name, + slap_listeners[l]->sl_name.bv_val, 0 ); slapd_add( s ); @@ -1665,8 +1742,7 @@ slapd_daemon_task( /* The listener is the data port. Don't * skip it. */ - if (slap_listeners[l]->sl_is_udp) - continue; + if (slap_listeners[l]->sl_is_udp) continue; #endif is_listener = 1; break; @@ -1717,8 +1793,7 @@ slapd_daemon_task( for ( l = 0; slap_listeners[l] != NULL; l++ ) { if ( i == slap_listeners[l]->sl_sd ) { #ifdef LDAP_CONNECTIONLESS - if (slap_listeners[l]->sl_is_udp) - continue; + if (slap_listeners[l]->sl_is_udp) continue; #endif is_listener = 1; break; @@ -1769,8 +1844,7 @@ slapd_daemon_task( for ( l = 0; slap_listeners[l] != NULL; l++ ) { if ( rd == slap_listeners[l]->sl_sd ) { #ifdef LDAP_CONNECTIONLESS - if (slap_listeners[l]->sl_is_udp) - continue; + if (slap_listeners[l]->sl_is_udp) continue; #endif is_listener = 1; break;