Tidyup prompted by #6554 - Wrong deallocation in sam_account_ok.
[ira/wip.git] / source3 / auth / auth_sam.c
index afd13863750abcd2b4056651235f7b9163a33d17..26b45e47e5664821828cc7bc376bb0acad14df1e 100644 (file)
@@ -5,23 +5,23 @@
    Copyright (C) Luke Kenneth Casson Leighton 1996-2000
    Copyright (C) Andrew Bartlett              2001-2003
    Copyright (C) Gerald Carter                2003
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "../libcli/auth/libcli_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
@@ -40,7 +40,12 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
 {
        uint32 acct_ctrl;
        const uint8 *lm_pw, *nt_pw;
+       struct samr_Password lm_hash, nt_hash, client_lm_hash, client_nt_hash;
        const char *username = pdb_get_username(sampass);
+       bool got_lm = false, got_nt = false;
+
+       *user_sess_key = data_blob(NULL, 0);
+       *lm_sess_key = data_blob(NULL, 0);
 
        acct_ctrl = pdb_get_acct_ctrl(sampass);
        if (acct_ctrl & ACB_PWNOTREQ) {
@@ -55,14 +60,45 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
 
        lm_pw = pdb_get_lanman_passwd(sampass);
        nt_pw = pdb_get_nt_passwd(sampass);
-
-       return ntlm_password_check(mem_ctx, &auth_context->challenge, 
-                                  &user_info->lm_resp, &user_info->nt_resp, 
-                                  &user_info->lm_interactive_pwd, &user_info->nt_interactive_pwd,
-                                  username, 
-                                  user_info->smb_name,
-                                  user_info->client_domain,
-                                  lm_pw, nt_pw, user_sess_key, lm_sess_key);
+       if (lm_pw) {
+               memcpy(lm_hash.hash, lm_pw, sizeof(lm_hash.hash));
+       }
+       if (nt_pw) {
+               memcpy(nt_hash.hash, nt_pw, sizeof(nt_hash.hash));
+       }
+       if (user_info->lm_interactive_pwd.data && sizeof(client_lm_hash.hash) == user_info->lm_interactive_pwd.length) {
+               memcpy(client_lm_hash.hash, user_info->lm_interactive_pwd.data, sizeof(lm_hash.hash));
+               got_lm = true;
+       }
+       if (user_info->nt_interactive_pwd.data && sizeof(client_nt_hash.hash) == user_info->nt_interactive_pwd.length) {
+               memcpy(client_nt_hash.hash, user_info->nt_interactive_pwd.data, sizeof(nt_hash.hash));
+               got_nt = true;
+       }
+       if (got_lm || got_nt) {
+               *user_sess_key = data_blob(mem_ctx, 16);
+               if (!user_sess_key->data) {
+                       return NT_STATUS_NO_MEMORY;
+               }
+               SMBsesskeygen_ntv1(nt_pw, user_sess_key->data);
+               return hash_password_check(mem_ctx, lp_lanman_auth(),
+                                          got_lm ? &client_lm_hash : NULL, 
+                                          got_nt ? &client_nt_hash : NULL,
+                                          username, 
+                                          lm_pw ? &lm_hash: NULL, 
+                                          nt_pw ? &nt_hash : NULL);
+       } else {
+               return ntlm_password_check(mem_ctx, lp_lanman_auth(),
+                                          lp_ntlm_auth(),
+                                          user_info->logon_parameters,
+                                          &auth_context->challenge, 
+                                          &user_info->lm_resp, &user_info->nt_resp, 
+                                          username, 
+                                          user_info->smb_name,
+                                          user_info->client_domain,
+                                          lm_pw ? &lm_hash: NULL, 
+                                          nt_pw ? &nt_hash : NULL,
+                                          user_sess_key, lm_sess_key);
+       }
 }
 
 /****************************************************************************
@@ -70,8 +106,8 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
  servers local time, as logon hours are just specified as a weekly
  bitmask.
 ****************************************************************************/
-                                                                                                              
-static BOOL logon_hours_ok(struct samu *sampass)
+
+static bool logon_hours_ok(struct samu *sampass)
 {
        /* In logon hours first bit is Sunday from 12AM to 1AM */
        const uint8 *hours;
@@ -108,7 +144,7 @@ static BOOL logon_hours_ok(struct samu *sampass)
                                asct = "INVALID TIME";
                        }
                }
