mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#3846 don't give hashed passwords to SASL, it only wants cleartext.

Browse Source
This commit is contained in:
Howard Chu 2005-07-08 06:02:00 +00:00
parent 4b07f91511
commit 46fab05997
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
servers/slapd/sasl.c
View File

@ -163,6 +163,8 @@ typedef struct lookup_info {
static slap_response sasl_ap_lookup; static slap_response sasl_ap_lookup;
static struct berval sc_cleartext = BER_BVC("{CLEARTEXT}");
static int static int
sasl_ap_lookup( Operation *op, SlapReply *rs ) sasl_ap_lookup( Operation *op, SlapReply *rs )
{ {
@ -210,6 +212,34 @@ sasl_ap_lookup( Operation *op, SlapReply *rs )
sl->list[i].name ); sl->list[i].name );
} }
for ( bv = a->a_vals; bv->bv_val; bv++ ) { for ( bv = a->a_vals; bv->bv_val; bv++ ) {
/* ITS#3846 don't give hashed passwords to SASL */
if ( ad == slap_schema.si_ad_userPassword &&
bv->bv_val[0] == '{' ) {
rc = lutil_passwd_scheme( bv->bv_val );
if ( rc ) {
/* If it's not a recognized scheme, just assume it's
* a cleartext password that happened to include brackets.
*
* If it's a recognized scheme, skip this value, unless the
* scheme is {CLEARTEXT}. In that case, skip over the
* scheme name and use the remainder. If there is nothing
* past the scheme name, skip this value.
*/
#ifdef SLAPD_CLEARTEXT
if ( !strncasecmp( bv->bv_val, sc_cleartext.bv_val,
sc_cleartext.bv_len )) {
struct berval cbv;
cbv.bv_len = bv->bv_len - sc_cleartext.bv_len;
if ( cbv.bv_len ) {
cbv.bv_val = bv->bv_val + sc_cleartext.bv_len;
sl->sparams->utils->prop_set( sl->sparams->propctx,
sl->list[i].name, cbv.bv_val, cbv.bv_len );
}
}
#endif
continue;
}
}
sl->sparams->utils->prop_set( sl->sparams->propctx, sl->sparams->utils->prop_set( sl->sparams->propctx,
sl->list[i].name, bv->bv_val, bv->bv_len ); sl->list[i].name, bv->bv_val, bv->bv_len );
} }