Tidyup prompted by #6554 - Wrong deallocation in sam_account_ok.
[ira/wip.git] / source3 / auth / auth_sam.c
index 50bf15318be5b0b2071515cfdfe6a1bb8daf59d7..26b45e47e5664821828cc7bc376bb0acad14df1e 100644 (file)
@@ -5,22 +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, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
+#include "../libcli/auth/libcli_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
@@ -39,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) {
@@ -54,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);
+       }
 }
 
 /****************************************************************************
@@ -69,7 +106,7 @@ 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)
 {
        /* In logon hours first bit is Sunday from 12AM to 1AM */
@@ -107,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 ));
@@ -133,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. */
@@ -154,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)));
@@ -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;
                }
        }
@@ -189,10 +226,10 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
 
        if (*workstation_list) {
                bool invalid_ws = True;
-               char *tok;
+               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;
 
@@ -214,6 +251,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
                        TALLOC_FREE(tok);
                }
                TALLOC_FREE(tok);
+               TALLOC_FREE(machine_name);
 
                if (invalid_ws)
                        return NT_STATUS_INVALID_WORKSTATION;
@@ -406,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:
@@ -426,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);
 }