-               
+
                DEBUG(1, ("logon_hours_ok: Account for user %s not allowed to "
                          "logon at this time (%s).\n",
                          pdb_get_username(sampass), asct ));
@@ -123,7 +159,7 @@ static BOOL logon_hours_ok(struct samu *sampass)
 }
 
 /****************************************************************************
- Do a specific test for a struct samu being vaild for this connection 
+ Do a specific test for a struct samu being valid for this connection
  (ie not disabled, expired and the like).
 ****************************************************************************/
 
@@ -134,7 +170,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
        uint32  acct_ctrl = pdb_get_acct_ctrl(sampass);
        char *workstation_list;
        time_t kickoff_time;
-       
+
        DEBUG(4,("sam_account_ok: Checking SMB password for user %s\n",pdb_get_username(sampass)));
 
        /* Quit if the account was disabled. */
@@ -155,7 +191,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
        }
 
        /* Test account expire time */
-       
+
        kickoff_time = pdb_get_kickoff_time(sampass);
        if (kickoff_time != 0 && time(NULL) > kickoff_time) {
                DEBUG(1,("sam_account_ok: Account for user '%s' has expired.\n", pdb_get_username(sampass)));
@@ -167,8 +203,9 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                time_t must_change_time = pdb_get_pass_must_change_time(sampass);
                time_t last_set_time = pdb_get_pass_last_set_time(sampass);
 
-               /* check for immediate expiry "must change at next logon" */
-               if (last_set_time == 0) {
+               /* check for immediate expiry "must change at next logon" 
+                * for a user account. */
+               if (((acct_ctrl & (ACB_WSTRUST|ACB_SVRTRUST)) == 0) && (last_set_time == 0)) {
                        DEBUG(1,("sam_account_ok: Account for user '%s' password must change!.\n", pdb_get_username(sampass)));
                        return NT_STATUS_PASSWORD_MUST_CHANGE;
                }
@@ -176,7 +213,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                /* check for expired password */
                if (must_change_time < time(NULL) && must_change_time != 0) {
                        DEBUG(1,("sam_account_ok: Account for user '%s' password expired!.\n", pdb_get_username(sampass)));
-                       DEBUG(1,("sam_account_ok: Password expired at '%s' (%ld) unix time.\n", http_timestring(must_change_time), (long)must_change_time));
+                       DEBUG(1,("sam_account_ok: Password expired at '%s' (%ld) unix time.\n", http_timestring(talloc_tos(), must_change_time), (long)must_change_time));
                        return NT_STATUS_PASSWORD_EXPIRED;
                }
        }
@@ -188,16 +225,15 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
 
        if (*workstation_list) {
-               BOOL invalid_ws = True;
-               fstring tok;
+               bool invalid_ws = True;
+               char *tok = NULL;
                const char *s = workstation_list;
+               char *machine_name = talloc_asprintf(mem_ctx, "%s$", user_info->wksta_name);
 
-               const char *machine_name = talloc_asprintf(mem_ctx, "%s$", user_info->wksta_name);
                if (machine_name == NULL)
                        return NT_STATUS_NO_MEMORY;
-                       
-                       
-               while (next_token(&s, tok, ",", sizeof(tok))) {
+
+               while (next_token_talloc(mem_ctx, &s, &tok, ",")) {
                        DEBUG(10,("sam_account_ok: checking for workstation match %s and %s\n",
                                  tok, user_info->wksta_name));
                        if(strequal(tok, user_info->wksta_name)) {
@@ -212,9 +248,12 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                                        break;
                                }
                        }
+                       TALLOC_FREE(tok);
                }
-               
-               if (invalid_ws) 
+               TALLOC_FREE(tok);
+               TALLOC_FREE(machine_name);
+
+               if (invalid_ws)
                        return NT_STATUS_INVALID_WORKSTATION;
        }
 
@@ -222,7 +261,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                DEBUG(2,("sam_account_ok: Domain trust account %s denied by server\n", pdb_get_username(sampass)));
                return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
        }
