*/
#include "includes.h"
+#include "tldap.h"
+#include "tldap_util.h"
+#include "../libcli/security/security.h"
+#include "../lib/util/asn1.h"
bool tldap_entry_values(struct tldap_message *msg, const char *attribute,
- int *num_values, DATA_BLOB **values)
+ DATA_BLOB **values, int *num_values)
{
struct tldap_attribute *attributes;
int i, num_attributes;
- if (!tldap_entry_attributes(msg, &num_attributes, &attributes)) {
+ if (!tldap_entry_attributes(msg, &attributes, &num_attributes)) {
return false;
}
if (attribute == NULL) {
return NULL;
}
- if (!tldap_entry_values(msg, attribute, &num_values, &values)) {
+ if (!tldap_entry_values(msg, attribute, &values, &num_values)) {
return NULL;
}
if (num_values != 1) {
size_t len;
if (!tldap_get_single_valueblob(msg, attribute, &val)) {
- return false;
+ return NULL;
}
if (!convert_string_talloc(mem_ctx, CH_UTF8, CH_UNIX,
val.data, val.length,
- &result, &len, false)) {
+ &result, &len)) {
return NULL;
}
return result;
struct dom_sid *sid)
{
DATA_BLOB val;
+ struct sid_parse_ret ret;
+
+ if (!tldap_get_single_valueblob(msg, attribute, &val)) {
+ return false;
+ }
+ ret = sid_parse(val.data, val.length, sid);
+ return (ret.len != -1);
+}
+
+bool tldap_pull_guid(struct tldap_message *msg, const char *attribute,
+ struct GUID *guid)
+{
+ DATA_BLOB val;
if (!tldap_get_single_valueblob(msg, attribute, &val)) {
return false;
}
- return sid_parse((char *)val.data, val.length, sid);
+ return NT_STATUS_IS_OK(GUID_from_data_blob(&val, guid));
}
static bool tldap_add_blob_vals(TALLOC_CTX *mem_ctx, struct tldap_mod *mod,
- int num_newvals, DATA_BLOB *newvals)
+ DATA_BLOB *newvals, int num_newvals)
{
int num_values = talloc_array_length(mod->values);
int i;
return true;
}
-bool tldap_add_mod_blobs(TALLOC_CTX *mem_ctx, struct tldap_mod **pmods,
+bool tldap_add_mod_blobs(TALLOC_CTX *mem_ctx,
+ struct tldap_mod **pmods, int *pnum_mods,
int mod_op, const char *attrib,
- int num_newvals, DATA_BLOB *newvals)
+ DATA_BLOB *newvals, int num_newvals)
{
struct tldap_mod new_mod;
struct tldap_mod *mods = *pmods;
return false;
}
- num_mods = talloc_array_length(mods);
+ num_mods = *pnum_mods;
for (i=0; i<num_mods; i++) {
if ((mods[i].mod_op == mod_op)
}
if ((num_newvals != 0)
- && !tldap_add_blob_vals(mods, mod, num_newvals, newvals)) {
+ && !tldap_add_blob_vals(mods, mod, newvals, num_newvals)) {
return false;
}
- if (i == num_mods) {
+ if ((i == num_mods) && (talloc_array_length(mods) < num_mods + 1)) {
mods = talloc_realloc(talloc_tos(), mods, struct tldap_mod,
num_mods+1);
if (mods == NULL) {
}
*pmods = mods;
+ *pnum_mods += 1;
return true;
}
-bool tldap_add_mod_str(TALLOC_CTX *mem_ctx, struct tldap_mod **pmods,
+bool tldap_add_mod_str(TALLOC_CTX *mem_ctx,
+ struct tldap_mod **pmods, int *pnum_mods,
int mod_op, const char *attrib, const char *str)
{
DATA_BLOB utf8;
bool ret;
if (!convert_string_talloc(talloc_tos(), CH_UNIX, CH_UTF8, str,
- strlen(str), &utf8.data, &utf8.length,
- false)) {
+ strlen(str), &utf8.data, &utf8.length)) {
return false;
}
- ret = tldap_add_mod_blobs(mem_ctx, pmods, mod_op, attrib, 1, &utf8);
+ ret = tldap_add_mod_blobs(mem_ctx, pmods, pnum_mods, mod_op, attrib,
+ &utf8, 1);
TALLOC_FREE(utf8.data);
return ret;
}
static bool tldap_make_mod_blob_int(struct tldap_message *existing,
TALLOC_CTX *mem_ctx,
- int *pnum_mods, struct tldap_mod **pmods,
+ struct tldap_mod **pmods, int *pnum_mods,
const char *attrib, DATA_BLOB newval,
int (*comparison)(const DATA_BLOB *d1,
const DATA_BLOB *d2))
DATA_BLOB oldval = data_blob_null;
if ((existing != NULL)
- && tldap_entry_values(existing, attrib, &num_values, &values)) {
+ && tldap_entry_values(existing, attrib, &values, &num_values)) {
if (num_values > 1) {
/* can't change multivalue attributes atm */
/* Believe it or not, but LDAP will deny a delete and
an add at the same time if the values are the
same... */
- DEBUG(10,("smbldap_make_mod_blob: attribute |%s| not "
+ DEBUG(10,("tldap_make_mod_blob_int: attribute |%s| not "
"changed.\n", attrib));
return true;
}
* Novell NDS. In NDS you have to first remove attribute and
* then you could add new value */
- DEBUG(10, ("smbldap_make_mod_blob: deleting attribute |%s|\n",
+ DEBUG(10, ("tldap_make_mod_blob_int: deleting attribute |%s|\n",
attrib));
- if (!tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_DELETE,
- attrib, 1, &oldval)) {
+ if (!tldap_add_mod_blobs(mem_ctx, pmods, pnum_mods,
+ TLDAP_MOD_DELETE,
+ attrib, &oldval, 1)) {
return false;
}
}
the old value, should it exist. */
if (newval.data != NULL) {
- DEBUG(10, ("smbldap_make_mod: adding attribute |%s| value len "
+ DEBUG(10, ("tldap_make_mod_blob_int: adding attribute |%s| value len "
"%d\n", attrib, (int)newval.length));
- if (!tldap_add_mod_blobs(mem_ctx, pmods, TLDAP_MOD_ADD,
- attrib, 1, &newval)) {
+ if (!tldap_add_mod_blobs(mem_ctx, pmods, pnum_mods,
+ TLDAP_MOD_ADD,
+ attrib, &newval, 1)) {
return false;
}
}
- *pnum_mods = talloc_array_length(*pmods);
return true;
}
bool tldap_make_mod_blob(struct tldap_message *existing, TALLOC_CTX *mem_ctx,
- int *pnum_mods, struct tldap_mod **pmods,
+ struct tldap_mod **pmods, int *pnum_mods,
const char *attrib, DATA_BLOB newval)
{
- return tldap_make_mod_blob_int(existing, mem_ctx, pnum_mods, pmods,
+ return tldap_make_mod_blob_int(existing, mem_ctx, pmods, pnum_mods,
attrib, newval, data_blob_cmp);
}
int ret;
if (!convert_string_talloc(talloc_tos(), CH_UTF8, CH_UNIX, d1->data,
- d1->length, &s1, &s1len, false)) {
+ d1->length, &s1, &s1len)) {
/* can't do much here */
return 0;
}
if (!convert_string_talloc(talloc_tos(), CH_UTF8, CH_UNIX, d2->data,
- d2->length, &s2, &s2len, false)) {
+ d2->length, &s2, &s2len)) {
/* can't do much here */
TALLOC_FREE(s1);
return 0;
}
- ret = StrCaseCmp(s1, s2);
+ ret = strcasecmp_m(s1, s2);
TALLOC_FREE(s2);
TALLOC_FREE(s1);
return ret;
}
bool tldap_make_mod_fmt(struct tldap_message *existing, TALLOC_CTX *mem_ctx,
- int *pnum_mods, struct tldap_mod **pmods,
+ struct tldap_mod **pmods, int *pnum_mods,
const char *attrib, const char *fmt, ...)
{
va_list ap;
blob.length = strlen(newval);
if (blob.length != 0) {
- blob.data = CONST_DISCARD(uint8_t *, newval);
+ blob.data = discard_const_p(uint8_t, newval);
}
- ret = tldap_make_mod_blob_int(existing, mem_ctx, pnum_mods, pmods,
+ ret = tldap_make_mod_blob_int(existing, mem_ctx, pmods, pnum_mods,
attrib, blob, compare_utf8_blobs);
TALLOC_FREE(newval);
return ret;
}
-const char *tldap_errstr(TALLOC_CTX *mem_ctx, struct tldap_context *ld, int rc)
+const char *tldap_errstr(TALLOC_CTX *mem_ctx, struct tldap_context *ld,
+ TLDAPRC rc)
{
const char *ld_error = NULL;
char *res;
- ld_error = tldap_msg_diagnosticmessage(tldap_ctx_lastmsg(ld));
- res = talloc_asprintf(mem_ctx, "LDAP error %d (%s), %s", rc,
- tldap_err2string(rc),
+ if (ld != NULL) {
+ ld_error = tldap_msg_diagnosticmessage(tldap_ctx_lastmsg(ld));
+ }
+ res = talloc_asprintf(mem_ctx, "LDAP error %d (%s), %s",
+ (int)TLDAP_RC_V(rc), tldap_rc2string(rc),
ld_error ? ld_error : "unknown");
return res;
}
-int tldap_search_fmt(struct tldap_context *ld, const char *base, int scope,
- const char *attrs[], int num_attrs, int attrsonly,
- TALLOC_CTX *mem_ctx, struct tldap_message ***res,
- const char *fmt, ...)
+TLDAPRC tldap_search_va(struct tldap_context *ld, const char *base, int scope,
+ const char *attrs[], int num_attrs, int attrsonly,
+ TALLOC_CTX *mem_ctx, struct tldap_message ***res,
+ const char *fmt, va_list ap)
{
- va_list ap;
char *filter;
- int ret;
+ TLDAPRC rc;
- va_start(ap, fmt);
filter = talloc_vasprintf(talloc_tos(), fmt, ap);
- va_end(ap);
-
if (filter == NULL) {
return TLDAP_NO_MEMORY;
}
- ret = tldap_search(ld, base, scope, filter,
- attrs, num_attrs, attrsonly,
- NULL /*sctrls*/, 0, NULL /*cctrls*/, 0,
- 0 /*timelimit*/, 0 /*sizelimit*/, 0 /*deref*/,
- mem_ctx, res, NULL);
+
+ rc = tldap_search(ld, base, scope, filter,
+ attrs, num_attrs, attrsonly,
+ NULL /*sctrls*/, 0, NULL /*cctrls*/, 0,
+ 0 /*timelimit*/, 0 /*sizelimit*/, 0 /*deref*/,
+ mem_ctx, res);
TALLOC_FREE(filter);
- return ret;
+ return rc;
+}
+
+TLDAPRC tldap_search_fmt(struct tldap_context *ld, const char *base, int scope,
+ const char *attrs[], int num_attrs, int attrsonly,
+ TALLOC_CTX *mem_ctx, struct tldap_message ***res,
+ const char *fmt, ...)
+{
+ va_list ap;
+ TLDAPRC rc;
+
+ va_start(ap, fmt);
+ rc = tldap_search_va(ld, base, scope, attrs, num_attrs, attrsonly,
+ mem_ctx, res, fmt, ap);
+ va_end(ap);
+ return rc;
}
bool tldap_pull_uint64(struct tldap_message *msg, const char *attr,
{
char *str;
uint64_t result;
+ int error = 0;
str = tldap_talloc_single_attribute(msg, attr, talloc_tos());
if (str == NULL) {
DEBUG(10, ("Could not find attribute %s\n", attr));
return false;
}
- result = strtoull(str, NULL, 10);
+
+ result = strtoull_err(str, NULL, 10, &error);
+ if (error != 0) {
+ DBG_DEBUG("Attribute conversion failed (%s)\n",
+ strerror(error));
+ TALLOC_FREE(str);
+ return false;
+ }
+
TALLOC_FREE(str);
*presult = result;
return true;
struct tldap_fetch_rootdse_state *state = tevent_req_data(
req, struct tldap_fetch_rootdse_state);
struct tldap_message *msg;
- int rc;
+ TLDAPRC rc;
rc = tldap_search_recv(subreq, state, &msg);
- if (rc != TLDAP_SUCCESS) {
- TALLOC_FREE(subreq);
- tevent_req_error(req, rc);
+ if (tevent_req_ldap_error(req, rc)) {
return;
}
default:
goto protocol_error;
}
- tevent_req_done(req);
return;
protocol_error:
- tevent_req_error(req, TLDAP_PROTOCOL_ERROR);
+ tevent_req_ldap_error(req, TLDAP_PROTOCOL_ERROR);
return;
}
-int tldap_fetch_rootdse_recv(struct tevent_req *req)
+TLDAPRC tldap_fetch_rootdse_recv(struct tevent_req *req)
{
struct tldap_fetch_rootdse_state *state = tevent_req_data(
req, struct tldap_fetch_rootdse_state);
- int err;
+ TLDAPRC rc;
char *dn;
- if (tevent_req_is_ldap_error(req, &err)) {
- return err;
+ if (tevent_req_is_ldap_error(req, &rc)) {
+ return rc;
}
/* Trigger parsing the dn, just to make sure it's ok */
if (!tldap_entry_dn(state->rootdse, &dn)) {
&state->rootdse)) {
return TLDAP_NO_MEMORY;
}
- return 0;
+ return TLDAP_SUCCESS;
}
-int tldap_fetch_rootdse(struct tldap_context *ld)
+TLDAPRC tldap_fetch_rootdse(struct tldap_context *ld)
{
TALLOC_CTX *frame = talloc_stackframe();
struct tevent_context *ev;
struct tevent_req *req;
- int result;
+ TLDAPRC rc = TLDAP_NO_MEMORY;
- ev = event_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
- result = TLDAP_NO_MEMORY;
goto fail;
}
-
req = tldap_fetch_rootdse_send(frame, ev, ld);
if (req == NULL) {
- result = TLDAP_NO_MEMORY;
goto fail;
}
-
if (!tevent_req_poll(req, ev)) {
- result = TLDAP_OPERATIONS_ERROR;
+ rc = TLDAP_OPERATIONS_ERROR;
goto fail;
}
- result = tldap_fetch_rootdse_recv(req);
+ rc = tldap_fetch_rootdse_recv(req);
fail:
TALLOC_FREE(frame);
- return result;
+ return rc;
}
struct tldap_message *tldap_rootdse(struct tldap_context *ld)
int i, num_values;
DATA_BLOB *values;
- if (!tldap_entry_values(msg, attribute, &num_values, &values)) {
+ if (!tldap_entry_values(msg, attribute, &values, &num_values)) {
return false;
}
for (i=0; i<num_values; i++) {
return tldap_entry_has_attrvalue(rootdse, "supportedControl",
data_blob_const(oid, strlen(oid)));
}
+
+struct tldap_control *tldap_add_control(TALLOC_CTX *mem_ctx,
+ struct tldap_control *ctrls,
+ int num_ctrls,
+ struct tldap_control *ctrl)
+{
+ struct tldap_control *result;
+
+ result = talloc_array(mem_ctx, struct tldap_control, num_ctrls+1);
+ if (result == NULL) {
+ return NULL;
+ }
+ memcpy(result, ctrls, sizeof(struct tldap_control) * num_ctrls);
+ result[num_ctrls] = *ctrl;
+ return result;
+}
+
+/*
+ * Find a control returned by the server
+ */
+struct tldap_control *tldap_msg_findcontrol(struct tldap_message *msg,
+ const char *oid)
+{
+ struct tldap_control *controls;
+ int i, num_controls;
+
+ tldap_msg_sctrls(msg, &num_controls, &controls);
+
+ for (i=0; i<num_controls; i++) {
+ if (strcmp(controls[i].oid, oid) == 0) {
+ return &controls[i];
+ }
+ }
+ return NULL;
+}
+
+struct tldap_search_paged_state {
+ struct tevent_context *ev;
+ struct tldap_context *ld;
+ const char *base;
+ const char *filter;
+ int scope;
+ const char **attrs;
+ int num_attrs;
+ int attrsonly;
+ struct tldap_control *sctrls;
+ int num_sctrls;
+ struct tldap_control *cctrls;
+ int num_cctrls;
+ int timelimit;
+ int sizelimit;
+ int deref;
+
+ int page_size;
+ struct asn1_data *asn1;
+ DATA_BLOB cookie;
+ struct tldap_message *result;
+};
+
+static struct tevent_req *tldap_ship_paged_search(
+ TALLOC_CTX *mem_ctx,
+ struct tldap_search_paged_state *state)
+{
+ struct tldap_control *pgctrl;
+ struct asn1_data *asn1 = NULL;
+
+ asn1 = asn1_init(state);
+ if (asn1 == NULL) {
+ return NULL;
+ }
+ if (!asn1_push_tag(asn1, ASN1_SEQUENCE(0))) goto err;
+ if (!asn1_write_Integer(asn1, state->page_size)) goto err;
+ if (!asn1_write_OctetString(asn1, state->cookie.data, state->cookie.length)) goto err;
+ if (!asn1_pop_tag(asn1)) goto err;
+ state->asn1 = asn1;
+
+ pgctrl = &state->sctrls[state->num_sctrls-1];
+ pgctrl->oid = TLDAP_CONTROL_PAGEDRESULTS;
+ pgctrl->critical = true;
+ if (!asn1_blob(state->asn1, &pgctrl->value)) {
+ goto err;
+ }
+ return tldap_search_send(mem_ctx, state->ev, state->ld, state->base,
+ state->scope, state->filter, state->attrs,
+ state->num_attrs, state->attrsonly,
+ state->sctrls, state->num_sctrls,
+ state->cctrls, state->num_cctrls,
+ state->timelimit, state->sizelimit,
+ state->deref);
+
+ err:
+
+ TALLOC_FREE(asn1);
+ return NULL;
+}
+
+static void tldap_search_paged_done(struct tevent_req *subreq);
+
+struct tevent_req *tldap_search_paged_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct tldap_context *ld,
+ const char *base, int scope,
+ const char *filter,
+ const char **attrs,
+ int num_attrs,
+ int attrsonly,
+ struct tldap_control *sctrls,
+ int num_sctrls,
+ struct tldap_control *cctrls,
+ int num_cctrls,
+ int timelimit,
+ int sizelimit,
+ int deref,
+ int page_size)
+{
+ struct tevent_req *req, *subreq;
+ struct tldap_search_paged_state *state;
+ struct tldap_control empty_control;
+
+ req = tevent_req_create(mem_ctx, &state,
+ struct tldap_search_paged_state);
+ if (req == NULL) {
+ return NULL;
+ }
+ state->ev = ev;
+ state->ld = ld;
+ state->base = base;
+ state->filter = filter;
+ state->scope = scope;
+ state->attrs = attrs;
+ state->num_attrs = num_attrs;
+ state->attrsonly = attrsonly;
+ state->cctrls = cctrls;
+ state->num_cctrls = num_cctrls;
+ state->timelimit = timelimit;
+ state->sizelimit = sizelimit;
+ state->deref = deref;
+
+ state->page_size = page_size;
+ state->asn1 = NULL;
+ state->cookie = data_blob_null;
+
+ ZERO_STRUCT(empty_control);
+
+ state->sctrls = tldap_add_control(state, sctrls, num_sctrls,
+ &empty_control);
+ if (tevent_req_nomem(state->sctrls, req)) {
+ return tevent_req_post(req, ev);
+ }
+ state->num_sctrls = num_sctrls+1;
+
+ subreq = tldap_ship_paged_search(state, state);
+ if (tevent_req_nomem(subreq, req)) {
+ return tevent_req_post(req, ev);
+ }
+ tevent_req_set_callback(subreq, tldap_search_paged_done, req);
+
+ return req;
+}
+
+static void tldap_search_paged_done(struct tevent_req *subreq)
+{
+ struct tevent_req *req = tevent_req_callback_data(
+ subreq, struct tevent_req);
+ struct tldap_search_paged_state *state = tevent_req_data(
+ req, struct tldap_search_paged_state);
+ struct asn1_data *asn1 = NULL;
+ struct tldap_control *pgctrl;
+ TLDAPRC rc;
+ int size;
+
+ rc = tldap_search_recv(subreq, state, &state->result);
+ if (tevent_req_ldap_error(req, rc)) {
+ return;
+ }
+
+ TALLOC_FREE(state->asn1);
+
+ switch (tldap_msg_type(state->result)) {
+ case TLDAP_RES_SEARCH_ENTRY:
+ case TLDAP_RES_SEARCH_REFERENCE:
+ tevent_req_notify_callback(req);
+ return;
+ case TLDAP_RES_SEARCH_RESULT:
+ break;
+ default:
+ TALLOC_FREE(subreq);
+ tevent_req_ldap_error(req, TLDAP_PROTOCOL_ERROR);
+ return;
+ }
+
+ TALLOC_FREE(subreq);
+
+ /* We've finished one paged search, fire the next */
+
+ pgctrl = tldap_msg_findcontrol(state->result,
+ TLDAP_CONTROL_PAGEDRESULTS);
+ if (pgctrl == NULL) {
+ /* RFC2696 requires the server to return the control */
+ tevent_req_ldap_error(req, TLDAP_PROTOCOL_ERROR);
+ return;
+ }
+
+ TALLOC_FREE(state->cookie.data);
+
+ asn1 = asn1_init(talloc_tos());
+ if (tevent_req_nomem(asn1, req)) {
+ return;
+ }
+
+ asn1_load_nocopy(asn1, pgctrl->value.data, pgctrl->value.length);
+ if (!asn1_start_tag(asn1, ASN1_SEQUENCE(0))) goto err;
+ if (!asn1_read_Integer(asn1, &size)) goto err;
+ if (!asn1_read_OctetString(asn1, state, &state->cookie)) goto err;
+ if (!asn1_end_tag(asn1)) goto err;
+
+ TALLOC_FREE(asn1);
+
+ if (state->cookie.length == 0) {
+ /* We're done, no cookie anymore */
+ tevent_req_done(req);
+ return;
+ }
+
+ TALLOC_FREE(state->result);
+
+ subreq = tldap_ship_paged_search(state, state);
+ if (tevent_req_nomem(subreq, req)) {
+ return;
+ }
+ tevent_req_set_callback(subreq, tldap_search_paged_done, req);
+
+ err:
+
+ TALLOC_FREE(asn1);
+ tevent_req_ldap_error(req, TLDAP_DECODING_ERROR);
+}
+
+TLDAPRC tldap_search_paged_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+ struct tldap_message **pmsg)
+{
+ struct tldap_search_paged_state *state = tevent_req_data(
+ req, struct tldap_search_paged_state);
+ TLDAPRC rc;
+
+ if (!tevent_req_is_in_progress(req)
+ && tevent_req_is_ldap_error(req, &rc)) {
+ return rc;
+ }
+ if (tevent_req_is_in_progress(req)) {
+ switch (tldap_msg_type(state->result)) {
+ case TLDAP_RES_SEARCH_ENTRY:
+ case TLDAP_RES_SEARCH_REFERENCE:
+ break;
+ default:
+ return TLDAP_PROTOCOL_ERROR;
+ }
+ }
+ *pmsg = talloc_move(mem_ctx, &state->result);
+ return TLDAP_SUCCESS;
+}
git.samba.org / samba.git / blobdiff