oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Use ldap_bv2escaped_filter_value to filter the search query. Idea from Michael Ströder.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23955 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-10-26 18:20:23 +00:00
parent 78e0a41bcb
commit 18e483856b
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/hdb/hdb-ldap.c
View File

@@ -794,34 +794,34 @@ LDAP__lookup_princ(krb5_context context,
const char *userid, const char *userid,
LDAPMessage **msg) LDAPMessage **msg)
{ {
struct berval princnamebv, quotedp;
krb5_error_code ret; krb5_error_code ret;
int rc; int rc;
char *filter = NULL; char *filter = NULL;
size_t len;
/*
* Filter out searches for *@REALM, which takes very long time,
* and other ldap special characters, this should really be
* quoting instead.
*/
len = strcspn(princname, "()*=&\\|~=<>!");
if (princname[len] != '\0') {
krb5_set_error_message(context, HDB_ERR_NOENTRY,
"Principal contains ldap "
"search term: %s", princname);
return HDB_ERR_NOENTRY;
}
ret = LDAP__connect(context, db); ret = LDAP__connect(context, db);
if (ret) if (ret)
return ret; return ret;
/*
* Quote searches that contain filter language, this quote
* searches for *@REALM, which takes very long time.
*/
ber_str2bv(princname, 0, 0, &princnamebv);
if (ldap_bv2escaped_filter_value(&princnamebv, &quotedp) != 0) {
ret = ENOMEM;
krb5_set_error_message(context, ret, "malloc: out of memory");
goto out;
}
rc = asprintf(&filter, rc = asprintf(&filter,
"(&(objectClass=krb5Principal)(krb5PrincipalName=%s))", "(&(objectClass=krb5Principal)(krb5PrincipalName=%s))",
princname); quotedp.bv_val);
ber_memfree(quotedp.bv_val);
if (rc < 0) { if (rc < 0) {
ret = ENOMEM; ret = ENOMEM;
krb5_set_error_message(context, ret, "asprintf: out of memory"); krb5_set_error_message(context, ret, "malloc: out of memory");
goto out; goto out;
} }
@@ -1198,8 +1198,8 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
if (ent->entry.pw_end == NULL) { if (ent->entry.pw_end == NULL) {
ent->entry.pw_end = malloc(sizeof(*ent->entry.pw_end)); ent->entry.pw_end = malloc(sizeof(*ent->entry.pw_end));
if (ent->entry.pw_end == NULL) { if (ent->entry.pw_end == NULL) {
krb5_set_error_string(context, "malloc: out of memory");
ret = ENOMEM; ret = ENOMEM;
krb5_set_error_message(context, ret, "malloc: out of memory");
goto out; goto out;
} }
} }