-       
+
        if (acct_ctrl & ACB_SVRTRUST) {
                if (!(user_info->logon_parameters & MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT)) {
                        DEBUG(2,("sam_account_ok: Server trust account %s denied by server\n", pdb_get_username(sampass)));
@@ -252,12 +291,12 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context,
                                   auth_serversupplied_info **server_info)
 {
        struct samu *sampass=NULL;
-       BOOL ret;
+       bool ret;
        NTSTATUS nt_status;
        NTSTATUS update_login_attempts_status;
        DATA_BLOB user_sess_key = data_blob_null;
        DATA_BLOB lm_sess_key = data_blob_null;
-       BOOL updated_autolock = False, updated_badpw = False;
+       bool updated_autolock = False, updated_badpw = False;
 
        if (!user_info || !auth_context) {
                return NT_STATUS_UNSUCCESSFUL;
@@ -295,14 +334,16 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context,
        nt_status = sam_password_ok(auth_context, mem_ctx, sampass, 
                                    user_info, &user_sess_key, &lm_sess_key);
 
-       /* Notify passdb backend of login success/failure. If not NT_STATUS_OK the backend doesn't like the login */
+       /* Notify passdb backend of login success/failure. If not 
+          NT_STATUS_OK the backend doesn't like the login */
+
        update_login_attempts_status = pdb_update_login_attempts(sampass, NT_STATUS_IS_OK(nt_status));
-       if (!NT_STATUS_IS_OK(update_login_attempts_status))
-               nt_status = update_login_attempts_status;
 
        if (!NT_STATUS_IS_OK(nt_status)) {
                if (NT_STATUS_EQUAL(nt_status,NT_STATUS_WRONG_PASSWORD) && 
-                   pdb_get_acct_ctrl(sampass) &ACB_NORMAL) {  
+                   pdb_get_acct_ctrl(sampass) &ACB_NORMAL &&
+                   NT_STATUS_IS_OK(update_login_attempts_status)) 
+               {  
                        pdb_increment_bad_password_count(sampass);
                        updated_badpw = True;
                } else {
@@ -350,7 +391,6 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context,
 
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0,("check_sam_security: make_server_info_sam() failed with '%s'\n", nt_errstr(nt_status)));
-               TALLOC_FREE(sampass);
                data_blob_free(&user_sess_key);
                data_blob_free(&lm_sess_key);
                return nt_status;
@@ -366,7 +406,7 @@ static NTSTATUS check_sam_security(const struct auth_context *auth_context,
                                 lm_sess_key.length);
        data_blob_free(&lm_sess_key);
 
-       (*server_info)->was_mapped |= user_info->was_mapped;
+       (*server_info)->nss_token |= user_info->was_mapped;
 
        return nt_status;
 }
@@ -394,7 +434,7 @@ static NTSTATUS check_samstrict_security(const struct auth_context *auth_context
                                         const auth_usersupplied_info *user_info, 
                                         auth_serversupplied_info **server_info)
 {
-       BOOL is_local_name, is_my_domain;
+       bool is_local_name, is_my_domain;
 
        if (!user_info || !auth_context) {
                return NT_STATUS_LOGON_FAILURE;
@@ -404,7 +444,7 @@ static NTSTATUS check_samstrict_security(const struct auth_context *auth_context
        is_my_domain  = strequal(user_info->domain, lp_workgroup());
 
        /* check whether or not we service this domain/workgroup name */
-       
+
        switch ( lp_server_role() ) {
                case ROLE_STANDALONE:
                case ROLE_DOMAIN_MEMBER:
@@ -424,7 +464,7 @@ static NTSTATUS check_samstrict_security(const struct auth_context *auth_context
                default: /* name is ok */
                        break;
        }
-       
+
        return check_sam_security(auth_context, my_private_data, mem_ctx, user_info, server_info);
 }