X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source3%2Fauth%2Fauth_domain.c;h=937841c29cc1952bb78d3aa23a301d10392ea47b;hb=92ca4f52ae093e14d39b8853a34ffa8be6a3d492;hp=1de9869f9078e91d41957b6df7fb1cf0cbe94735;hpb=99e349b35da5ea5df0889a8eccc0c9774ecc24e9;p=sfrench%2Fsamba-autobuild%2F.git
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 1de9869f907..937841c29cc 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -3,27 +3,36 @@
Authenticate against a remote domain
Copyright (C) Andrew Tridgell 1992-1998
Copyright (C) Andrew Bartlett 2001
-
+
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 .
*/
#include "includes.h"
+#include "auth.h"
+#include "../libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "rpc_client/cli_pipe.h"
+#include "rpc_client/cli_netlogon.h"
+#include "secrets.h"
+#include "passdb.h"
+#include "libsmb/libsmb.h"
+#include "libcli/auth/netlogon_creds_cli.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
-extern bool global_machine_password_needs_changing;
+static struct named_mutex *mutex;
/**
* Connect to a remote server for (inter)domain security authenticaion.
@@ -39,19 +48,32 @@ extern bool global_machine_password_needs_changing;
*
**/
-static NTSTATUS connect_to_domain_password_server(struct cli_state **cli,
+static NTSTATUS connect_to_domain_password_server(struct cli_state **cli_ret,
const char *domain,
const char *dc_name,
- struct sockaddr_storage *dc_ss,
+ const struct sockaddr_storage *dc_ss,
struct rpc_pipe_client **pipe_ret,
- bool *retry)
+ struct netlogon_creds_cli_context **creds_ret)
{
- NTSTATUS result;
+ TALLOC_CTX *frame = talloc_stackframe();
+ struct messaging_context *msg_ctx = server_messaging_context();
+ NTSTATUS result;
+ struct cli_state *cli = NULL;
struct rpc_pipe_client *netlogon_pipe = NULL;
-
- *cli = NULL;
+ struct netlogon_creds_cli_context *netlogon_creds = NULL;
+ struct netlogon_creds_CredentialState *creds = NULL;
+ uint32_t netlogon_flags = 0;
+ enum netr_SchannelType sec_chan_type = 0;
+ const char *_account_name = NULL;
+ const char *account_name = NULL;
+ struct samr_Password current_nt_hash;
+ struct samr_Password *previous_nt_hash = NULL;
+ bool ok;
+
+ *cli_ret = NULL;
*pipe_ret = NULL;
+ *creds_ret = NULL;
/* TODO: Send a SAMLOGON request to determine whether this is a valid
logonserver. We can avoid a 30-second timeout if the DC is down
@@ -67,14 +89,15 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli,
* ACCESS_DENIED errors if 2 auths are done from the same machine. JRA.
*/
- if (!grab_server_mutex(dc_name)) {
+ mutex = grab_named_mutex(NULL, dc_name, 10);
+ if (mutex == NULL) {
+ TALLOC_FREE(frame);
return NT_STATUS_NO_LOGON_SERVERS;
}
-
+
/* Attempt connection */
- *retry = True;
- result = cli_full_connection(cli, global_myname(), dc_name, dc_ss, 0,
- "IPC$", "IPC", "", "", "", 0, Undefined, retry);
+ result = cli_full_connection(&cli, lp_netbios_name(), dc_name, dc_ss, 0,
+ "IPC$", "IPC", "", "", "", 0, SMB_SIGNING_DEFAULT);
if (!NT_STATUS_IS_OK(result)) {
/* map to something more useful */
@@ -82,12 +105,8 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli,
result = NT_STATUS_NO_LOGON_SERVERS;
}
- if (*cli) {
- cli_shutdown(*cli);
- *cli = NULL;
- }
-
- release_server_mutex();
+ TALLOC_FREE(mutex);
+ TALLOC_FREE(frame);
return result;
}
@@ -95,82 +114,104 @@ static NTSTATUS connect_to_domain_password_server(struct cli_state **cli,
* We now have an anonymous connection to IPC$ on the domain password server.
*/
- /*
- * Even if the connect succeeds we need to setup the netlogon
- * pipe here. We do this as we may just have changed the domain
- * account password on the PDC and yet we may be talking to
- * a BDC that doesn't have this replicated yet. In this case
- * a successful connect to a DC needs to take the netlogon connect
- * into account also. This patch from "Bjart Kvarme" .
- */
+ ok = get_trust_pw_hash(domain,
+ current_nt_hash.hash,
+ &_account_name,
+ &sec_chan_type);
+ if (!ok) {
+ cli_shutdown(cli);
+ TALLOC_FREE(mutex);
+ TALLOC_FREE(frame);
+ return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+ }
- /* open the netlogon pipe. */
- if (lp_client_schannel()) {
- /* We also setup the creds chain in the open_schannel call. */
- netlogon_pipe = cli_rpc_pipe_open_schannel(*cli, PI_NETLOGON,
- PIPE_AUTH_LEVEL_PRIVACY, domain, &result);
- } else {
- netlogon_pipe = cli_rpc_pipe_open_noauth(*cli, PI_NETLOGON, &result);
+ account_name = talloc_asprintf(talloc_tos(), "%s$", _account_name);
+ if (account_name == NULL) {
+ cli_shutdown(cli);
+ TALLOC_FREE(mutex);
+ TALLOC_FREE(frame);
+ return NT_STATUS_NO_MEMORY;
}
- if(!netlogon_pipe) {
- DEBUG(0,("connect_to_domain_password_server: unable to open the domain client session to \
-machine %s. Error was : %s.\n", dc_name, nt_errstr(result)));
- cli_shutdown(*cli);
- *cli = NULL;
- release_server_mutex();
+ result = rpccli_create_netlogon_creds(dc_name,
+ domain,
+ account_name,
+ sec_chan_type,
+ msg_ctx,
+ talloc_tos(),
+ &netlogon_creds);
+ if (!NT_STATUS_IS_OK(result)) {
+ cli_shutdown(cli);
+ TALLOC_FREE(mutex);
+ TALLOC_FREE(frame);
+ SAFE_FREE(previous_nt_hash);
return result;
}
- if (!lp_client_schannel()) {
- /* We need to set up a creds chain on an unauthenticated netlogon pipe. */
- uint32 neg_flags = NETLOGON_NEG_AUTH2_FLAGS;
- uint32 sec_chan_type = 0;
- unsigned char machine_pwd[16];
- const char *account_name;
-
- if (!get_trust_pw_hash(domain, machine_pwd, &account_name,
- &sec_chan_type))
- {
- DEBUG(0, ("connect_to_domain_password_server: could not fetch "
- "trust account password for domain '%s'\n",
- domain));
- cli_shutdown(*cli);
- *cli = NULL;
- release_server_mutex();
- return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
- }
+ result = rpccli_setup_netlogon_creds(cli,
+ netlogon_creds,
+ false, /* force_reauth */
+ current_nt_hash,
+ previous_nt_hash);
+ SAFE_FREE(previous_nt_hash);
+ if (!NT_STATUS_IS_OK(result)) {
+ cli_shutdown(cli);
+ TALLOC_FREE(mutex);
+ TALLOC_FREE(frame);
+ return result;
+ }
- result = rpccli_netlogon_setup_creds(netlogon_pipe,
- dc_name, /* server name */
- domain, /* domain */
- global_myname(), /* client name */
- account_name, /* machine account name */
- machine_pwd,
- sec_chan_type,
- &neg_flags);
-
- if (!NT_STATUS_IS_OK(result)) {
- cli_shutdown(*cli);
- *cli = NULL;
- release_server_mutex();
- return result;
- }
+ result = netlogon_creds_cli_get(netlogon_creds,
+ talloc_tos(),
+ &creds);
+ if (!NT_STATUS_IS_OK(result)) {
+ cli_shutdown(cli);
+ TALLOC_FREE(mutex);
+ TALLOC_FREE(frame);
+ return result;
+ }
+ netlogon_flags = creds->negotiate_flags;
+ TALLOC_FREE(creds);
+
+ if (netlogon_flags & NETLOGON_NEG_AUTHENTICATED_RPC) {
+ result = cli_rpc_pipe_open_schannel_with_key(
+ cli, &ndr_table_netlogon, NCACN_NP,
+ domain, netlogon_creds, &netlogon_pipe);
+ } else {
+ result = cli_rpc_pipe_open_noauth(cli,
+ &ndr_table_netlogon,
+ &netlogon_pipe);
+ }
+
+ if (!NT_STATUS_IS_OK(result)) {
+ DEBUG(0,("connect_to_domain_password_server: "
+ "unable to open the domain client session to "
+ "machine %s. Flags[0x%08X] Error was : %s.\n",
+ dc_name, (unsigned)netlogon_flags,
+ nt_errstr(result)));
+ cli_shutdown(cli);
+ TALLOC_FREE(mutex);
+ TALLOC_FREE(frame);
+ return result;
}
if(!netlogon_pipe) {
- DEBUG(0,("connect_to_domain_password_server: unable to open the domain client session to \
-machine %s. Error was : %s.\n", dc_name, cli_errstr(*cli)));
- cli_shutdown(*cli);
- *cli = NULL;
- release_server_mutex();
+ DEBUG(0, ("connect_to_domain_password_server: unable to open "
+ "the domain client session to machine %s. Error "
+ "was : %s.\n", dc_name, nt_errstr(result)));
+ cli_shutdown(cli);
+ TALLOC_FREE(mutex);
+ TALLOC_FREE(frame);
return NT_STATUS_NO_LOGON_SERVERS;
}
/* We exit here with the mutex *locked*. JRA */
+ *cli_ret = cli;
*pipe_ret = netlogon_pipe;
+ *creds_ret = netlogon_creds;
+ TALLOC_FREE(frame);
return NT_STATUS_OK;
}
@@ -181,20 +222,22 @@ machine %s. Error was : %s.\n", dc_name, cli_errstr(*cli)));
************************************************************************/
static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info *user_info,
+ const struct auth_usersupplied_info *user_info,
const char *domain,
uchar chal[8],
- auth_serversupplied_info **server_info,
+ struct auth_serversupplied_info **server_info,
const char *dc_name,
- struct sockaddr_storage *dc_ss)
+ const struct sockaddr_storage *dc_ss)
{
- NET_USER_INFO_3 info3;
+ struct netr_SamInfo3 *info3 = NULL;
struct cli_state *cli = NULL;
struct rpc_pipe_client *netlogon_pipe = NULL;
+ struct netlogon_creds_cli_context *netlogon_creds = NULL;
NTSTATUS nt_status = NT_STATUS_NO_LOGON_SERVERS;
int i;
- bool retry = True;
+ uint8_t authoritative = 0;
+ uint32_t flags = 0;
/*
* At this point, smb_apasswd points to the lanman response to
@@ -205,14 +248,14 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
*/
/* rety loop for robustness */
-
- for (i = 0; !NT_STATUS_IS_OK(nt_status) && retry && (i < 3); i++) {
+
+ for (i = 0; !NT_STATUS_IS_OK(nt_status) && (i < 3); i++) {
nt_status = connect_to_domain_password_server(&cli,
domain,
dc_name,
dc_ss,
&netlogon_pipe,
- &retry);
+ &netlogon_creds);
}
if ( !NT_STATUS_IS_OK(nt_status) ) {
@@ -225,37 +268,37 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
/* store a successful connection */
- saf_store( domain, cli->desthost );
-
- ZERO_STRUCT(info3);
+ saf_store(domain, dc_name);
/*
* If this call succeeds, we now have lots of info about the user
* in the info3 structure.
*/
- nt_status = rpccli_netlogon_sam_network_logon(netlogon_pipe,
- mem_ctx,
- user_info->logon_parameters,/* flags such as 'allow workstation logon' */
- dc_name, /* server name */
- user_info->smb_name, /* user name logging on. */
- user_info->client_domain, /* domain name */
- user_info->wksta_name, /* workstation name */
- chal, /* 8 byte challenge. */
- user_info->lm_resp, /* lanman 24 byte response */
- user_info->nt_resp, /* nt 24 byte response */
- &info3); /* info3 out */
+ nt_status = rpccli_netlogon_network_logon(netlogon_creds,
+ netlogon_pipe->binding_handle,
+ mem_ctx,
+ user_info->logon_parameters, /* flags such as 'allow workstation logon' */
+ user_info->client.account_name, /* user name logging on. */
+ user_info->client.domain_name, /* domain name */
+ user_info->workstation_name, /* workstation name */
+ chal, /* 8 byte challenge. */
+ user_info->password.response.lanman, /* lanman 24 byte response */
+ user_info->password.response.nt, /* nt 24 byte response */
+ &authoritative,
+ &flags,
+ &info3); /* info3 out */
/* Let go as soon as possible so we avoid any potential deadlocks
with winbind lookup up users or groups. */
-
- release_server_mutex();
+
+ TALLOC_FREE(mutex);
if (!NT_STATUS_IS_OK(nt_status)) {
DEBUG(0,("domain_client_validate: unable to validate password "
"for user %s in domain %s to Domain controller %s. "
- "Error was %s.\n", user_info->smb_name,
- user_info->domain, dc_name,
+ "Error was %s.\n", user_info->client.account_name,
+ user_info->client.domain_name, dc_name,
nt_errstr(nt_status)));
/* map to something more useful */
@@ -264,29 +307,16 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
}
} else {
nt_status = make_server_info_info3(mem_ctx,
- user_info->smb_name,
- domain,
- server_info,
- &info3);
+ user_info->client.account_name,
+ domain,
+ server_info,
+ info3);
if (NT_STATUS_IS_OK(nt_status)) {
- if (user_info->was_mapped) {
- (*server_info)->was_mapped = user_info->was_mapped;
- }
-
- if ( ! (*server_info)->guest) {
- /* if a real user check pam account restrictions */
- /* only really perfomed if "obey pam restriction" is true */
- nt_status = smb_pam_accountcheck((*server_info)->unix_name);
- if ( !NT_STATUS_IS_OK(nt_status)) {
- DEBUG(1, ("PAM account restriction prevents user login\n"));
- cli_shutdown(cli);
- return nt_status;
- }
- }
+ (*server_info)->nss_token |= user_info->was_mapped;
+ netsamlogon_cache_store(user_info->client.account_name, info3);
+ TALLOC_FREE(info3);
}
-
- netsamlogon_cache_store( user_info->smb_name, &info3 );
}
/* Note - once the cli stream is shutdown the mem_ctx used
@@ -304,8 +334,8 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info *user_info,
- auth_serversupplied_info **server_info)
+ const struct auth_usersupplied_info *user_info,
+ struct auth_serversupplied_info **server_info)
{
NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
const char *domain = lp_workgroup();
@@ -323,13 +353,15 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context,
return NT_STATUS_INVALID_PARAMETER;
}
+ DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
+
/*
* Check that the requested domain is not our own machine name.
* If it is, we should never check the PDC here, we use our own local
* password file.
*/
- if(strequal(get_global_sam_name(), user_info->domain)) {
+ if(strequal(get_global_sam_name(), user_info->mapped.domain_name)) {
DEBUG(3,("check_ntdomain_security: Requested domain was for this machine.\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
@@ -338,10 +370,10 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context,
if ( !get_dc_name(domain, NULL, dc_name, &dc_ss) ) {
DEBUG(5,("check_ntdomain_security: unable to locate a DC for domain %s\n",
- user_info->domain));
+ user_info->mapped.domain_name));
return NT_STATUS_NO_LOGON_SERVERS;
}
-
+
nt_status = domain_client_validate(mem_ctx,
user_info,
domain,
@@ -349,19 +381,23 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context,
server_info,
dc_name,
&dc_ss);
-
+
return nt_status;
}
/* module initialisation */
static NTSTATUS auth_init_ntdomain(struct auth_context *auth_context, const char* param, auth_methods **auth_method)
{
- if (!make_auth_methods(auth_context, auth_method)) {
+ struct auth_methods *result;
+
+ result = talloc_zero(auth_context, struct auth_methods);
+ if (result == NULL) {
return NT_STATUS_NO_MEMORY;
}
+ result->name = "ntdomain";
+ result->auth = check_ntdomain_security;
- (*auth_method)->name = "ntdomain";
- (*auth_method)->auth = check_ntdomain_security;
+ *auth_method = result;
return NT_STATUS_OK;
}
@@ -373,14 +409,10 @@ static NTSTATUS auth_init_ntdomain(struct auth_context *auth_context, const char
static NTSTATUS check_trustdomain_security(const struct auth_context *auth_context,
void *my_private_data,
TALLOC_CTX *mem_ctx,
- const auth_usersupplied_info *user_info,
- auth_serversupplied_info **server_info)
+ const struct auth_usersupplied_info *user_info,
+ struct auth_serversupplied_info **server_info)
{
NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
- unsigned char trust_md4_password[16];
- char *trust_password;
- time_t last_change_time;
- DOM_SID sid;
fstring dc_name;
struct sockaddr_storage dc_ss;
@@ -389,13 +421,15 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
return NT_STATUS_INVALID_PARAMETER;
}
+ DEBUG(10, ("Check auth for: [%s]\n", user_info->mapped.account_name));
+
/*
* Check that the requested domain is not our own machine name or domain name.
*/
- if( strequal(get_global_sam_name(), user_info->domain)) {
+ if( strequal(get_global_sam_name(), user_info->mapped.domain_name)) {
DEBUG(3,("check_trustdomain_security: Requested domain [%s] was for this machine.\n",
- user_info->domain));
+ user_info->mapped.domain_name));
return NT_STATUS_NOT_IMPLEMENTED;
}
@@ -403,54 +437,26 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
This return makes "map to guest = bad user" work again.
The logic is that if we know nothing about the domain, that
user is not known to us and does not exist */
-
- if ( !is_trusted_domain( user_info->domain ) )
- return NT_STATUS_NOT_IMPLEMENTED;
-
- /*
- * Get the trusted account password for the trusted domain
- * No need to become_root() as secrets_init() is done at startup.
- */
-
- if (!pdb_get_trusteddom_pw(user_info->domain, &trust_password,
- &sid, &last_change_time)) {
- DEBUG(0, ("check_trustdomain_security: could not fetch trust "
- "account password for domain %s\n",
- user_info->domain));
- return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
- }
-#ifdef DEBUG_PASSWORD
- DEBUG(100, ("Trust password for domain %s is %s\n", user_info->domain,
- trust_password));
-#endif
- E_md4hash(trust_password, trust_md4_password);
- SAFE_FREE(trust_password);
-
-#if 0
- /* Test if machine password is expired and need to be changed */
- if (time(NULL) > last_change_time + (time_t)lp_machine_password_timeout())
- {
- global_machine_password_needs_changing = True;
- }
-#endif
+ if ( !is_trusted_domain( user_info->mapped.domain_name ) )
+ return NT_STATUS_NOT_IMPLEMENTED;
/* use get_dc_name() for consistency even through we know that it will be
a netbios name */
-
- if ( !get_dc_name(user_info->domain, NULL, dc_name, &dc_ss) ) {
+
+ if ( !get_dc_name(user_info->mapped.domain_name, NULL, dc_name, &dc_ss) ) {
DEBUG(5,("check_trustdomain_security: unable to locate a DC for domain %s\n",
- user_info->domain));
+ user_info->mapped.domain_name));
return NT_STATUS_NO_LOGON_SERVERS;
}
-
+
nt_status = domain_client_validate(mem_ctx,
- user_info,
- user_info->domain,
- (uchar *)auth_context->challenge.data,
- server_info,
- dc_name,
- &dc_ss);
+ user_info,
+ user_info->mapped.domain_name,
+ (uchar *)auth_context->challenge.data,
+ server_info,
+ dc_name,
+ &dc_ss);
return nt_status;
}
@@ -458,12 +464,16 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
/* module initialisation */
static NTSTATUS auth_init_trustdomain(struct auth_context *auth_context, const char* param, auth_methods **auth_method)
{
- if (!make_auth_methods(auth_context, auth_method)) {
+ struct auth_methods *result;
+
+ result = talloc_zero(auth_context, struct auth_methods);
+ if (result == NULL) {
return NT_STATUS_NO_MEMORY;
}
+ result->name = "trustdomain";
+ result->auth = check_trustdomain_security;
- (*auth_method)->name = "trustdomain";
- (*auth_method)->auth = check_trustdomain_security;
+ *auth_method = result;
return NT_STATUS_OK;
}