SERVER_ALLOCATED_REQUIRED_YES);
}
-bool is_partial_auth_vuid(struct smbd_server_connection *sconn, uint16 vuid)
-{
- return (get_partial_auth_user_struct(sconn, vuid) != NULL);
-}
-
-/****************************************************************************
- Get the user struct of a partial NTLMSSP login
-****************************************************************************/
-
-user_struct *get_partial_auth_user_struct(struct smbd_server_connection *sconn,
- uint16 vuid)
-{
- return get_valid_user_struct_internal(sconn, vuid,
- SERVER_ALLOCATED_REQUIRED_NO);
-}
-
/****************************************************************************
Invalidate a uid.
****************************************************************************/
session_yield(vuser);
- if (vuser->gensec_security) {
- TALLOC_FREE(vuser->gensec_security);
- }
-
DLIST_REMOVE(sconn->users, vuser);
SMB_ASSERT(sconn->num_users > 0);
sconn->num_users--;
void invalidate_all_vuids(struct smbd_server_connection *sconn)
{
- if (sconn->using_smb2) {
- return;
- }
-
while (sconn->users != NULL) {
- invalidate_vuid(sconn, sconn->users->vuid);
- }
-}
-
-static void increment_next_vuid(uint16_t *vuid)
-{
- *vuid += 1;
-
- /* Check for vuid wrap. */
- if (*vuid == UID_FIELD_INVALID) {
- *vuid = VUID_OFFSET;
- }
-}
-
-/****************************************************
- Create a new partial auth user struct.
-*****************************************************/
+ struct smbXsrv_session *session;
-int register_initial_vuid(struct smbd_server_connection *sconn)
-{
- user_struct *vuser;
-
- /* Limit allowed vuids to 16bits - VUID_OFFSET. */
- if (sconn->num_users >= 0xFFFF-VUID_OFFSET) {
- return UID_FIELD_INVALID;
- }
+ session = sconn->users->session;
- if((vuser = talloc_zero(NULL, user_struct)) == NULL) {
- DEBUG(0,("register_initial_vuid: "
- "Failed to talloc users struct!\n"));
- return UID_FIELD_INVALID;
- }
+ invalidate_vuid(sconn, sconn->users->vuid);
- /* Allocate a free vuid. Yes this is a linear search... */
- while( get_valid_user_struct_internal(sconn,
- sconn->smb1.sessions.next_vuid,
- SERVER_ALLOCATED_REQUIRED_ANY) != NULL ) {
- increment_next_vuid(&sconn->smb1.sessions.next_vuid);
+ TALLOC_FREE(session);
}
-
- DEBUG(10,("register_initial_vuid: allocated vuid = %u\n",
- (unsigned int)sconn->smb1.sessions.next_vuid ));
-
- vuser->vuid = sconn->smb1.sessions.next_vuid;
-
- /*
- * This happens in an unfinished NTLMSSP session setup. We
- * need to allocate a vuid between the first and second calls
- * to NTLMSSP.
- */
- increment_next_vuid(&sconn->smb1.sessions.next_vuid);
-
- sconn->num_users++;
- DLIST_ADD(sconn->users, vuser);
-
- return vuser->vuid;
}
int register_homes_share(const char *username)
TALLOC_FREE(pwd);
return result;
}
-
-/**
- * register that a valid login has been performed, establish 'session'.
- * @param session_info The token returned from the authentication process.
- * (now 'owned' by register_existing_vuid)
- *
- * @param session_key The User session key for the login session (now also
- * 'owned' by register_existing_vuid)
- *
- * @param respose_blob The NT challenge-response, if available. (May be
- * freed after this call)
- *
- * @param smb_name The untranslated name of the user
- *
- * @return Newly allocated vuid, biased by an offset. (This allows us to
- * tell random client vuid's (normally zero) from valid vuids.)
- *
- */
-
-int register_existing_vuid(struct smbd_server_connection *sconn,
- uint16 vuid,
- struct auth_session_info *session_info,
- DATA_BLOB response_blob)
-{
- user_struct *vuser;
- bool guest = security_session_user_level(session_info, NULL) < SECURITY_USER;
-
- vuser = get_partial_auth_user_struct(sconn, vuid);
- if (!vuser) {
- goto fail;
- }
-
- /* Use this to keep tabs on all our info from the authentication */
- vuser->session_info = talloc_move(vuser, &session_info);
-
- /* Make clear that we require the optional unix_token and unix_info in the source3 code */
- SMB_ASSERT(vuser->session_info->unix_token);
- SMB_ASSERT(vuser->session_info->unix_info);
-
- DEBUG(10,("register_existing_vuid: (%u,%u) %s %s %s guest=%d\n",
- (unsigned int)vuser->session_info->unix_token->uid,
- (unsigned int)vuser->session_info->unix_token->gid,
- vuser->session_info->unix_info->unix_name,
- vuser->session_info->unix_info->sanitized_username,
- vuser->session_info->info->domain_name,
- guest));
-
- DEBUG(3, ("register_existing_vuid: User name: %s\t"
- "Real name: %s\n", vuser->session_info->unix_info->unix_name,
- vuser->session_info->info->full_name ?
- vuser->session_info->info->full_name : ""));
-
- if (!vuser->session_info->security_token) {
- DEBUG(1, ("register_existing_vuid: session_info does not "
- "contain a user_token - cannot continue\n"));
- goto fail;
- }
-
- /* Make clear that we require the optional unix_token in the source3 code */
- SMB_ASSERT(vuser->session_info->unix_token);
-
- DEBUG(3,("register_existing_vuid: UNIX uid %d is UNIX user %s, "
- "and will be vuid %u\n", (int)vuser->session_info->unix_token->uid,
- vuser->session_info->unix_info->unix_name, vuser->vuid));
-
- if (!session_claim(sconn, vuser)) {
- DEBUG(1, ("register_existing_vuid: Failed to claim session "
- "for vuid=%d\n",
- vuser->vuid));
- goto fail;
- }
-
- /* Register a home dir service for this user if
- (a) This is not a guest connection,
- (b) we have a home directory defined
- (c) there s not an existing static share by that name
- If a share exists by this name (autoloaded or not) reuse it . */
-
- vuser->homes_snum = -1;
-
-
- if (!guest) {
- vuser->homes_snum = register_homes_share(
- vuser->session_info->unix_info->unix_name);
- }
-
- if (srv_is_signing_negotiated(sconn) &&
- !guest) {
- /* Try and turn on server signing on the first non-guest
- * sessionsetup. */
- srv_set_signing(sconn,
- vuser->session_info->session_key,
- response_blob);
- }
-
- /* fill in the current_user_info struct */
- set_current_user_info(
- vuser->session_info->unix_info->sanitized_username,
- vuser->session_info->unix_info->unix_name,
- vuser->session_info->info->domain_name);
-
- return vuser->vuid;
-
- fail:
-
- if (vuser) {
- invalidate_vuid(sconn, vuid);
- }
- return UID_FIELD_INVALID;
-}
uint16 data_blob_len = SVAL(req->vwv+7, 0);
enum remote_arch_types ra_type = get_remote_arch();
int vuid = req->vuid;
- user_struct *vuser = NULL;
NTSTATUS status = NT_STATUS_OK;
struct smbd_server_connection *sconn = req->sconn;
uint16_t action = 0;
+ NTTIME now = timeval_to_nttime(&req->request_time);
+ struct smbXsrv_session *session = NULL;
DEBUG(3,("Doing spnego session setup\n"));
}
}
- vuser = get_valid_user_struct(sconn, vuid);
- if (vuser != NULL) {
- reply_nterror(req, NT_STATUS_REQUEST_NOT_ACCEPTED);
- return;
- }
-
- /* Do we have a valid vuid now ? */
- if (!is_partial_auth_vuid(sconn, vuid)) {
- if (vuid != 0) {
+ if (vuid != 0) {
+ status = smb1srv_session_lookup(sconn->conn,
+ vuid, now,
+ &session);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) {
reply_force_doserror(req, ERRSRV, ERRbaduid);
return;
}
-
- /* No, start a new authentication setup. */
- vuid = register_initial_vuid(sconn);
- if (vuid == UID_FIELD_INVALID) {
- reply_nterror(req, nt_status_squash(
- NT_STATUS_INVALID_PARAMETER));
+ if (NT_STATUS_IS_OK(status)) {
+ reply_nterror(req, NT_STATUS_REQUEST_NOT_ACCEPTED);
+ return;
+ }
+ if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+ reply_nterror(req, nt_status_squash(status));
return;
}
}
- vuser = get_partial_auth_user_struct(sconn, vuid);
- /* This MUST be valid. */
- if (!vuser) {
- smb_panic("reply_sesssetup_and_X_spnego: invalid vuid.");
+ if (session == NULL) {
+ /* create a new session */
+ status = smbXsrv_session_create(sconn->conn,
+ now, &session);
+ if (!NT_STATUS_IS_OK(status)) {
+ reply_nterror(req, nt_status_squash(status));
+ return;
+ }
}
- if (!vuser->gensec_security) {
- status = auth_generic_prepare(vuser, sconn->remote_address,
- &vuser->gensec_security);
+ if (!session->gensec) {
+ status = auth_generic_prepare(session, sconn->remote_address,
+ &session->gensec);
if (!NT_STATUS_IS_OK(status)) {
- /* Kill the intermediate vuid */
- invalidate_vuid(sconn, vuid);
+ TALLOC_FREE(session);
reply_nterror(req, nt_status_squash(status));
return;
}
- gensec_want_feature(vuser->gensec_security, GENSEC_FEATURE_SESSION_KEY);
- gensec_want_feature(vuser->gensec_security, GENSEC_FEATURE_UNIX_TOKEN);
+ gensec_want_feature(session->gensec, GENSEC_FEATURE_SESSION_KEY);
+ gensec_want_feature(session->gensec, GENSEC_FEATURE_UNIX_TOKEN);
- status = gensec_start_mech_by_oid(vuser->gensec_security, GENSEC_OID_SPNEGO);
+ status = gensec_start_mech_by_oid(session->gensec,
+ GENSEC_OID_SPNEGO);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("Failed to start SPNEGO handler!\n"));
- /* Kill the intermediate vuid */
- invalidate_vuid(sconn, vuid);
+ TALLOC_FREE(session);;
reply_nterror(req, nt_status_squash(status));
return;
}
}
- status = gensec_update(vuser->gensec_security,
+ become_root();
+ status = gensec_update(session->gensec,
talloc_tos(), NULL,
in_blob, &out_blob);
+ unbecome_root();
if (!NT_STATUS_IS_OK(status) &&
!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
- /* Kill the intermediate vuid */
- invalidate_vuid(sconn, vuid);
+ TALLOC_FREE(session);
reply_nterror(req, nt_status_squash(status));
return;
}
if (NT_STATUS_IS_OK(status)) {
struct auth_session_info *session_info = NULL;
- int tmp_vuid;
- status = gensec_session_info(vuser->gensec_security,
- talloc_tos(),
+ status = gensec_session_info(session->gensec,
+ session,
&session_info);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1,("Failed to generate session_info "
"(user and group token) for session setup: %s\n",
nt_errstr(status)));
- /* Kill the intermediate vuid */
data_blob_free(&out_blob);
- invalidate_vuid(sconn, vuid);
+ TALLOC_FREE(session);
reply_nterror(req, nt_status_squash(status));
return;
}
action = 1;
}
- /* register_existing_vuid keeps the server info */
- tmp_vuid = register_existing_vuid(sconn, vuid,
- session_info,
- data_blob_null);
- if (tmp_vuid != vuid) {
+ session->compat = talloc_zero(session, user_struct);
+ if (session->compat == NULL) {
+ data_blob_free(&out_blob);
+ TALLOC_FREE(session);
+ reply_nterror(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+ session->compat->session = session;
+ session->compat->homes_snum = -1;
+ session->compat->session_info = session_info;
+ session->compat->session_keystr = NULL;
+ session->compat->vuid = session->global->session_wire_id;
+ DLIST_ADD(sconn->users, session->compat);
+ sconn->num_users++;
+
+ if (security_session_user_level(session_info, NULL) >= SECURITY_USER) {
+ session->compat->homes_snum =
+ register_homes_share(session_info->unix_info->unix_name);
+ }
+
+ if (!session_claim(sconn, session->compat)) {
+ DEBUG(1, ("smb2: Failed to claim session "
+ "for vuid=%d\n",
+ session->compat->vuid));
+ data_blob_free(&out_blob);
+ TALLOC_FREE(session);
+ reply_nterror(req, NT_STATUS_LOGON_FAILURE);
+ return;
+ }
+
+ if (srv_is_signing_negotiated(sconn) && action == 0) {
+ /*
+ * Try and turn on server signing on the first non-guest
+ * sessionsetup.
+ */
+ srv_set_signing(sconn,
+ session_info->session_key,
+ data_blob_null);
+ }
+
+ set_current_user_info(session_info->unix_info->sanitized_username,
+ session_info->unix_info->unix_name,
+ session_info->info->domain_name);
+
+ session->status = NT_STATUS_OK;
+ session->global->auth_session_info = talloc_move(session->global,
+ &session_info);
+ session->global->auth_session_info_seqnum += 1;
+ session->global->channels[0].auth_session_info_seqnum =
+ session->global->auth_session_info_seqnum;
+
+ status = smbXsrv_session_update(session);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("smb1: Failed to update session for vuid=%d - %s\n",
+ session->compat->vuid, nt_errstr(status)));
data_blob_free(&out_blob);
- invalidate_vuid(sconn, vuid);
+ TALLOC_FREE(session);
reply_nterror(req, NT_STATUS_LOGON_FAILURE);
return;
}
reload_services(sconn, conn_snum_used, true);
}
+ vuid = session->global->session_wire_id;
+
reply_outbuf(req, 4, 0);
SSVAL(req->outbuf, smb_uid, vuid);
if (message_push_blob(&req->outbuf, out_blob) == -1) {
data_blob_free(&out_blob);
- invalidate_vuid(sconn, vuid);
+ TALLOC_FREE(session);
reply_nterror(req, NT_STATUS_NO_MEMORY);
return;
}
data_blob_free(&out_blob);
if (push_signature(&req->outbuf) == -1) {
- invalidate_vuid(sconn, vuid);
+ TALLOC_FREE(session);
reply_nterror(req, NT_STATUS_NO_MEMORY);
return;
}
struct auth_session_info *session_info = NULL;
uint16 smb_flag2 = req->flags2;
uint16_t action = 0;
+ NTTIME now = timeval_to_nttime(&req->request_time);
+ struct smbXsrv_session *session = NULL;
NTSTATUS nt_status;
struct smbd_server_connection *sconn = req->sconn;
/* register the name and uid as being validated, so further connections
to a uid can get through without a password, on the same VC */
- /* Ignore the initial vuid. */
- sess_vuid = register_initial_vuid(sconn);
- if (sess_vuid == UID_FIELD_INVALID) {
+ nt_status = smbXsrv_session_create(sconn->conn,
+ now, &session);
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ data_blob_free(&nt_resp);
+ data_blob_free(&lm_resp);
+ reply_nterror(req, nt_status_squash(nt_status));
+ END_PROFILE(SMBsesssetupX);
+ return;
+ }
+
+ session->compat = talloc_zero(session, user_struct);
+ if (session->compat == NULL) {
data_blob_free(&nt_resp);
data_blob_free(&lm_resp);
- reply_nterror(req, nt_status_squash(
- NT_STATUS_LOGON_FAILURE));
+ TALLOC_FREE(session);
+ reply_nterror(req, NT_STATUS_NO_MEMORY);
END_PROFILE(SMBsesssetupX);
return;
}
- /* register_existing_vuid keeps the session_info */
- sess_vuid = register_existing_vuid(sconn, sess_vuid,
- session_info,
- nt_resp.data ? nt_resp : lm_resp);
- if (sess_vuid == UID_FIELD_INVALID) {
+ session->compat->homes_snum = -1;
+ session->compat->session_info = session_info;
+ session->compat->session_keystr = NULL;
+ session->compat->vuid = session->global->session_wire_id;
+ DLIST_ADD(sconn->users, session->compat);
+ sconn->num_users++;
+
+ if (security_session_user_level(session_info, NULL) >= SECURITY_USER) {
+ session->compat->homes_snum =
+ register_homes_share(session_info->unix_info->unix_name);
+ }
+
+ if (!session_claim(sconn, session->compat)) {
+ DEBUG(1, ("smb2: Failed to claim session "
+ "for vuid=%d\n",
+ session->compat->vuid));
data_blob_free(&nt_resp);
data_blob_free(&lm_resp);
- reply_nterror(req, nt_status_squash(
- NT_STATUS_LOGON_FAILURE));
+ TALLOC_FREE(session);
+ reply_nterror(req, NT_STATUS_LOGON_FAILURE);
+ END_PROFILE(SMBsesssetupX);
+ return;
+ }
+
+ if (srv_is_signing_negotiated(sconn) && action == 0) {
+ /*
+ * Try and turn on server signing on the first non-guest
+ * sessionsetup.
+ */
+ srv_set_signing(sconn,
+ session_info->session_key,
+ nt_resp.data ? nt_resp : lm_resp);
+ }
+
+ set_current_user_info(session_info->unix_info->sanitized_username,
+ session_info->unix_info->unix_name,
+ session_info->info->domain_name);
+
+ session->status = NT_STATUS_OK;
+ session->global->auth_session_info = talloc_move(session->global,
+ &session_info);
+
+ nt_status = smbXsrv_session_update(session);
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ DEBUG(0, ("smb2: Failed to update session for vuid=%d - %s\n",
+ session->compat->vuid, nt_errstr(nt_status)));
+ data_blob_free(&nt_resp);
+ data_blob_free(&lm_resp);
+ TALLOC_FREE(session);
+ reply_nterror(req, nt_status_squash(nt_status));
END_PROFILE(SMBsesssetupX);
return;
}
/* current_user_info is changed on new vuid */
reload_services(sconn, conn_snum_used, true);
+ sess_vuid = session->global->session_wire_id;
+
data_blob_free(&nt_resp);
data_blob_free(&lm_resp);
git.samba.org / metze / samba / wip.git / commitdiff