if( strcmp("ldaps", scheme) == 0 ) {
return LDAP_PROTO_TCP;
}
+#ifdef LDAP_CONNECTIONLESS
+ if( strcmp("cldap", scheme) == 0 ) {
+ return LDAP_PROTO_UDP;
+ }
+#endif
return -1;
}
-int ldap_pvt_url_scheme2tls( const char *scheme )
+LDAP_F(int) ldap_pvt_url_scheme2tls( const char *scheme )
{
assert( scheme );
return strcmp(scheme, "ldapi") == 0;
}
+#ifdef LDAP_CONNECTIONLESS
+int
+ldap_is_ldapc_url( LDAP_CONST char *url )
+{
+ int enclosed;
+ const char * scheme;
+
+ if( url == NULL ) {
+ return 0;
+ }
+
+ if( skip_url_prefix( url, &enclosed, &scheme ) == NULL ) {
+ return 0;
+ }
+
+ return strcmp(scheme, "cldap") == 0;
+}
+#endif
+
static const char*
skip_url_prefix(
const char *url,
}
/* skip leading "URL:" (if any) */
- if ( strncasecmp( p, LDAP_URL_URLCOLON, LDAP_URL_URLCOLON_LEN ) == 0 )
- {
+ if ( strncasecmp( p, LDAP_URL_URLCOLON, LDAP_URL_URLCOLON_LEN ) == 0 ) {
p += LDAP_URL_URLCOLON_LEN;
}
return( p );
}
+#ifdef LDAP_CONNECTIONLESS
+ /* check for "cldap://" prefix */
+ if ( strncasecmp( p, LDAPC_URL_PREFIX, LDAPC_URL_PREFIX_LEN ) == 0 ) {
+ /* skip over "cldap://" prefix and return success */
+ p += LDAPC_URL_PREFIX_LEN;
+ *scheme = "cldap";
+ return( p );
+ }
+#endif
+
return( NULL );
}
return( -1 );
}
+static int hex_escape( char *buf, const char *s, int list )
+{
+ int i;
+ int pos;
+ static const char hex[] = "0123456789ABCDEF";
+
+ if( s == NULL ) return 0;
+
+ for( pos=0,i=0; s[i]; i++ ) {
+ int escape = 0;
+ switch( s[i] ) {
+ case ',':
+ escape = list;
+ break;
+ case '%':
+ case '?':
+ case ' ':
+ case '<':
+ case '>':
+ case '"':
+ case '#':
+ case '{':
+ case '}':
+ case '|':
+ case '\\':
+ case '^':
+ case '~':
+ case '`':
+ case '[':
+ case ']':
+ escape = 1;
+ break;
+
+ default:
+ escape = s[i] < 0x20 || 0x1f >= s[i];
+ }
+
+ if( escape ) {
+ buf[pos++] = '%';
+ buf[pos++] = hex[ (s[i] >> 4) & 0x0f ];
+ buf[pos++] = hex[ s[i] & 0x0f ];
+ } else {
+ buf[pos++] = s[i];
+ }
+ }
+
+ return pos;
+}
+
+static int hex_escape_args( char *buf, char **s )
+{
+ int pos;
+ int i;
+
+ if( s == NULL ) return 0;
+
+ pos = 0;
+ for( i=0; s[i] != NULL; i++ ) {
+ if( pos ) {
+ buf[pos++] = ',';
+ }
+ pos += hex_escape( &buf[pos], s[i], 1 );
+ }
+
+ return pos;
+}
+
+char * ldap_url_desc2str( LDAPURLDesc *u )
+{
+ char *s;
+ int i;
+ int sep = 0;
+ int sofar;
+ size_t len = 0;
+ if( u == NULL ) return NULL;
+
+ if( u->lud_exts ) {
+ for( i=0; u->lud_exts[i]; i++ ) {
+ len += strlen( u->lud_exts[i] ) + 1;
+ }
+ if( !sep ) sep = 5;
+ }
+
+ if( u->lud_filter ) {
+ len += strlen( u->lud_filter );
+ if( !sep ) sep = 4;
+ }
+ if ( len ) len++; /* ? */
+
+ switch( u->lud_scope ) {
+ case LDAP_SCOPE_ONELEVEL:
+ case LDAP_SCOPE_SUBTREE:
+ case LDAP_SCOPE_BASE:
+ len += sizeof("base");
+ if( !sep ) sep = 3;
+ break;
+
+ default:
+ if ( len ) len++; /* ? */
+ }
+
+ if( u->lud_attrs ) {
+ for( i=0; u->lud_attrs[i]; i++ ) {
+ len += strlen( u->lud_attrs[i] ) + 1;
+ }
+ if( !sep ) sep = 2;
+ } else if ( len ) len++; /* ? */
+
+ if( u->lud_dn ) {
+ len += strlen( u->lud_dn ) + 1;
+ if( !sep ) sep = 1;
+ };
+
+ if( u->lud_port ) {
+ len+=6;
+ }
+
+ if( u->lud_host ) {
+ len+=strlen( u->lud_host );
+ }
+
+ len += strlen( u->lud_scheme ) + sizeof("://");
+
+ /* allocate enough to hex escape everything -- overkill */
+ s = LDAP_MALLOC( 3*len );
+
+ if( s == NULL ) return NULL;
+
+ if( u->lud_port ) {
+ sprintf( s, "%s://%s:%d%n", u->lud_scheme,
+ u->lud_host, u->lud_port, &sofar );
+ } else {
+ sprintf( s, "%s://%s%n", u->lud_scheme,
+ u->lud_host, &sofar );
+ }
+
+ if( sep < 1 ) goto done;
+ s[sofar++] = '/';
+
+ sofar += hex_escape( &s[sofar], u->lud_dn, 0 );
+
+ if( sep < 2 ) goto done;
+ s[sofar++] = '?';
+
+ sofar += hex_escape_args( &s[sofar], u->lud_attrs );
+
+ if( sep < 3 ) goto done;
+ s[sofar++] = '?';
+
+ switch( u->lud_scope ) {
+ case LDAP_SCOPE_BASE:
+ strcpy( &s[sofar], "base" );
+ sofar += sizeof("base") - 1;
+ break;
+ case LDAP_SCOPE_ONELEVEL:
+ strcpy( &s[sofar], "one" );
+ sofar += sizeof("one") - 1;
+ break;
+ case LDAP_SCOPE_SUBTREE:
+ strcpy( &s[sofar], "sub" );
+ sofar += sizeof("sub") - 1;
+ break;
+ }
+
+ if( sep < 4 ) goto done;
+ s[sofar++] = '?';
+
+ sofar += hex_escape( &s[sofar], u->lud_filter, 0 );
+
+ if( sep < 5 ) goto done;
+ s[sofar++] = '?';
+
+ sofar += hex_escape_args( &s[sofar], u->lud_exts );
+
+done:
+ s[sofar] = '\0';
+ return s;
+}
int
-ldap_url_parse( LDAP_CONST char *url_in, LDAPURLDesc **ludpp )
+ldap_url_parse_ext( LDAP_CONST char *url_in, LDAPURLDesc **ludpp )
{
/*
* Pick apart the pieces of an LDAP URL.
const char *url_tmp;
char *url;
- if( url_in == NULL && ludpp == NULL ) {
+ if( url_in == NULL || ludpp == NULL ) {
return LDAP_URL_ERR_PARAM;
}
* because a call to LDAP_INT_GLOBAL_OPT() will try to allocate
* the options and cause infinite recursion
*/
- Debug( LDAP_DEBUG_TRACE, "ldap_url_parse(%s)\n", url_in, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "ldap_url_parse_ext(%s)\n", url_in, 0, 0 );
#endif
*ludpp = NULL; /* pessimistic */
ludp->lud_next = NULL;
ludp->lud_host = NULL;
- ludp->lud_port = LDAP_PORT;
+ ludp->lud_port = 0;
ludp->lud_dn = NULL;
ludp->lud_attrs = NULL;
ludp->lud_filter = NULL;
- ludp->lud_scope = LDAP_SCOPE_BASE;
+ ludp->lud_scope = LDAP_SCOPE_DEFAULT;
ludp->lud_filter = NULL;
+ ludp->lud_exts = NULL;
ludp->lud_scheme = LDAP_STRDUP( scheme );
return LDAP_URL_ERR_MEM;
}
- if( strcasecmp( ludp->lud_scheme, "ldaps" ) == 0 ) {
- ludp->lud_port = LDAPS_PORT;
- }
-
/* scan forward for '/' that marks end of hostport and begin. of dn */
p = strchr( url, '/' );
for( i=0; ludp->lud_exts[i] != NULL; i++ ) {
ldap_pvt_hex_unescape( ludp->lud_exts[i] );
+
+ if( *ludp->lud_exts[i] == '!' ) {
+ /* count the number of critical extensions */
+ ludp->lud_crit_exts++;
+ }
}
if( i == 0 ) {
/* must have 1 or more */
- ldap_charray_free( ludp->lud_exts );
LDAP_FREE( url );
ldap_free_urldesc( ludp );
return LDAP_URL_ERR_BADEXTS;
return LDAP_URL_SUCCESS;
}
+int
+ldap_url_parse( LDAP_CONST char *url_in, LDAPURLDesc **ludpp )
+{
+ int rc = ldap_url_parse_ext( url_in, ludpp );
+
+ if( rc != LDAP_URL_SUCCESS ) {
+ return rc;
+ }
+
+ if ((*ludpp)->lud_scope == LDAP_SCOPE_DEFAULT) {
+ (*ludpp)->lud_scope = LDAP_SCOPE_BASE;
+ }
+
+ if ((*ludpp)->lud_host != NULL && *(*ludpp)->lud_host == '\0') {
+ LDAP_FREE( (*ludpp)->lud_host );
+ (*ludpp)->lud_host = NULL;
+ }
+
+ if ((*ludpp)->lud_port == 0) {
+ if( strcmp((*ludpp)->lud_scheme, "ldap") == 0 ) {
+ (*ludpp)->lud_port = LDAP_PORT;
+#ifdef LDAP_CONNECTIONLESS
+ } else if( strcmp((*ludpp)->lud_scheme, "cldap") == 0 ) {
+ (*ludpp)->lud_port = LDAP_PORT;
+#endif
+ } else if( strcmp((*ludpp)->lud_scheme, "ldaps") == 0 ) {
+ (*ludpp)->lud_port = LDAPS_PORT;
+ }
+ }
+
+ return rc;
+}
+
LDAPURLDesc *
ldap_url_dup ( LDAPURLDesc *ludp )
{
BerElement *ber;
LDAPreqinfo bind;
+ assert( ld != NULL );
+ assert( LDAP_VALID( ld ) );
+
if ( ldap_url_parse( url, &ludp ) != 0 ) {
ld->ld_errno = LDAP_PARAM_ERROR;
return( -1 );
}
+ if( ludp->lud_crit_exts ) {
+ /* we don't support any extension (yet) */
+ ld->ld_errno = LDAP_NOT_SUPPORTED;
+ return( -1 );
+ }
+
ber = ldap_build_search_req( ld, ludp->lud_dn, ludp->lud_scope,
ludp->lud_filter, ludp->lud_attrs, attrsonly, NULL, NULL,
-1, -1 );
bind.ri_url = (char *)url;
err = ldap_send_server_request(
ld, ber, ld->ld_msgid, NULL,
- (ludp->lud_host != NULL || ludp->lud_port != 0)
- ? ludp : NULL,
- NULL, &bind );
+ NULL, NULL, &bind );
}
ldap_free_urldesc( ludp );
projects / openldap / blobdiff