#include "auth/auth.h"
#include "libcli/ldap/ldap.h"
#include "smbd/service_stream.h"
+#include "lib/ldb/include/ldb.h"
+#include "lib/ldb/include/ldb_errors.h"
#include "dsdb/samdb/samdb.h"
static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call)
req->creds.password, &session_info);
}
- /* When we add authentication here, we also need to handle telling the backends */
-
reply = ldapsrv_init_reply(call, LDAP_TAG_BindResponse);
if (!reply) {
return NT_STATUS_NO_MEMORY;
}
if (NT_STATUS_IS_OK(status)) {
- struct ldapsrv_partition *part;
result = LDAP_SUCCESS;
errstr = NULL;
talloc_free(call->conn->session_info);
call->conn->session_info = session_info;
- for (part = call->conn->partitions; part; part = part->next) {
- if (!part->ops->Bind) {
- continue;
- }
- status = part->ops->Bind(part, call->conn);
- if (!NT_STATUS_IS_OK(status)) {
- result = LDAP_OPERATIONS_ERROR;
- errstr = talloc_asprintf(reply, "Simple Bind: Failed to advise partition %s of new credentials: %s", part->base_dn, nt_errstr(status));
- }
+
+ /* don't leak the old LDB */
+ talloc_free(call->conn->ldb);
+
+ status = ldapsrv_backend_Init(call->conn);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ result = LDAP_OPERATIONS_ERROR;
+ errstr = talloc_asprintf(reply, "Simple Bind: Failed to advise ldb new credentials: %s", nt_errstr(status));
}
} else {
status = auth_nt_status_squash(status);
resp->response.errormessage = errstr;
resp->response.dn = NULL;
resp->response.referral = NULL;
-
- /* This looks wrong... */
- resp->SASL.secblob = data_blob(NULL, 0);
+ resp->SASL.secblob = NULL;
ldapsrv_queue_reply(call, reply);
return NT_STATUS_OK;
struct ldapsrv_reply *reply;
struct ldap_BindResponse *resp;
struct ldapsrv_connection *conn;
- int result;
+ int result = 0;
const char *errstr;
NTSTATUS status = NT_STATUS_OK;
DEBUG(10, ("BindSASL dn: %s\n",req->dn));
- if (!call->conn->gensec) {
- struct cli_credentials *server_credentials;
- call->conn->session_info = NULL;
-
- status = gensec_server_start(call->conn, &call->conn->gensec,
- call->conn->connection->event.ctx);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start GENSEC server code: %s\n", nt_errstr(status)));
- return status;
- }
-
- gensec_set_target_service(call->conn->gensec, "ldap");
-
- gensec_set_credentials(call->conn->gensec, call->conn->server_credentials);
-
- gensec_want_feature(call->conn->gensec, GENSEC_FEATURE_SIGN);
- gensec_want_feature(call->conn->gensec, GENSEC_FEATURE_SEAL);
- gensec_want_feature(call->conn->gensec, GENSEC_FEATURE_ASYNC_REPLIES);
-
- status = gensec_start_mech_by_sasl_name(call->conn->gensec, req->creds.SASL.mechanism);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to start GENSEC SASL[%s] server code: %s\n",
- req->creds.SASL.mechanism, nt_errstr(status)));
- }
- }
-
reply = ldapsrv_init_reply(call, LDAP_TAG_BindResponse);
if (!reply) {
return NT_STATUS_NO_MEMORY;
conn = call->conn;
+ if (!conn->gensec) {
+ conn->session_info = NULL;
+
+ status = gensec_server_start(conn, &conn->gensec,
+ conn->connection->event.ctx);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to start GENSEC server code: %s\n", nt_errstr(status)));
+ result = LDAP_OPERATIONS_ERROR;
+ errstr = talloc_asprintf(reply, "SASL: Failed to start authentication system: %s",
+ nt_errstr(status));
+ } else {
+
+ gensec_set_target_service(conn->gensec, "ldap");
+
+ gensec_set_credentials(conn->gensec, conn->server_credentials);
+
+ gensec_want_feature(conn->gensec, GENSEC_FEATURE_SIGN);
+ gensec_want_feature(conn->gensec, GENSEC_FEATURE_SEAL);
+ gensec_want_feature(conn->gensec, GENSEC_FEATURE_ASYNC_REPLIES);
+
+ status = gensec_start_mech_by_sasl_name(conn->gensec, req->creds.SASL.mechanism);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("Failed to start GENSEC SASL[%s] server code: %s\n",
+ req->creds.SASL.mechanism, nt_errstr(status)));
+ result = LDAP_OPERATIONS_ERROR;
+ errstr = talloc_asprintf(reply, "SASL:[%s]: Failed to start authentication backend: %s",
+ req->creds.SASL.mechanism, nt_errstr(status));
+ }
+ }
+ }
+
if (NT_STATUS_IS_OK(status)) {
- status = gensec_update(call->conn->gensec, reply,
- req->creds.SASL.secblob, &resp->SASL.secblob);
+ DATA_BLOB input = data_blob(NULL, 0);
+ DATA_BLOB output = data_blob(NULL, 0);
+
+ if (req->creds.SASL.secblob) {
+ input = *req->creds.SASL.secblob;
+ }
+
+ resp->SASL.secblob = talloc(reply, DATA_BLOB);
+ NT_STATUS_HAVE_NO_MEMORY(resp->SASL.secblob);
+
+ status = gensec_update(conn->gensec, reply,
+ input, &output);
+
+ /* TODO: gensec should really handle the difference between NULL and length=0 better! */
+ if (output.data) {
+ resp->SASL.secblob = talloc(reply, DATA_BLOB);
+ NT_STATUS_HAVE_NO_MEMORY(resp->SASL.secblob);
+ *resp->SASL.secblob = output;
+ } else {
+ resp->SASL.secblob = NULL;
+ }
+ } else {
+ resp->SASL.secblob = NULL;
}
if (NT_STATUS_EQUAL(NT_STATUS_MORE_PROCESSING_REQUIRED, status)) {
result = LDAP_SASL_BIND_IN_PROGRESS;
errstr = NULL;
} else if (NT_STATUS_IS_OK(status)) {
- struct ldapsrv_partition *part;
struct auth_session_info *old_session_info;
result = LDAP_SUCCESS;
errstr = NULL;
- if (gensec_have_feature(call->conn->gensec, GENSEC_FEATURE_SEAL) ||
- gensec_have_feature(call->conn->gensec, GENSEC_FEATURE_SIGN)) {
- call->conn->enable_wrap = True;
+ if (gensec_have_feature(conn->gensec, GENSEC_FEATURE_SEAL) ||
+ gensec_have_feature(conn->gensec, GENSEC_FEATURE_SIGN)) {
+ conn->enable_wrap = True;
}
- old_session_info = call->conn->session_info;
- call->conn->session_info = NULL;
- status = gensec_session_info(call->conn->gensec, &call->conn->session_info);
+ old_session_info = conn->session_info;
+ conn->session_info = NULL;
+ status = gensec_session_info(conn->gensec, &conn->session_info);
if (!NT_STATUS_IS_OK(status)) {
- call->conn->session_info = old_session_info;
+ conn->session_info = old_session_info;
result = LDAP_OPERATIONS_ERROR;
errstr = talloc_asprintf(reply, "SASL:[%s]: Failed to get session info: %s", req->creds.SASL.mechanism, nt_errstr(status));
} else {
talloc_free(old_session_info);
- for (part = call->conn->partitions; part; part = part->next) {
- if (!part->ops->Bind) {
- continue;
- }
- status = part->ops->Bind(part, conn);
- if (!NT_STATUS_IS_OK(status)) {
- result = LDAP_OPERATIONS_ERROR;
- errstr = talloc_asprintf(reply, "SASL:[%s]: Failed to advise partition %s of new credentials: %s", req->creds.SASL.mechanism, part->base_dn, nt_errstr(status));
- }
+
+ /* don't leak the old LDB */
+ talloc_free(conn->ldb);
+
+ status = ldapsrv_backend_Init(conn);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ result = LDAP_OPERATIONS_ERROR;
+ errstr = talloc_asprintf(reply, "SASL:[%s]: Failed to advise samdb of new credentials: %s", req->creds.SASL.mechanism, nt_errstr(status));
}
}
} else {
status = auth_nt_status_squash(status);
- result = LDAP_INVALID_CREDENTIALS;
- errstr = talloc_asprintf(reply, "SASL:[%s]: %s", req->creds.SASL.mechanism, nt_errstr(status));
+ if (result == 0) {
+ result = LDAP_INVALID_CREDENTIALS;
+ errstr = talloc_asprintf(reply, "SASL:[%s]: %s", req->creds.SASL.mechanism, nt_errstr(status));
+ }
}
resp->response.resultcode = result;
resp->response.dn = NULL;
resp->response.errormessage = talloc_asprintf(reply, "Bad AuthenticationChoice [%d]", req->mechanism);
resp->response.referral = NULL;
- resp->SASL.secblob = data_blob(NULL, 0);
+ resp->SASL.secblob = NULL;
ldapsrv_queue_reply(call, reply);
return NT_STATUS_OK;