X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsaslauthz.c;h=65207a356acc5763e694ed50f892094da0a18e85;hb=2189c9e1a91519428cc9f8be08f238b5079a64ad;hp=382ef1b4980c7a1e0a34a60bb18b3ea5190ac1a5;hpb=3eebd5bb21a66c1675913d53641e6f6f8d23ba89;p=openldap diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c index 382ef1b498..65207a356a 100644 --- a/servers/slapd/saslauthz.c +++ b/servers/slapd/saslauthz.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2006 The OpenLDAP Foundation. * Portions Copyright 2000 Mark Adamson, Carnegie Mellon. * All rights reserved. * @@ -17,6 +17,9 @@ #include "portable.h" #include +#ifdef HAVE_LIMITS_H +#include +#endif #include #include @@ -24,9 +27,6 @@ #include "slap.h" -#include - -#include #include "lutil.h" #define SASLREGEX_REPLACE 10 @@ -37,6 +37,7 @@ #define LDAP_X_SCOPE_SUBTREE ((ber_int_t) 0x0040) #define LDAP_X_SCOPE_ONELEVEL ((ber_int_t) 0x0050) #define LDAP_X_SCOPE_GROUP ((ber_int_t) 0x0060) +#define LDAP_X_SCOPE_USERS ((ber_int_t) 0x0070) /* * IDs in DNauthzid form can now have a type specifier, that @@ -81,122 +82,863 @@ struct rewrite_info *sasl_rwinfo = NULL; #define AUTHID_CONTEXT "authid" #endif /* SLAP_AUTH_REWRITE */ -/* What SASL proxy authorization policies are allowed? */ -#define SASL_AUTHZ_NONE 0x00 -#define SASL_AUTHZ_FROM 0x01 -#define SASL_AUTHZ_TO 0x02 -#define SASL_AUTHZ_AND 0x10 +/* What SASL proxy authorization policies are allowed? */ +#define SASL_AUTHZ_NONE 0x00 +#define SASL_AUTHZ_FROM 0x01 +#define SASL_AUTHZ_TO 0x02 +#define SASL_AUTHZ_AND 0x10 + +static const char *policy_txt[] = { + "none", "from", "to", "any" +}; + +static int authz_policy = SASL_AUTHZ_NONE; + +static int +slap_sasl_match( Operation *opx, struct berval *rule, + struct berval *assertDN, struct berval *authc ); + +int slap_sasl_setpolicy( const char *arg ) +{ + int rc = LDAP_SUCCESS; + + if ( strcasecmp( arg, "none" ) == 0 ) { + authz_policy = SASL_AUTHZ_NONE; + } else if ( strcasecmp( arg, "from" ) == 0 ) { + authz_policy = SASL_AUTHZ_FROM; + } else if ( strcasecmp( arg, "to" ) == 0 ) { + authz_policy = SASL_AUTHZ_TO; + } else if ( strcasecmp( arg, "both" ) == 0 || strcasecmp( arg, "any" ) == 0 ) { + authz_policy = SASL_AUTHZ_FROM | SASL_AUTHZ_TO; + } else if ( strcasecmp( arg, "all" ) == 0 ) { + authz_policy = SASL_AUTHZ_FROM | SASL_AUTHZ_TO | SASL_AUTHZ_AND; + } else { + rc = LDAP_OTHER; + } + return rc; +} + +const char * slap_sasl_getpolicy() +{ + if ( authz_policy == (SASL_AUTHZ_FROM | SASL_AUTHZ_TO | SASL_AUTHZ_AND) ) + return "all"; + else + return policy_txt[authz_policy]; +} + +int slap_parse_user( struct berval *id, struct berval *user, + struct berval *realm, struct berval *mech ) +{ + char u; + + assert( id != NULL ); + assert( !BER_BVISNULL( id ) ); + assert( user != NULL ); + assert( realm != NULL ); + assert( mech != NULL ); + + u = id->bv_val[ 0 ]; + + if ( u != 'u' && u != 'U' ) { + /* called with something other than u: */ + return LDAP_PROTOCOL_ERROR; + } + + /* uauthzid form: + * u[.mech[/realm]]:user + */ + + user->bv_val = ber_bvchr( id, ':' ); + if ( BER_BVISNULL( user ) ) { + return LDAP_PROTOCOL_ERROR; + } + user->bv_val[ 0 ] = '\0'; + user->bv_val++; + user->bv_len = id->bv_len - ( user->bv_val - id->bv_val ); + + mech->bv_val = ber_bvchr( id, '.' ); + if ( !BER_BVISNULL( mech ) ) { + mech->bv_val[ 0 ] = '\0'; + mech->bv_val++; + mech->bv_len = user->bv_val - mech->bv_val - 1; + + realm->bv_val = ber_bvchr( mech, '/' ); + + if ( !BER_BVISNULL( realm ) ) { + realm->bv_val[ 0 ] = '\0'; + realm->bv_val++; + mech->bv_len = realm->bv_val - mech->bv_val - 1; + realm->bv_len = user->bv_val - realm->bv_val - 1; + } + + } else { + BER_BVZERO( realm ); + } + + if ( id->bv_val[ 1 ] != '\0' ) { + return LDAP_PROTOCOL_ERROR; + } + + if ( !BER_BVISNULL( mech ) ) { + assert( mech->bv_val == id->bv_val + 2 ); + + AC_MEMCPY( mech->bv_val - 2, mech->bv_val, mech->bv_len + 1 ); + mech->bv_val -= 2; + } + + if ( !BER_BVISNULL( realm ) ) { + assert( realm->bv_val >= id->bv_val + 2 ); + + AC_MEMCPY( realm->bv_val - 2, realm->bv_val, realm->bv_len + 1 ); + realm->bv_val -= 2; + } + + /* leave "u:" before user */ + user->bv_val -= 2; + user->bv_len += 2; + user->bv_val[ 0 ] = u; + user->bv_val[ 1 ] = ':'; + + return LDAP_SUCCESS; +} + +#ifdef SLAP_AUTHZ_SYNTAX +int +authzValidate( + Syntax *syntax, + struct berval *in ) +{ + struct berval bv; + int rc = LDAP_INVALID_SYNTAX; + LDAPURLDesc *ludp = NULL; + int scope = -1; + + /* + * 1) + * 2) dn[.{exact|children|subtree|onelevel}]:{*|} + * 3) dn.regex: + * 4) u[.mech[/realm]]: + * 5) group[/[/]]: + * 6) + */ + + assert( in != NULL ); + assert( !BER_BVISNULL( in ) ); + + Debug( LDAP_DEBUG_TRACE, + "authzValidate: parsing %s\n", in->bv_val, 0, 0 ); + + /* + * 2) dn[.{exact|children|subtree|onelevel}]:{*|} + * 3) dn.regex: + * + * must pass DN normalization + */ + if ( !strncasecmp( in->bv_val, "dn", STRLENOF( "dn" ) ) ) { + bv.bv_val = in->bv_val + STRLENOF( "dn" ); + + if ( bv.bv_val[ 0 ] == '.' ) { + bv.bv_val++; + + if ( !strncasecmp( bv.bv_val, "exact:", STRLENOF( "exact:" ) ) ) { + bv.bv_val += STRLENOF( "exact:" ); + scope = LDAP_X_SCOPE_EXACT; + + } else if ( !strncasecmp( bv.bv_val, "regex:", STRLENOF( "regex:" ) ) ) { + bv.bv_val += STRLENOF( "regex:" ); + scope = LDAP_X_SCOPE_REGEX; + + } else if ( !strncasecmp( bv.bv_val, "children:", STRLENOF( "children:" ) ) ) { + bv.bv_val += STRLENOF( "children:" ); + scope = LDAP_X_SCOPE_CHILDREN; + + } else if ( !strncasecmp( bv.bv_val, "subtree:", STRLENOF( "subtree:" ) ) ) { + bv.bv_val += STRLENOF( "subtree:" ); + scope = LDAP_X_SCOPE_SUBTREE; + + } else if ( !strncasecmp( bv.bv_val, "onelevel:", STRLENOF( "onelevel:" ) ) ) { + bv.bv_val += STRLENOF( "onelevel:" ); + scope = LDAP_X_SCOPE_ONELEVEL; + + } else { + return LDAP_INVALID_SYNTAX; + } + + } else { + if ( bv.bv_val[ 0 ] != ':' ) { + return LDAP_INVALID_SYNTAX; + } + scope = LDAP_X_SCOPE_EXACT; + bv.bv_val++; + } + + bv.bv_val += strspn( bv.bv_val, " " ); + /* jump here in case no type specification was present + * and uri was not an URI... HEADS-UP: assuming EXACT */ +is_dn: bv.bv_len = in->bv_len - ( bv.bv_val - in->bv_val ); + + /* a single '*' means any DN without using regexes */ + if ( ber_bvccmp( &bv, '*' ) ) { + /* LDAP_X_SCOPE_USERS */ + return LDAP_SUCCESS; + } + + switch ( scope ) { + case LDAP_X_SCOPE_EXACT: + case LDAP_X_SCOPE_CHILDREN: + case LDAP_X_SCOPE_SUBTREE: + case LDAP_X_SCOPE_ONELEVEL: + return dnValidate( NULL, &bv ); + + case LDAP_X_SCOPE_REGEX: + return LDAP_SUCCESS; + } + + return rc; + + /* + * 4) u[.mech[/realm]]: + */ + } else if ( ( in->bv_val[ 0 ] == 'u' || in->bv_val[ 0 ] == 'U' ) + && ( in->bv_val[ 1 ] == ':' + || in->bv_val[ 1 ] == '/' + || in->bv_val[ 1 ] == '.' ) ) + { + char buf[ SLAP_LDAPDN_MAXLEN ]; + struct berval id, + user = BER_BVNULL, + realm = BER_BVNULL, + mech = BER_BVNULL; + + if ( sizeof( buf ) <= in->bv_len ) { + return LDAP_INVALID_SYNTAX; + } + + id.bv_len = in->bv_len; + id.bv_val = buf; + strncpy( buf, in->bv_val, sizeof( buf ) ); + + rc = slap_parse_user( &id, &user, &realm, &mech ); + if ( rc != LDAP_SUCCESS ) { + return LDAP_INVALID_SYNTAX; + } + + return rc; + + /* + * 5) group[/groupClass[/memberAttr]]: + * + * defaults to "groupOfNames" + * defaults to "member" + * + * must pass DN normalization + */ + } else if ( strncasecmp( in->bv_val, "group", STRLENOF( "group" ) ) == 0 ) + { + struct berval group_dn = BER_BVNULL, + group_oc = BER_BVNULL, + member_at = BER_BVNULL; + + bv.bv_val = in->bv_val + STRLENOF( "group" ); + bv.bv_len = in->bv_len - STRLENOF( "group" ); + group_dn.bv_val = ber_bvchr( &bv, ':' ); + if ( group_dn.bv_val == NULL ) { + /* last chance: assume it's a(n exact) DN ... */ + bv.bv_val = in->bv_val; + scope = LDAP_X_SCOPE_EXACT; + goto is_dn; + } + + /* + * FIXME: we assume that "member" and "groupOfNames" + * are present in schema... + */ + if ( bv.bv_val[ 0 ] == '/' ) { + group_oc.bv_val = &bv.bv_val[ 1 ]; + group_oc.bv_len = group_dn.bv_val - group_oc.bv_val; + + member_at.bv_val = ber_bvchr( &group_oc, '/' ); + if ( member_at.bv_val ) { + AttributeDescription *ad = NULL; + const char *text = NULL; + + group_oc.bv_len = member_at.bv_val - group_oc.bv_val; + member_at.bv_val++; + member_at.bv_len = group_dn.bv_val - member_at.bv_val; + rc = slap_bv2ad( &member_at, &ad, &text ); + if ( rc != LDAP_SUCCESS ) { + return rc; + } + } + + if ( oc_bvfind( &group_oc ) == NULL ) { + return LDAP_INVALID_SYNTAX; + } + } + + group_dn.bv_val++; + group_dn.bv_len = in->bv_len - ( group_dn.bv_val - in->bv_val ); + + rc = dnValidate( NULL, &group_dn ); + if ( rc != LDAP_SUCCESS ) { + return rc; + } + + return rc; + } + + /* + * ldap:///??? + * ::= {base|one|subtree} + * + * defaults to "base" + * must pass DN normalization + * must pass str2filter() + */ + rc = ldap_url_parse( in->bv_val, &ludp ); + switch ( rc ) { + case LDAP_URL_SUCCESS: + /* FIXME: the check is pedantic, but I think it's necessary, + * because people tend to use things like ldaps:// which + * gives the idea SSL is being used. Maybe we could + * accept ldapi:// as well, but the point is that we use + * an URL as an easy means to define bits of a search with + * little parsing. + */ + if ( strcasecmp( ludp->lud_scheme, "ldap" ) != 0 ) { + /* + * must be ldap:/// + */ + rc = LDAP_INVALID_SYNTAX; + goto done; + } + break; + + case LDAP_URL_ERR_BADSCHEME: + /* + * last chance: assume it's a(n exact) DN ... + * + * NOTE: must pass DN normalization + */ + ldap_free_urldesc( ludp ); + bv.bv_val = in->bv_val; + scope = LDAP_X_SCOPE_EXACT; + goto is_dn; + + default: + rc = LDAP_INVALID_SYNTAX; + goto done; + } + + if ( ( ludp->lud_host && *ludp->lud_host ) + || ludp->lud_attrs || ludp->lud_exts ) + { + /* host part must be empty */ + /* attrs and extensions parts must be empty */ + rc = LDAP_INVALID_SYNTAX; + goto done; + } + + /* Grab the filter */ + if ( ludp->lud_filter ) { + Filter *f = str2filter( ludp->lud_filter ); + if ( f == NULL ) { + rc = LDAP_INVALID_SYNTAX; + goto done; + } + filter_free( f ); + } + + /* Grab the searchbase */ + assert( ludp->lud_dn != NULL ); + ber_str2bv( ludp->lud_dn, 0, 0, &bv ); + rc = dnValidate( NULL, &bv ); + +done: + ldap_free_urldesc( ludp ); + return( rc ); +} + +#if 0 +int +authzMatch( + int *matchp, + slap_mask_t flags, + Syntax *syntax, + MatchingRule *mr, + struct berval *value, + void *assertedValue ) +{ + return octetStringMatch( matchp, flags, syntax, mr, value, assertedValue ); +} +#endif + +static int +authzPrettyNormal( + struct berval *val, + struct berval *normalized, + void *ctx, + int normalize ) +{ + struct berval bv; + int rc = LDAP_INVALID_SYNTAX; + LDAPURLDesc *ludp = NULL; + char *lud_dn = NULL, + *lud_filter = NULL; + int scope = -1; + + /* + * 1) + * 2) dn[.{exact|children|subtree|onelevel}]:{*|} + * 3) dn.regex: + * 4) u[.mech[/realm]]: + * 5) group[/[/]]: + * 6) + */ + + assert( val != NULL ); + assert( !BER_BVISNULL( val ) ); + + /* + * 2) dn[.{exact|children|subtree|onelevel}]:{*|} + * 3) dn.regex: + * + * must pass DN normalization + */ + if ( !strncasecmp( val->bv_val, "dn", STRLENOF( "dn" ) ) ) { + struct berval out = BER_BVNULL, + prefix = BER_BVNULL; + char *ptr; + + bv.bv_val = val->bv_val + STRLENOF( "dn" ); + + if ( bv.bv_val[ 0 ] == '.' ) { + bv.bv_val++; + + if ( !strncasecmp( bv.bv_val, "exact:", STRLENOF( "exact:" ) ) ) { + bv.bv_val += STRLENOF( "exact:" ); + scope = LDAP_X_SCOPE_EXACT; + + } else if ( !strncasecmp( bv.bv_val, "regex:", STRLENOF( "regex:" ) ) ) { + bv.bv_val += STRLENOF( "regex:" ); + scope = LDAP_X_SCOPE_REGEX; + + } else if ( !strncasecmp( bv.bv_val, "children:", STRLENOF( "children:" ) ) ) { + bv.bv_val += STRLENOF( "children:" ); + scope = LDAP_X_SCOPE_CHILDREN; + + } else if ( !strncasecmp( bv.bv_val, "subtree:", STRLENOF( "subtree:" ) ) ) { + bv.bv_val += STRLENOF( "subtree:" ); + scope = LDAP_X_SCOPE_SUBTREE; + + } else if ( !strncasecmp( bv.bv_val, "onelevel:", STRLENOF( "onelevel:" ) ) ) { + bv.bv_val += STRLENOF( "onelevel:" ); + scope = LDAP_X_SCOPE_ONELEVEL; + + } else { + return LDAP_INVALID_SYNTAX; + } + + } else { + if ( bv.bv_val[ 0 ] != ':' ) { + return LDAP_INVALID_SYNTAX; + } + scope = LDAP_X_SCOPE_EXACT; + bv.bv_val++; + } + + bv.bv_val += strspn( bv.bv_val, " " ); + /* jump here in case no type specification was present + * and uri was not an URI... HEADS-UP: assuming EXACT */ +is_dn: bv.bv_len = val->bv_len - ( bv.bv_val - val->bv_val ); + + /* a single '*' means any DN without using regexes */ + if ( ber_bvccmp( &bv, '*' ) ) { + ber_str2bv_x( "dn:*", STRLENOF( "dn:*" ), 1, normalized, ctx ); + return LDAP_SUCCESS; + } + + switch ( scope ) { + case LDAP_X_SCOPE_EXACT: + case LDAP_X_SCOPE_CHILDREN: + case LDAP_X_SCOPE_SUBTREE: + case LDAP_X_SCOPE_ONELEVEL: + if ( normalize ) { + rc = dnNormalize( 0, NULL, NULL, &bv, &out, ctx ); + } else { + rc = dnPretty( NULL, &bv, &out, ctx ); + } + if( rc != LDAP_SUCCESS ) { + return LDAP_INVALID_SYNTAX; + } + break; + + case LDAP_X_SCOPE_REGEX: + normalized->bv_len = STRLENOF( "dn.regex:" ) + bv.bv_len; + normalized->bv_val = ber_memalloc_x( normalized->bv_len + 1, ctx ); + ptr = lutil_strcopy( normalized->bv_val, "dn.regex:" ); + ptr = lutil_strncopy( ptr, bv.bv_val, bv.bv_len ); + ptr[ 0 ] = '\0'; + return LDAP_SUCCESS; + + default: + return LDAP_INVALID_SYNTAX; + } + + /* prepare prefix */ + switch ( scope ) { + case LDAP_X_SCOPE_EXACT: + BER_BVSTR( &prefix, "dn:" ); + break; + + case LDAP_X_SCOPE_CHILDREN: + BER_BVSTR( &prefix, "dn.children:" ); + break; + + case LDAP_X_SCOPE_SUBTREE: + BER_BVSTR( &prefix, "dn.subtree:" ); + break; + + case LDAP_X_SCOPE_ONELEVEL: + BER_BVSTR( &prefix, "dn.onelevel:" ); + break; + + default: + assert( 0 ); + break; + } + + normalized->bv_len = prefix.bv_len + out.bv_len; + normalized->bv_val = ber_memalloc_x( normalized->bv_len + 1, ctx ); + + ptr = lutil_strcopy( normalized->bv_val, prefix.bv_val ); + ptr = lutil_strncopy( ptr, out.bv_val, out.bv_len ); + ptr[ 0 ] = '\0'; + ber_memfree_x( out.bv_val, ctx ); + + return LDAP_SUCCESS; + + /* + * 4) u[.mech[/realm]]: + */ + } else if ( ( val->bv_val[ 0 ] == 'u' || val->bv_val[ 0 ] == 'U' ) + && ( val->bv_val[ 1 ] == ':' + || val->bv_val[ 1 ] == '/' + || val->bv_val[ 1 ] == '.' ) ) + { + char buf[ SLAP_LDAPDN_MAXLEN ]; + struct berval id, + user = BER_BVNULL, + realm = BER_BVNULL, + mech = BER_BVNULL; + + if ( sizeof( buf ) <= val->bv_len ) { + return LDAP_INVALID_SYNTAX; + } + + id.bv_len = val->bv_len; + id.bv_val = buf; + strncpy( buf, val->bv_val, sizeof( buf ) ); + + rc = slap_parse_user( &id, &user, &realm, &mech ); + if ( rc != LDAP_SUCCESS ) { + return LDAP_INVALID_SYNTAX; + } + + ber_dupbv_x( normalized, val, ctx ); + + return rc; + + /* + * 5) group[/groupClass[/memberAttr]]: + * + * defaults to "groupOfNames" + * defaults to "member" + * + * must pass DN normalization + */ + } else if ( strncasecmp( val->bv_val, "group", STRLENOF( "group" ) ) == 0 ) + { + struct berval group_dn = BER_BVNULL, + group_oc = BER_BVNULL, + member_at = BER_BVNULL, + out = BER_BVNULL; + char *ptr; + + bv.bv_val = val->bv_val + STRLENOF( "group" ); + bv.bv_len = val->bv_len - STRLENOF( "group" ); + group_dn.bv_val = ber_bvchr( &bv, ':' ); + if ( group_dn.bv_val == NULL ) { + /* last chance: assume it's a(n exact) DN ... */ + bv.bv_val = val->bv_val; + scope = LDAP_X_SCOPE_EXACT; + goto is_dn; + } + + /* + * FIXME: we assume that "member" and "groupOfNames" + * are present in schema... + */ + if ( bv.bv_val[ 0 ] == '/' ) { + ObjectClass *oc = NULL; + + group_oc.bv_val = &bv.bv_val[ 1 ]; + group_oc.bv_len = group_dn.bv_val - group_oc.bv_val; + + member_at.bv_val = ber_bvchr( &group_oc, '/' ); + if ( member_at.bv_val ) { + AttributeDescription *ad = NULL; + const char *text = NULL; + + group_oc.bv_len = member_at.bv_val - group_oc.bv_val; + member_at.bv_val++; + member_at.bv_len = group_dn.bv_val - member_at.bv_val; + rc = slap_bv2ad( &member_at, &ad, &text ); + if ( rc != LDAP_SUCCESS ) { + return rc; + } + + member_at = ad->ad_cname; + + } + + oc = oc_bvfind( &group_oc ); + if ( oc == NULL ) { + return LDAP_INVALID_SYNTAX; + } + + group_oc = oc->soc_cname; + } + + group_dn.bv_val++; + group_dn.bv_len = val->bv_len - ( group_dn.bv_val - val->bv_val ); + + if ( normalize ) { + rc = dnNormalize( 0, NULL, NULL, &group_dn, &out, ctx ); + } else { + rc = dnPretty( NULL, &group_dn, &out, ctx ); + } + if ( rc != LDAP_SUCCESS ) { + return rc; + } + + normalized->bv_len = STRLENOF( "group" ":" ) + out.bv_len; + if ( !BER_BVISNULL( &group_oc ) ) { + normalized->bv_len += STRLENOF( "/" ) + group_oc.bv_len; + if ( !BER_BVISNULL( &member_at ) ) { + normalized->bv_len += STRLENOF( "/" ) + member_at.bv_len; + } + } + + normalized->bv_val = ber_memalloc_x( normalized->bv_len + 1, ctx ); + ptr = lutil_strcopy( normalized->bv_val, "group" ); + if ( !BER_BVISNULL( &group_oc ) ) { + ptr[ 0 ] = '/'; + ptr++; + ptr = lutil_strncopy( ptr, group_oc.bv_val, group_oc.bv_len ); + if ( !BER_BVISNULL( &member_at ) ) { + ptr[ 0 ] = '/'; + ptr++; + ptr = lutil_strncopy( ptr, member_at.bv_val, member_at.bv_len ); + } + } + ptr[ 0 ] = ':'; + ptr++; + ptr = lutil_strncopy( ptr, out.bv_val, out.bv_len ); + ptr[ 0 ] = '\0'; + ber_memfree_x( out.bv_val, ctx ); + + return rc; + } -static int authz_policy = SASL_AUTHZ_NONE; + /* + * ldap:///??? + * ::= {base|one|subtree} + * + * defaults to "base" + * must pass DN normalization + * must pass str2filter() + */ + rc = ldap_url_parse( val->bv_val, &ludp ); + switch ( rc ) { + case LDAP_URL_SUCCESS: + /* FIXME: the check is pedantic, but I think it's necessary, + * because people tend to use things like ldaps:// which + * gives the idea SSL is being used. Maybe we could + * accept ldapi:// as well, but the point is that we use + * an URL as an easy means to define bits of a search with + * little parsing. + */ + if ( strcasecmp( ludp->lud_scheme, "ldap" ) != 0 ) { + /* + * must be ldap:/// + */ + rc = LDAP_INVALID_SYNTAX; + goto done; + } -static -int slap_sasl_match( Operation *opx, struct berval *rule, - struct berval *assertDN, struct berval *authc ); + AC_MEMCPY( ludp->lud_scheme, "ldap", STRLENOF( "ldap" ) ); + break; -int slap_sasl_setpolicy( const char *arg ) -{ - int rc = LDAP_SUCCESS; + case LDAP_URL_ERR_BADSCHEME: + /* + * last chance: assume it's a(n exact) DN ... + * + * NOTE: must pass DN normalization + */ + ldap_free_urldesc( ludp ); + bv.bv_val = val->bv_val; + scope = LDAP_X_SCOPE_EXACT; + goto is_dn; - if ( strcasecmp( arg, "none" ) == 0 ) { - authz_policy = SASL_AUTHZ_NONE; - } else if ( strcasecmp( arg, "from" ) == 0 ) { - authz_policy = SASL_AUTHZ_FROM; - } else if ( strcasecmp( arg, "to" ) == 0 ) { - authz_policy = SASL_AUTHZ_TO; - } else if ( strcasecmp( arg, "both" ) == 0 || strcasecmp( arg, "any" ) == 0 ) { - authz_policy = SASL_AUTHZ_FROM | SASL_AUTHZ_TO; - } else if ( strcasecmp( arg, "all" ) == 0 ) { - authz_policy = SASL_AUTHZ_FROM | SASL_AUTHZ_TO | SASL_AUTHZ_AND; - } else { - rc = LDAP_OTHER; + default: + rc = LDAP_INVALID_SYNTAX; + goto done; } - return rc; -} - -int slap_parse_user( struct berval *id, struct berval *user, - struct berval *realm, struct berval *mech ) -{ - char u; - - assert( id ); - assert( !BER_BVISNULL( id ) ); - assert( user ); - assert( realm ); - assert( mech ); - u = id->bv_val[ 0 ]; - - if ( u != 'u' && u != 'U' ) { - /* called with something other than u: */ - return LDAP_PROTOCOL_ERROR; + if ( ( ludp->lud_host && *ludp->lud_host ) + || ludp->lud_attrs || ludp->lud_exts ) + { + /* host part must be empty */ + /* attrs and extensions parts must be empty */ + rc = LDAP_INVALID_SYNTAX; + goto done; } - /* uauthzid form: - * u[.mech[/realm]]:user - */ - - user->bv_val = strchr( id->bv_val, ':' ); - if ( BER_BVISNULL( user ) ) { - return LDAP_PROTOCOL_ERROR; + /* Grab the filter */ + if ( ludp->lud_filter ) { + struct berval filterstr; + Filter *f; + + lud_filter = ludp->lud_filter; + + f = str2filter( lud_filter ); + if ( f == NULL ) { + rc = LDAP_INVALID_SYNTAX; + goto done; + } + filter2bv( f, &filterstr ); + filter_free( f ); + if ( BER_BVISNULL( &filterstr ) ) { + rc = LDAP_INVALID_SYNTAX; + goto done; + } + + ludp->lud_filter = filterstr.bv_val; } - user->bv_val[ 0 ] = '\0'; - user->bv_val++; - user->bv_len = id->bv_len - ( user->bv_val - id->bv_val ); - mech->bv_val = strchr( id->bv_val, '.' ); - if ( !BER_BVISNULL( mech ) ) { - mech->bv_val[ 0 ] = '\0'; - mech->bv_val++; + /* Grab the searchbase */ + assert( ludp->lud_dn != NULL ); + if ( ludp->lud_dn ) { + struct berval out = BER_BVNULL; - realm->bv_val = strchr( mech->bv_val, '/' ); + lud_dn = ludp->lud_dn; - if ( !BER_BVISNULL( realm ) ) { - realm->bv_val[ 0 ] = '\0'; - realm->bv_val++; - mech->bv_len = realm->bv_val - mech->bv_val - 1; - realm->bv_len = user->bv_val - realm->bv_val - 1; + ber_str2bv( lud_dn, 0, 0, &bv ); + if ( normalize ) { + rc = dnNormalize( 0, NULL, NULL, &bv, &out, ctx ); } else { - mech->bv_len = user->bv_val - mech->bv_val - 1; + rc = dnPretty( NULL, &bv, &out, ctx ); } - } else { - BER_BVZERO( realm ); - } + if ( rc != LDAP_SUCCESS ) { + goto done; + } - if ( id->bv_val[ 1 ] != '\0' ) { - return LDAP_PROTOCOL_ERROR; + ludp->lud_dn = out.bv_val; } - if ( !BER_BVISNULL( mech ) ) { - assert( mech->bv_val == id->bv_val + 2 ); + ludp->lud_port = 0; + normalized->bv_val = ldap_url_desc2str( ludp ); + if ( normalized->bv_val ) { + normalized->bv_len = strlen( normalized->bv_val ); - AC_MEMCPY( mech->bv_val - 2, mech->bv_val, mech->bv_len + 1 ); - mech->bv_val -= 2; + } else { + rc = LDAP_INVALID_SYNTAX; } - if ( !BER_BVISNULL( realm ) ) { - assert( realm->bv_val >= id->bv_val + 2 ); +done: + if ( lud_filter ) { + if ( ludp->lud_filter != lud_filter ) { + ber_memfree( ludp->lud_filter ); + } + ludp->lud_filter = lud_filter; + } - AC_MEMCPY( realm->bv_val - 2, realm->bv_val, realm->bv_len + 1 ); - realm->bv_val -= 2; + if ( lud_dn ) { + if ( ludp->lud_dn != lud_dn ) { + ber_memfree( ludp->lud_dn ); + } + ludp->lud_dn = lud_dn; } - /* leave "u:" before user */ - user->bv_val -= 2; - user->bv_len += 2; - user->bv_val[ 0 ] = u; - user->bv_val[ 1 ] = ':'; + ldap_free_urldesc( ludp ); - return LDAP_SUCCESS; + return( rc ); } -static int slap_parseURI( Operation *op, struct berval *uri, - struct berval *base, struct berval *nbase, - int *scope, Filter **filter, struct berval *fstr ) +int +authzNormalize( + slap_mask_t usage, + Syntax *syntax, + MatchingRule *mr, + struct berval *val, + struct berval *normalized, + void *ctx ) { - struct berval bv; - int rc; - LDAPURLDesc *ludp; + int rc; + + Debug( LDAP_DEBUG_TRACE, ">>> authzNormalize: <%s>\n", + val->bv_val, 0, 0 ); + + rc = authzPrettyNormal( val, normalized, ctx, 1 ); + + Debug( LDAP_DEBUG_TRACE, "<<< authzNormalize: <%s> (%d)\n", + normalized->bv_val, rc, 0 ); + + return rc; +} + +int +authzPretty( + Syntax *syntax, + struct berval *val, + struct berval *out, + void *ctx) +{ + int rc; + + Debug( LDAP_DEBUG_TRACE, ">>> authzPretty: <%s>\n", + val->bv_val, 0, 0 ); + + rc = authzPrettyNormal( val, out, ctx, 0 ); + + Debug( LDAP_DEBUG_TRACE, "<<< authzPretty: <%s> (%d)\n", + out->bv_val, rc, 0 ); + + return rc; +} + +#endif /* SLAP_AUTHZ_SYNTAX */ + +static int +slap_parseURI( + Operation *op, + struct berval *uri, + struct berval *base, + struct berval *nbase, + int *scope, + Filter **filter, + struct berval *fstr, + int normalize ) +{ + struct berval bv; + int rc; + LDAPURLDesc *ludp; + +#ifdef SLAP_ORDERED_PRETTYNORM + struct berval idx; +#endif /* SLAP_ORDERED_PRETTYNORM */ assert( uri != NULL && !BER_BVISNULL( uri ) ); BER_BVZERO( base ); @@ -205,15 +947,26 @@ static int slap_parseURI( Operation *op, struct berval *uri, *scope = -1; *filter = NULL; -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_parseURI: parsing %s\n", uri->bv_val, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "slap_parseURI: parsing %s\n", uri->bv_val, 0, 0 ); -#endif rc = LDAP_PROTOCOL_ERROR; + +#ifdef SLAP_ORDERED_PRETTYNORM + idx = *uri; + if ( idx.bv_val[ 0 ] == '{' ) { + char *ptr; + + ptr = ber_bvchr( &idx, '}' ) + 1; + + assert( ptr != (void *)1 ); + + idx.bv_len -= ptr - idx.bv_val; + idx.bv_val = ptr; + uri = &idx; + } +#endif /* SLAP_ORDERED_PRETTYNORM */ + /* * dn[.]: * ::= {exact|regex|children|subtree|onelevel} @@ -252,8 +1005,9 @@ static int slap_parseURI( Operation *op, struct berval *uri, } } else { - if ( bv.bv_val[ 0 ] != ':' ) + if ( bv.bv_val[ 0 ] != ':' ) { return LDAP_PROTOCOL_ERROR; + } *scope = LDAP_X_SCOPE_EXACT; bv.bv_val++; } @@ -263,19 +1017,31 @@ static int slap_parseURI( Operation *op, struct berval *uri, * and uri was not an URI... HEADS-UP: assuming EXACT */ is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); + /* a single '*' means any DN without using regexes */ + if ( ber_bvccmp( &bv, '*' ) ) { + *scope = LDAP_X_SCOPE_USERS; + } + switch ( *scope ) { case LDAP_X_SCOPE_EXACT: case LDAP_X_SCOPE_CHILDREN: case LDAP_X_SCOPE_SUBTREE: case LDAP_X_SCOPE_ONELEVEL: - rc = dnNormalize( 0, NULL, NULL, &bv, nbase, op->o_tmpmemctx ); - if( rc != LDAP_SUCCESS ) { - *scope = -1; + if ( normalize ) { + rc = dnNormalize( 0, NULL, NULL, &bv, nbase, op->o_tmpmemctx ); + if( rc != LDAP_SUCCESS ) { + *scope = -1; + } + } else { + ber_dupbv_x( nbase, &bv, op->o_tmpmemctx ); + rc = LDAP_SUCCESS; } break; case LDAP_X_SCOPE_REGEX: ber_dupbv_x( nbase, &bv, op->o_tmpmemctx ); + + case LDAP_X_SCOPE_USERS: rc = LDAP_SUCCESS; break; @@ -345,7 +1111,8 @@ is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); char *tmp; bv.bv_val = uri->bv_val + STRLENOF( "group" ); - group_dn.bv_val = strchr( bv.bv_val, ':' ); + bv.bv_len = uri->bv_len - STRLENOF( "group" ); + group_dn.bv_val = ber_bvchr( &bv, ':' ); if ( group_dn.bv_val == NULL ) { /* last chance: assume it's a(n exact) DN ... */ bv.bv_val = uri->bv_val; @@ -355,28 +1122,33 @@ is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); if ( bv.bv_val[ 0 ] == '/' ) { group_oc.bv_val = &bv.bv_val[ 1 ]; + group_oc.bv_len = group_dn.bv_val - group_oc.bv_val; - member_at.bv_val = strchr( group_oc.bv_val, '/' ); + member_at.bv_val = ber_bvchr( &group_oc, '/' ); if ( member_at.bv_val ) { group_oc.bv_len = member_at.bv_val - group_oc.bv_val; member_at.bv_val++; member_at.bv_len = group_dn.bv_val - member_at.bv_val; } else { - group_oc.bv_len = group_dn.bv_val - group_oc.bv_val; - BER_BVSTR( &member_at, "member" ); + BER_BVSTR( &member_at, SLAPD_GROUP_ATTR ); } } else { - BER_BVSTR( &group_oc, "groupOfNames" ); + BER_BVSTR( &group_oc, SLAPD_GROUP_CLASS ); } group_dn.bv_val++; group_dn.bv_len = uri->bv_len - ( group_dn.bv_val - uri->bv_val ); - rc = dnNormalize( 0, NULL, NULL, &group_dn, nbase, op->o_tmpmemctx ); - if ( rc != LDAP_SUCCESS ) { - *scope = -1; - return rc; + if ( normalize ) { + rc = dnNormalize( 0, NULL, NULL, &group_dn, nbase, op->o_tmpmemctx ); + if ( rc != LDAP_SUCCESS ) { + *scope = -1; + return rc; + } + } else { + ber_dupbv_x( nbase, &group_dn, op->o_tmpmemctx ); + rc = LDAP_SUCCESS; } *scope = LDAP_X_SCOPE_GROUP; @@ -406,22 +1178,41 @@ is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); * must pass str2filter() */ rc = ldap_url_parse( uri->bv_val, &ludp ); - if ( rc == LDAP_URL_ERR_BADSCHEME ) { + switch ( rc ) { + case LDAP_URL_SUCCESS: + /* FIXME: the check is pedantic, but I think it's necessary, + * because people tend to use things like ldaps:// which + * gives the idea SSL is being used. Maybe we could + * accept ldapi:// as well, but the point is that we use + * an URL as an easy means to define bits of a search with + * little parsing. + */ + if ( strcasecmp( ludp->lud_scheme, "ldap" ) != 0 ) { + /* + * must be ldap:/// + */ + rc = LDAP_PROTOCOL_ERROR; + goto done; + } + break; + + case LDAP_URL_ERR_BADSCHEME: /* * last chance: assume it's a(n exact) DN ... * * NOTE: must pass DN normalization */ + ldap_free_urldesc( ludp ); bv.bv_val = uri->bv_val; *scope = LDAP_X_SCOPE_EXACT; goto is_dn; - } - if ( rc != LDAP_URL_SUCCESS ) { - return LDAP_PROTOCOL_ERROR; + default: + rc = LDAP_PROTOCOL_ERROR; + goto done; } - if (( ludp->lud_host && *ludp->lud_host ) + if ( ( ludp->lud_host && *ludp->lud_host ) || ludp->lud_attrs || ludp->lud_exts ) { /* host part must be empty */ @@ -445,7 +1236,12 @@ is_dn: bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val); /* Grab the searchbase */ ber_str2bv( ludp->lud_dn, 0, 0, base ); - rc = dnNormalize( 0, NULL, NULL, base, nbase, op->o_tmpmemctx ); + if ( normalize ) { + rc = dnNormalize( 0, NULL, NULL, base, nbase, op->o_tmpmemctx ); + } else { + ber_dupbv_x( nbase, base, op->o_tmpmemctx ); + rc = LDAP_SUCCESS; + } done: if( rc != LDAP_SUCCESS ) { @@ -462,6 +1258,7 @@ done: return( rc ); } +#ifndef SLAP_AUTH_REWRITE static int slap_sasl_rx_off(char *rep, int *off) { const char *c; @@ -477,16 +1274,10 @@ static int slap_sasl_rx_off(char *rep, int *off) } if ( *c == '$' ) { if ( n == SASLREGEX_REPLACE ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ERR, - "slap_sasl_rx_off: \"%s\" has too many $n " - "placeholders (max %d)\n", rep, SASLREGEX_REPLACE, 0 ); -#else Debug( LDAP_DEBUG_ANY, "SASL replace pattern %s has too many $n " "placeholders (max %d)\n", rep, SASLREGEX_REPLACE, 0 ); -#endif return( LDAP_OTHER ); } @@ -501,6 +1292,7 @@ static int slap_sasl_rx_off(char *rep, int *off) off[n] = -1; return( LDAP_SUCCESS ); } +#endif /* ! SLAP_AUTH_REWRITE */ #ifdef SLAP_AUTH_REWRITE int slap_sasl_rewrite_config( @@ -545,8 +1337,7 @@ int slap_sasl_regexp_rewrite_config( const char *context ) { int rc; - char *newreplace, *p; - char *argvRule[] = { "rewriteRule", NULL, NULL, "@", NULL }; + char *argvRule[] = { "rewriteRule", NULL, NULL, ":@", NULL }; /* init at first call */ if ( sasl_rwinfo == NULL ) { @@ -570,20 +1361,9 @@ int slap_sasl_regexp_rewrite_config( } } - newreplace = ch_strdup( replace ); - - for (p = strchr( newreplace, '$' ); p; p = strchr( p + 1, '$' ) ) { - if ( isdigit( p[1] ) ) { - p[0] = '%'; - } else { - p++; - } - } - argvRule[1] = (char *)match; - argvRule[2] = newreplace; + argvRule[2] = (char *)replace; rc = rewrite_parse( sasl_rwinfo, fname, lineno, 4, argvRule ); - ch_free( newreplace ); return rc; } @@ -591,10 +1371,6 @@ int slap_sasl_regexp_rewrite_config( int slap_sasl_regexp_config( const char *match, const char *replace ) { -#ifdef SLAP_AUTH_REWRITE - return slap_sasl_regexp_rewrite_config( "sasl-regexp", 0, - match, replace, AUTHID_CONTEXT ); -#else /* ! SLAP_AUTH_REWRITE */ int rc; SaslRegexp_t *reg; @@ -606,19 +1382,26 @@ int slap_sasl_regexp_config( const char *match, const char *replace ) reg->sr_match = ch_strdup( match ); reg->sr_replace = ch_strdup( replace ); +#ifdef SLAP_AUTH_REWRITE + rc = slap_sasl_regexp_rewrite_config( "sasl-regexp", 0, + match, replace, AUTHID_CONTEXT ); + if ( rc == LDAP_SUCCESS ) nSaslRegexp++; + return rc; +#else /* ! SLAP_AUTH_REWRITE */ + /* Precompile matching pattern */ rc = regcomp( ®->sr_workspace, reg->sr_match, REG_EXTENDED|REG_ICASE ); if ( rc ) { -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ERR, - "slap_sasl_regexp_config: \"%s\" could not be compiled.\n", - reg->sr_match, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "SASL match pattern %s could not be compiled by regexp engine\n", reg->sr_match, 0, 0 ); -#endif +#ifdef ENABLE_REWRITE + /* Dummy block to force symbol references in librewrite */ + if ( slapMode == ( SLAP_SERVER_MODE|SLAP_TOOL_MODE )) { + rewrite_info_init( 0 ); + } +#endif return( LDAP_OTHER ); } @@ -630,6 +1413,35 @@ int slap_sasl_regexp_config( const char *match, const char *replace ) #endif /* ! SLAP_AUTH_REWRITE */ } +void slap_sasl_regexp_unparse( BerVarray *out ) +{ + int i; + BerVarray bva = NULL; + char ibuf[32], *ptr; + struct berval idx; + + if ( !nSaslRegexp ) return; + + idx.bv_val = ibuf; + bva = ch_malloc( (nSaslRegexp+1) * sizeof(struct berval) ); + BER_BVZERO(bva+nSaslRegexp); + for ( i=0; ibv_val[insert] = '\0'; } +#endif /* ! SLAP_AUTH_REWRITE */ /* Take the passed in SASL name and attempt to convert it into an LDAP URI to find the matching LDAP entry, using the pattern matching @@ -705,19 +1518,15 @@ static int slap_authz_regexp( struct berval *in, struct berval *out, if ( !BER_BVISNULL( out ) ) { char *val = out->bv_val; ber_str2bv_x( val, 0, 1, out, ctx ); - free( val ); + if ( val != in->bv_val ) { + free( val ); + } } else { ber_dupbv_x( out, in, ctx ); } -#ifdef NEW_LOGGING - LDAP_LOG( BACK_LDAP, DETAIL1, - "[rw] %s: \"%s\" -> \"%s\"\n", - context, in->bv_val, out->bv_val ); -#else /* !NEW_LOGGING */ Debug( LDAP_DEBUG_ARGS, "[rw] %s: \"%s\" -> \"%s\"\n", context, in->bv_val, out->bv_val ); -#endif /* !NEW_LOGGING */ return 1; case REWRITE_REGEXEC_UNWILLING: @@ -734,13 +1543,8 @@ static int slap_authz_regexp( struct berval *in, struct berval *out, memset( out, 0, sizeof( *out ) ); -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_authz_regexp: converting SASL name %s\n", saslname, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "slap_authz_regexp: converting SASL name %s\n", saslname, 0, 0 ); -#endif if (( saslname == NULL ) || ( nSaslRegexp == 0 )) { return( 0 ); @@ -763,44 +1567,34 @@ static int slap_authz_regexp( struct berval *in, struct berval *out, slap_sasl_rx_exp( reg->sr_replace, reg->sr_offset, sr_strings, saslname, out, ctx ); -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_authz_regexp: converted SASL name to %s\n", - BER_BVISEMPTY( out ) ? "" : out->bv_val, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "slap_authz_regexp: converted SASL name to %s\n", BER_BVISEMPTY( out ) ? "" : out->bv_val, 0, 0 ); -#endif return( 1 ); #endif /* ! SLAP_AUTH_REWRITE */ } /* This callback actually does some work...*/ -static int sasl_sc_sasl2dn( Operation *o, SlapReply *rs ) +static int sasl_sc_sasl2dn( Operation *op, SlapReply *rs ) { - struct berval *ndn = o->o_callback->sc_private; + struct berval *ndn = op->o_callback->sc_private; - if (rs->sr_type != REP_SEARCH) return 0; + if ( rs->sr_type != REP_SEARCH ) return LDAP_SUCCESS; /* We only want to be called once */ if ( !BER_BVISNULL( ndn ) ) { - o->o_tmpfree(ndn->bv_val, o->o_tmpmemctx); + op->o_tmpfree( ndn->bv_val, op->o_tmpmemctx ); BER_BVZERO( ndn ); -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, DETAIL1, - "slap_sc_sasl2dn: search DN returned more than 1 entry\n", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, - "slap_sc_sasl2dn: search DN returned more than 1 entry\n", 0, 0, 0 ); -#endif - return -1; + "%s: slap_sc_sasl2dn: search DN returned more than 1 entry\n", + op->o_log_prefix, 0, 0 ); + return LDAP_OTHER; } - ber_dupbv_x(ndn, &rs->sr_entry->e_nname, o->o_tmpmemctx); - return 0; + ber_dupbv_x( ndn, &rs->sr_entry->e_nname, op->o_tmpmemctx ); + return LDAP_SUCCESS; } @@ -862,8 +1656,8 @@ slap_sasl_matches( Operation *op, BerVarray rules, * The assertDN should not have the dn: prefix */ -static -int slap_sasl_match( Operation *opx, struct berval *rule, +static int +slap_sasl_match( Operation *opx, struct berval *rule, struct berval *assertDN, struct berval *authc ) { int rc; @@ -872,29 +1666,29 @@ int slap_sasl_match( Operation *opx, struct berval *rule, slap_callback cb = { NULL, sasl_sc_smatch, NULL, NULL }; Operation op = {0}; SlapReply rs = {REP_RESULT}; + struct berval base = BER_BVNULL; sm.dn = assertDN; sm.match = 0; cb.sc_private = &sm; -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_match: comparing DN %s to rule %s\n", - assertDN->bv_val, rule->bv_val,0 ); -#else Debug( LDAP_DEBUG_TRACE, "===>slap_sasl_match: comparing DN %s to rule %s\n", assertDN->bv_val, rule->bv_val, 0 ); -#endif - rc = slap_parseURI( opx, rule, &op.o_req_dn, - &op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter, - &op.ors_filterstr ); + /* NOTE: don't normalize rule if authz syntax is enabled */ + rc = slap_parseURI( opx, rule, &base, &op.o_req_ndn, + &op.ors_scope, &op.ors_filter, &op.ors_filterstr, +#ifdef SLAP_AUTHZ_SYNTAX + 0 +#else /* ! SLAP_AUTHZ_SYNTAX */ + 1 +#endif /* ! SLAP_AUTHZ_SYNTAX */ + ); + if( rc != LDAP_SUCCESS ) goto CONCLUDED; - /* Massive shortcut: search scope == base */ - switch ( op.oq_search.rs_scope ) { - case LDAP_SCOPE_BASE: + switch ( op.ors_scope ) { case LDAP_X_SCOPE_EXACT: exact_match: if ( dn_match( &op.o_req_ndn, assertDN ) ) { @@ -912,7 +1706,7 @@ exact_match: rc = LDAP_INAPPROPRIATE_AUTH; - if ( d == 0 && op.oq_search.rs_scope == LDAP_X_SCOPE_SUBTREE ) { + if ( d == 0 && op.ors_scope == LDAP_X_SCOPE_SUBTREE ) { goto exact_match; } else if ( d > 0 ) { @@ -928,7 +1722,7 @@ exact_match: bv.bv_val = assertDN->bv_val + d; if ( bv.bv_val[ -1 ] == ',' && dn_match( &op.o_req_ndn, &bv ) ) { - switch ( op.oq_search.rs_scope ) { + switch ( op.ors_scope ) { case LDAP_X_SCOPE_SUBTREE: case LDAP_X_SCOPE_CHILDREN: rc = LDAP_SUCCESS; @@ -978,16 +1772,16 @@ exact_match: * we need to append the so that the is searched * with scope "base", and the filter ensures that is * member of the group */ - tmp = ch_realloc( op.ors_filterstr.bv_val, - op.ors_filterstr.bv_len + assertDN->bv_len + STRLENOF( /* (( */ "))" ) + 1 ); + tmp = ch_realloc( op.ors_filterstr.bv_val, op.ors_filterstr.bv_len + + assertDN->bv_len + STRLENOF( /*"(("*/ "))" ) + 1 ); if ( tmp == NULL ) { rc = LDAP_NO_MEMORY; goto CONCLUDED; } op.ors_filterstr.bv_val = tmp; - tmp = lutil_strcopy( &tmp[ op.ors_filterstr.bv_len ], assertDN->bv_val ); - tmp = lutil_strcopy( tmp, /* (( */ "))" ); + tmp = lutil_strcopy( &tmp[op.ors_filterstr.bv_len], assertDN->bv_val ); + tmp = lutil_strcopy( tmp, /*"(("*/ "))" ); /* pass opx because str2filter_x may (and does) use o_tmpmfuncs */ op.ors_filter = str2filter_x( opx, op.ors_filterstr.bv_val ); @@ -1005,25 +1799,27 @@ exact_match: break; } + case LDAP_X_SCOPE_USERS: + if ( !BER_BVISEMPTY( assertDN ) ) { + rc = LDAP_SUCCESS; + } else { + rc = LDAP_INAPPROPRIATE_AUTH; + } + goto CONCLUDED; + default: break; } /* Must run an internal search. */ - if ( op.oq_search.rs_filter == NULL ) { + if ( op.ors_filter == NULL ) { rc = LDAP_FILTER_ERROR; goto CONCLUDED; } -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, DETAIL1, - "slap_sasl_match: performing internal search (base=%s, scope=%d)\n", - op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "slap_sasl_match: performing internal search (base=%s, scope=%d)\n", - op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 ); -#endif + op.o_req_ndn.bv_val, op.ors_scope, 0 ); op.o_bd = select_backend( &op.o_req_ndn, 0, 1 ); if(( op.o_bd == NULL ) || ( op.o_bd->be_search == NULL)) { @@ -1031,27 +1827,25 @@ exact_match: goto CONCLUDED; } + op.o_hdr = opx->o_hdr; op.o_tag = LDAP_REQ_SEARCH; - op.o_protocol = LDAP_VERSION3; op.o_ndn = *authc; op.o_callback = &cb; - op.o_time = slap_get_time(); + slap_op_time( &op.o_time, &op.o_tincr ); op.o_do_not_cache = 1; op.o_is_auth_check = 1; - op.o_threadctx = opx->o_threadctx; - op.o_tmpmemctx = opx->o_tmpmemctx; - op.o_tmpmfuncs = opx->o_tmpmfuncs; -#ifdef LDAP_SLAPI - op.o_pb = opx->o_pb; -#endif - op.o_conn = opx->o_conn; - op.o_connid = opx->o_connid; /* use req_ndn as req_dn instead of non-pretty base of uri */ - if( !BER_BVISNULL( &op.o_req_dn ) ) ch_free( op.o_req_dn.bv_val ); + if( !BER_BVISNULL( &base ) ) { + ch_free( base.bv_val ); + /* just in case... */ + BER_BVZERO( &base ); + } ber_dupbv_x( &op.o_req_dn, &op.o_req_ndn, op.o_tmpmemctx ); - op.oq_search.rs_slimit = 1; - op.oq_search.rs_tlimit = -1; - op.o_sync_slog_size = -1; + op.ors_deref = LDAP_DEREF_NEVER; + op.ors_slimit = 1; + op.ors_tlimit = SLAP_NO_LIMIT; + op.ors_attrs = slap_anlist_no_attrs; + op.ors_attrsonly = 1; op.o_bd->be_search( &op, &rs ); @@ -1064,16 +1858,11 @@ exact_match: CONCLUDED: if( !BER_BVISNULL( &op.o_req_dn ) ) slap_sl_free( op.o_req_dn.bv_val, opx->o_tmpmemctx ); if( !BER_BVISNULL( &op.o_req_ndn ) ) slap_sl_free( op.o_req_ndn.bv_val, opx->o_tmpmemctx ); - if( op.oq_search.rs_filter ) filter_free_x( opx, op.oq_search.rs_filter ); + if( op.ors_filter ) filter_free_x( opx, op.ors_filter ); if( !BER_BVISNULL( &op.ors_filterstr ) ) ch_free( op.ors_filterstr.bv_val ); -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_match: comparison returned %d\n", rc, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "<===slap_sasl_match: comparison returned %d\n", rc, 0, 0); -#endif return( rc ); } @@ -1094,20 +1883,14 @@ slap_sasl_check_authz( Operation *op, AttributeDescription *ad, struct berval *authc ) { - int i, rc; + int rc; BerVarray vals = NULL; -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_check_authz: does %s match %s rule in %s?\n", - assertDN->bv_val, ad->ad_cname.bv_val, searchDN->bv_val); -#else Debug( LDAP_DEBUG_TRACE, "==>slap_sasl_check_authz: does %s match %s rule in %s?\n", assertDN->bv_val, ad->ad_cname.bv_val, searchDN->bv_val); -#endif - rc = backend_attribute( op, NULL, searchDN, ad, &vals ); + rc = backend_attribute( op, NULL, searchDN, ad, &vals, ACL_AUTH ); if( rc != LDAP_SUCCESS ) goto COMPLETE; /* Check if the *assertDN matches any *vals */ @@ -1116,15 +1899,9 @@ slap_sasl_check_authz( Operation *op, COMPLETE: if( vals ) ber_bvarray_free_x( vals, op->o_tmpmemctx ); -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, RESULTS, - "slap_sasl_check_authz: %s check returning %s\n", - ad->ad_cname.bv_val, rc, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "<==slap_sasl_check_authz: %s check returning %d\n", ad->ad_cname.bv_val, rc, 0); -#endif return( rc ); } @@ -1137,27 +1914,25 @@ COMPLETE: * an internal search must be done, and if that search returns exactly one * entry, return the DN of that one entry. */ -void slap_sasl2dn( Operation *opx, - struct berval *saslname, struct berval *sasldn, int flags ) +void +slap_sasl2dn( + Operation *opx, + struct berval *saslname, + struct berval *sasldn, + int flags ) { int rc; slap_callback cb = { NULL, sasl_sc_sasl2dn, NULL, NULL }; Operation op = {0}; SlapReply rs = {REP_RESULT}; struct berval regout = BER_BVNULL; + struct berval base = BER_BVNULL; -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl2dn: converting SASL name %s to DN.\n", - saslname->bv_val, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "==>slap_sasl2dn: " "converting SASL name %s to a DN\n", saslname->bv_val, 0,0 ); -#endif - sasldn->bv_val = NULL; - sasldn->bv_len = 0; + BER_BVZERO( sasldn ); cb.sc_private = sasldn; /* Convert the SASL name into a minimal URI */ @@ -1165,9 +1940,10 @@ void slap_sasl2dn( Operation *opx, goto FINISHED; } - rc = slap_parseURI( opx, ®out, &op.o_req_dn, - &op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter, - &op.ors_filterstr ); + /* NOTE: always normalize regout because it results + * from string submatch expansion */ + rc = slap_parseURI( opx, ®out, &base, &op.o_req_ndn, + &op.ors_scope, &op.ors_filter, &op.ors_filterstr, 1 ); if ( !BER_BVISNULL( ®out ) ) slap_sl_free( regout.bv_val, opx->o_tmpmemctx ); if ( rc != LDAP_SUCCESS ) { goto FINISHED; @@ -1176,9 +1952,7 @@ void slap_sasl2dn( Operation *opx, /* Must do an internal search */ op.o_bd = select_backend( &op.o_req_ndn, 0, 1 ); - /* Massive shortcut: search scope == base */ - switch ( op.oq_search.rs_scope ) { - case LDAP_SCOPE_BASE: + switch ( op.ors_scope ) { case LDAP_X_SCOPE_EXACT: *sasldn = op.o_req_ndn; BER_BVZERO( &op.o_req_ndn ); @@ -1189,14 +1963,14 @@ void slap_sasl2dn( Operation *opx, case LDAP_X_SCOPE_CHILDREN: case LDAP_X_SCOPE_ONELEVEL: case LDAP_X_SCOPE_GROUP: + case LDAP_X_SCOPE_USERS: /* correctly parsed, but illegal */ goto FINISHED; + case LDAP_SCOPE_BASE: case LDAP_SCOPE_ONELEVEL: case LDAP_SCOPE_SUBTREE: -#ifdef LDAP_SCOPE_SUBORDINATE case LDAP_SCOPE_SUBORDINATE: -#endif /* do a search */ break; @@ -1205,41 +1979,38 @@ void slap_sasl2dn( Operation *opx, assert( 0 ); } -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, DETAIL1, - "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n", - op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n", - op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 ); -#endif + op.o_req_ndn.bv_val, op.ors_scope, 0 ); - if(( op.o_bd == NULL ) || ( op.o_bd->be_search == NULL)) { + if ( ( op.o_bd == NULL ) || ( op.o_bd->be_search == NULL) ) { + goto FINISHED; + } + + /* Must run an internal search. */ + if ( op.ors_filter == NULL ) { + rc = LDAP_FILTER_ERROR; goto FINISHED; } - op.o_conn = opx->o_conn; - op.o_connid = opx->o_connid; + op.o_hdr = opx->o_hdr; op.o_tag = LDAP_REQ_SEARCH; - op.o_protocol = LDAP_VERSION3; op.o_ndn = opx->o_conn->c_ndn; op.o_callback = &cb; - op.o_time = slap_get_time(); + slap_op_time( &op.o_time, &op.o_tincr ); op.o_do_not_cache = 1; op.o_is_auth_check = 1; - op.o_threadctx = opx->o_threadctx; - op.o_tmpmemctx = opx->o_tmpmemctx; - op.o_tmpmfuncs = opx->o_tmpmfuncs; -#ifdef LDAP_SLAPI - op.o_pb = opx->o_pb; -#endif - op.oq_search.rs_deref = LDAP_DEREF_NEVER; - op.oq_search.rs_slimit = 1; - op.oq_search.rs_tlimit = -1; - op.oq_search.rs_attrsonly = 1; + op.ors_deref = LDAP_DEREF_NEVER; + op.ors_slimit = 1; + op.ors_tlimit = SLAP_NO_LIMIT; + op.ors_attrs = slap_anlist_no_attrs; + op.ors_attrsonly = 1; /* use req_ndn as req_dn instead of non-pretty base of uri */ - if( !BER_BVISNULL( &op.o_req_dn ) ) ch_free( op.o_req_dn.bv_val ); + if( !BER_BVISNULL( &base ) ) { + ch_free( base.bv_val ); + /* just in case... */ + BER_BVZERO( &base ); + } ber_dupbv_x( &op.o_req_dn, &op.o_req_ndn, op.o_tmpmemctx ); op.o_bd->be_search( &op, &rs ); @@ -1248,19 +2019,21 @@ FINISHED: if( !BER_BVISEMPTY( sasldn ) ) { opx->o_conn->c_authz_backend = op.o_bd; } - if( !BER_BVISNULL( &op.o_req_dn ) ) slap_sl_free( op.o_req_dn.bv_val, opx->o_tmpmemctx ); - if( !BER_BVISNULL( &op.o_req_ndn ) ) slap_sl_free( op.o_req_ndn.bv_val, opx->o_tmpmemctx ); - if( op.oq_search.rs_filter ) filter_free_x( opx, op.oq_search.rs_filter ); - if( !BER_BVISNULL( &op.ors_filterstr ) ) ch_free( op.ors_filterstr.bv_val ); + if( !BER_BVISNULL( &op.o_req_dn ) ) { + slap_sl_free( op.o_req_dn.bv_val, opx->o_tmpmemctx ); + } + if( !BER_BVISNULL( &op.o_req_ndn ) ) { + slap_sl_free( op.o_req_ndn.bv_val, opx->o_tmpmemctx ); + } + if( op.ors_filter ) { + filter_free_x( opx, op.ors_filter ); + } + if( !BER_BVISNULL( &op.ors_filterstr ) ) { + ch_free( op.ors_filterstr.bv_val ); + } -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl2dn: Converted SASL name to %s\n", - !BER_BVISEMPTY( sasldn ) ? sasldn->bv_val : "", 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "<==slap_sasl2dn: Converted SASL name to %s\n", !BER_BVISEMPTY( sasldn ) ? sasldn->bv_val : "", 0, 0 ); -#endif return; } @@ -1281,15 +2054,10 @@ int slap_sasl_authorized( Operation *op, goto DONE; } -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_authorized: can %s become %s?\n", - authcDN->bv_val, authzDN->bv_val, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "==>slap_sasl_authorized: can %s become %s?\n", - authcDN->bv_val, authzDN->bv_val, 0 ); -#endif + authcDN->bv_len ? authcDN->bv_val : "(null)", + authzDN->bv_len ? authzDN->bv_val : "(null)", 0 ); /* If person is authorizing to self, succeed */ if ( dn_match( authcDN, authzDN ) ) { @@ -1327,12 +2095,8 @@ int slap_sasl_authorized( Operation *op, DONE: -#ifdef NEW_LOGGING - LDAP_LOG( TRANSPORT, RESULTS, "slap_sasl_authorized: return %d\n", rc,0,0 ); -#else Debug( LDAP_DEBUG_TRACE, "<== slap_sasl_authorized: return %d\n", rc, 0, 0 ); -#endif return( rc ); }