X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fopen.c;h=244dde7317c1008b69688591543c6c012d070444;hb=e4f2c9425afc0f594212aa1697bad779733b96b9;hp=2c9fafb669ff9bb3703c29f12730a7981dd3615e;hpb=1f1993989a468c70774246b6eadb246543ac6dfe;p=openldap diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c index 2c9fafb669..244dde7317 100644 --- a/libraries/libldap/open.c +++ b/libraries/libldap/open.c @@ -1,6 +1,6 @@ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* Portions @@ -26,14 +26,15 @@ int ldap_open_defconn( LDAP *ld ) { - if (( ld->ld_defconn = ldap_new_connection( ld, ld->ld_options.ldo_defludp, 1,1,NULL )) == NULL ) - { + ld->ld_defconn = ldap_new_connection( ld, + ld->ld_options.ldo_defludp, 1, 1, NULL ); + + if( ld->ld_defconn == NULL ) { ld->ld_errno = LDAP_SERVER_DOWN; return -1; } ++ld->ld_defconn->lconn_refcnt; /* so it never gets closed/freed */ - return 0; } @@ -53,9 +54,11 @@ ldap_open( LDAP_CONST char *host, int port ) int rc; LDAP *ld; - Debug( LDAP_DEBUG_TRACE, "ldap_open\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "ldap_open(%s, %d)\n", + host, port, 0 ); - if (( ld = ldap_init( host, port )) == NULL ) { + ld = ldap_init( host, port ); + if ( ld == NULL ) { return( NULL ); } @@ -63,13 +66,13 @@ ldap_open( LDAP_CONST char *host, int port ) if( rc < 0 ) { ldap_ld_free( ld, 0, NULL, NULL ); - return( NULL ); + ld = NULL; } - Debug( LDAP_DEBUG_TRACE, "ldap_open successful, ld_host is %s\n", - ( ld->ld_host == NULL ) ? "(null)" : ld->ld_host, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "ldap_open: %s\n", + ld == NULL ? "succeeded" : "failed", 0, 0 ); - return( ld ); + return ld; } @@ -89,72 +92,46 @@ ldap_create( LDAP **ldp ) /* Initialize the global options, if not already done. */ if( gopts->ldo_valid != LDAP_INITIALIZED ) { ldap_int_initialize(gopts, NULL); + if ( gopts->ldo_valid != LDAP_INITIALIZED ) + return LDAP_LOCAL_ERROR; } - Debug( LDAP_DEBUG_TRACE, "ldap_init\n", 0, 0, 0 ); - -#ifdef HAVE_WINSOCK2 -{ WORD wVersionRequested; - WSADATA wsaData; - - wVersionRequested = MAKEWORD( 2, 0 ); - if ( WSAStartup( wVersionRequested, &wsaData ) != 0 ) { - /* Tell the user that we couldn't find a usable */ - /* WinSock DLL. */ - return LDAP_LOCAL_ERROR; - } - - /* Confirm that the WinSock DLL supports 2.0.*/ - /* Note that if the DLL supports versions greater */ - /* than 2.0 in addition to 2.0, it will still return */ - /* 2.0 in wVersion since that is the version we */ - /* requested. */ - - if ( LOBYTE( wsaData.wVersion ) != 2 || - HIBYTE( wsaData.wVersion ) != 0 ) - { - /* Tell the user that we couldn't find a usable */ - /* WinSock DLL. */ - WSACleanup( ); - return LDAP_LOCAL_ERROR; - } -} /* The WinSock DLL is acceptable. Proceed. */ - -#elif HAVE_WINSOCK -{ WSADATA wsaData; - if ( WSAStartup( 0x0101, &wsaData ) != 0 ) { - return LDAP_LOCAL_ERROR; - } -} -#endif + Debug( LDAP_DEBUG_TRACE, "ldap_create\n", 0, 0, 0 ); if ( (ld = (LDAP *) LDAP_CALLOC( 1, sizeof(LDAP) )) == NULL ) { - WSACleanup( ); return( LDAP_NO_MEMORY ); } /* copy the global options */ - memcpy(&ld->ld_options, gopts, sizeof(ld->ld_options)); + AC_MEMCPY(&ld->ld_options, gopts, sizeof(ld->ld_options)); ld->ld_valid = LDAP_VALID_SESSION; /* but not pointers to malloc'ed items */ - ld->ld_options.ldo_defludp = NULL; ld->ld_options.ldo_sctrls = NULL; ld->ld_options.ldo_cctrls = NULL; +#ifdef HAVE_CYRUS_SASL + ld->ld_options.ldo_def_sasl_mech = gopts->ldo_def_sasl_mech + ? LDAP_STRDUP( gopts->ldo_def_sasl_mech ) : NULL; + ld->ld_options.ldo_def_sasl_realm = gopts->ldo_def_sasl_realm + ? LDAP_STRDUP( gopts->ldo_def_sasl_realm ) : NULL; + ld->ld_options.ldo_def_sasl_authcid = gopts->ldo_def_sasl_authcid + ? LDAP_STRDUP( gopts->ldo_def_sasl_authcid ) : NULL; + ld->ld_options.ldo_def_sasl_authzid = gopts->ldo_def_sasl_authzid + ? LDAP_STRDUP( gopts->ldo_def_sasl_authzid ) : NULL; +#endif + ld->ld_options.ldo_defludp = ldap_url_duplist(gopts->ldo_defludp); if ( ld->ld_options.ldo_defludp == NULL ) { LDAP_FREE( (char*)ld ); - WSACleanup( ); return LDAP_NO_MEMORY; } if (( ld->ld_selectinfo = ldap_new_select_info()) == NULL ) { ldap_free_urllist( ld->ld_options.ldo_defludp ); LDAP_FREE( (char*) ld ); - WSACleanup( ); return LDAP_NO_MEMORY; } @@ -164,7 +141,6 @@ ldap_create( LDAP **ldp ) if ( ld->ld_sb == NULL ) { ldap_free_urllist( ld->ld_options.ldo_defludp ); LDAP_FREE( (char*) ld ); - WSACleanup( ); return LDAP_NO_MEMORY; } @@ -179,7 +155,7 @@ ldap_create( LDAP **ldp ) * * Example: * LDAP *ld; - * ld = ldap_open( host, port ); + * ld = ldap_init( host, port ); */ LDAP * ldap_init( LDAP_CONST char *defhost, int defport ) @@ -223,6 +199,10 @@ ldap_initialize( LDAP **ldp, LDAP_CONST char *url ) ldap_ld_free(ld, 1, NULL, NULL); return rc; } +#ifdef LDAP_CONNECTIONLESS + if (ldap_is_ldapc_url(url)) + LDAP_IS_UDP(ld) = 1; +#endif } *ldp = ld; @@ -230,90 +210,104 @@ ldap_initialize( LDAP **ldp, LDAP_CONST char *url ) } int -ldap_start_tls_s ( LDAP *ld, - LDAPControl **serverctrls, - LDAPControl **clientctrls ) +ldap_int_open_connection( + LDAP *ld, + LDAPConn *conn, + LDAPURLDesc *srv, + int async ) { -#ifdef HAVE_TLS - LDAPConn *lc; - int rc; - char *rspoid = NULL; - struct berval *rspdata = NULL; - - if (ld->ld_conns == NULL) { - rc = ldap_open_defconn( ld ); - if (rc != LDAP_SUCCESS) - return(rc); - } - - for (lc = ld->ld_conns; lc != NULL; lc = lc->lconn_next) { - if (ldap_pvt_tls_inplace(lc->lconn_sb) != 0) - return LDAP_OPERATIONS_ERROR; + int rc = -1; +#ifdef HAVE_CYRUS_SASL + char *sasl_host = NULL; + int sasl_ssf = 0; +#endif + char *host; + int port, proto; + long addr; - rc = ldap_extended_operation_s(ld, LDAP_EXOP_START_TLS, - NULL, serverctrls, clientctrls, &rspoid, &rspdata); + Debug( LDAP_DEBUG_TRACE, "ldap_int_open_connection\n", 0, 0, 0 ); - if (rc != LDAP_SUCCESS) - return rc; - if (rspoid != NULL) - LDAP_FREE(rspoid); - if (rspdata != NULL) - ber_bvfree(rspdata); - rc = ldap_pvt_tls_start( ld, lc->lconn_sb, ld->ld_options.ldo_tls_ctx ); - if (rc != LDAP_SUCCESS) - return rc; - } - return LDAP_SUCCESS; -#else - return LDAP_NOT_SUPPORTED; -#endif -} + switch ( proto = ldap_pvt_url_scheme2proto( srv->lud_scheme ) ) { + case LDAP_PROTO_TCP: + port = srv->lud_port; -int -open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv, - char **krbinstancep, int async ) -{ - int rc = -1; - int port; - long addr; + addr = 0; + if ( srv->lud_host == NULL || *srv->lud_host == 0 ) { + host = NULL; + addr = htonl( INADDR_LOOPBACK ); + } else { + host = srv->lud_host; + } - Debug( LDAP_DEBUG_TRACE, "open_ldap_connection\n", 0, 0, 0 ); + if( !port ) { + if( strcmp(srv->lud_scheme, "ldaps") == 0 ) { + port = LDAPS_PORT; + } else { + port = LDAP_PORT; + } + } - port = srv->lud_port; - if (port == 0) - port = ld->ld_options.ldo_defport; - port = htons( (short) port ); + rc = ldap_connect_to_host( ld, conn->lconn_sb, + proto, host, addr, port, async ); - addr = 0; - if ( srv->lud_host == NULL || *srv->lud_host == 0 ) - addr = htonl( INADDR_LOOPBACK ); + if ( rc == -1 ) return rc; - switch ( ldap_pvt_url_scheme2proto( srv->lud_scheme ) ) { - case LDAP_PROTO_TCP: - rc = ldap_connect_to_host( ld, sb, srv->lud_host, - addr, port, async ); - if ( rc == -1 ) - return rc; - ber_sockbuf_add_io( sb, &ber_sockbuf_io_tcp, +#ifdef LDAP_DEBUG + ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_debug, + LBER_SBIOD_LEVEL_PROVIDER, (void *)"tcp_" ); +#endif + ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_tcp, LBER_SBIOD_LEVEL_PROVIDER, NULL ); + +#ifdef HAVE_CYRUS_SASL + sasl_host = ldap_host_connected_to( conn->lconn_sb ); +#endif break; +#ifdef LDAP_CONNECTIONLESS + case LDAP_PROTO_UDP: - rc = ldap_connect_to_host( ld, sb, srv->lud_host, - addr, port, async ); - if ( rc == -1 ) - return rc; - ber_sockbuf_add_io( sb, &ber_sockbuf_io_udp, + port = srv->lud_port; + + addr = 0; + if ( srv->lud_host == NULL || *srv->lud_host == 0 ) { + host = NULL; + addr = htonl( INADDR_LOOPBACK ); + } else { + host = srv->lud_host; + } + + if( !port ) port = LDAP_PORT; + + LDAP_IS_UDP(ld) = 1; + rc = ldap_connect_to_host( ld, conn->lconn_sb, + proto, host, addr, port, async ); + + if ( rc == -1 ) return rc; +#ifdef LDAP_DEBUG + ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_debug, + LBER_SBIOD_LEVEL_PROVIDER, (void *)"udp_" ); +#endif + ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_udp, LBER_SBIOD_LEVEL_PROVIDER, NULL ); break; +#endif case LDAP_PROTO_IPC: #ifdef LDAP_PF_LOCAL /* only IPC mechanism supported is PF_LOCAL (PF_UNIX) */ - rc = ldap_connect_to_path( ld, sb, + rc = ldap_connect_to_path( ld, conn->lconn_sb, srv->lud_host, async ); - if ( rc == -1 ) - return rc; - ber_sockbuf_add_io( sb, &ber_sockbuf_io_fd, + if ( rc == -1 ) return rc; +#ifdef LDAP_DEBUG + ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_debug, + LBER_SBIOD_LEVEL_PROVIDER, (void *)"ipc_" ); +#endif + ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_fd, LBER_SBIOD_LEVEL_PROVIDER, NULL ); + +#ifdef HAVE_CYRUS_SASL + sasl_host = ldap_host_connected_to( conn->lconn_sb ); + sasl_ssf = LDAP_PVT_SASL_LOCAL_SSF; +#endif break; #endif /* LDAP_PF_LOCAL */ default: @@ -321,33 +315,108 @@ open_ldap_connection( LDAP *ld, Sockbuf *sb, LDAPURLDesc *srv, break; } - ber_sockbuf_add_io( sb, &ber_sockbuf_io_readahead, + ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_readahead, LBER_SBIOD_LEVEL_PROVIDER, NULL ); + #ifdef LDAP_DEBUG - ber_sockbuf_add_io( sb, &ber_sockbuf_io_debug, INT_MAX, NULL ); + ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_debug, + INT_MAX, (void *)"ldap_" ); +#endif + +#ifdef LDAP_CONNECTIONLESS + if( proto == LDAP_PROTO_UDP ) + return 0; +#endif + +#ifdef HAVE_CYRUS_SASL + /* establish Cyrus SASL context prior to starting TLS so + that SASL EXTERNAL might be used */ + if( sasl_host != NULL ) { + ldap_int_sasl_open( ld, conn, sasl_host, sasl_ssf ); + LDAP_FREE( sasl_host ); + } #endif #ifdef HAVE_TLS if (ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD || strcmp( srv->lud_scheme, "ldaps" ) == 0 ) { - rc = ldap_pvt_tls_start( ld, sb, ld->ld_options.ldo_tls_ctx ); - if (rc != LDAP_SUCCESS) - return rc; + ++conn->lconn_refcnt; /* avoid premature free */ + + rc = ldap_int_tls_start( ld, conn, srv ); + + --conn->lconn_refcnt; + + if (rc != LDAP_SUCCESS) { + return -1; + } } #endif - if ( krbinstancep != NULL ) { #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND + if ( conn->lconn_krbinstance == NULL ) { char *c; - if (( *krbinstancep = ldap_host_connected_to( sb )) != NULL && - ( c = strchr( *krbinstancep, '.' )) != NULL ) { + conn->lconn_krbinstance = ldap_host_connected_to( conn->lconn_sb ); + + if( conn->lconn_krbinstance != NULL && + ( c = strchr( conn->lconn_krbinstance, '.' )) != NULL ) { *c = '\0'; } -#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */ - *krbinstancep = NULL; -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */ } +#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */ return( 0 ); } + + +int ldap_open_internal_connection( LDAP **ldp, ber_socket_t *fdp ) +{ + int rc; + LDAPConn *c; + LDAPRequest *lr; + + rc = ldap_create( ldp ); + if( rc != LDAP_SUCCESS ) { + *ldp = NULL; + return( rc ); + } + + /* Make it appear that a search request, msgid 0, was sent */ + lr = (LDAPRequest *)LDAP_CALLOC( 1, sizeof( LDAPRequest )); + if( lr == NULL ) { + ldap_unbind( *ldp ); + *ldp = NULL; + return( LDAP_NO_MEMORY ); + } + memset(lr, 0, sizeof( LDAPRequest )); + lr->lr_msgid = 0; + lr->lr_status = LDAP_REQST_INPROGRESS; + lr->lr_res_errno = LDAP_SUCCESS; + (*ldp)->ld_requests = lr; + + /* Attach the passed socket as the *LDAP's connection */ + c = ldap_new_connection( *ldp, NULL, 1, 0, NULL); + if( c == NULL ) { + ldap_unbind( *ldp ); + *ldp = NULL; + return( LDAP_NO_MEMORY ); + } + ber_sockbuf_ctrl( c->lconn_sb, LBER_SB_OPT_SET_FD, fdp ); +#ifdef LDAP_DEBUG + ber_sockbuf_add_io( c->lconn_sb, &ber_sockbuf_io_debug, + LBER_SBIOD_LEVEL_PROVIDER, (void *)"int_" ); +#endif + ber_sockbuf_add_io( c->lconn_sb, &ber_sockbuf_io_tcp, + LBER_SBIOD_LEVEL_PROVIDER, NULL ); + (*ldp)->ld_defconn = c; + + /* Add the connection to the *LDAP's select pool */ + ldap_mark_select_read( *ldp, c->lconn_sb ); + ldap_mark_select_write( *ldp, c->lconn_sb ); + + /* Make this connection an LDAP V3 protocol connection */ + rc = LDAP_VERSION3; + ldap_set_option( *ldp, LDAP_OPT_PROTOCOL_VERSION, &rc ); + + return( LDAP_SUCCESS ); +}