The branch, master has been updated
via 8e95db9... s3: Move serverinfo_to_SamInfoX to auth/server_info.c
via b8829e7... s3: Move [make|free]_user_info to auth/user_info.c
via 1890987... s3: Move make_server_info_sam to auth/server_info_sam.c
via 2b1a50c... s3: Move sanitize_username to lib/util_str.c
via 80708b7... s3: Move make_server_info to auth/server_info.c
via 5792ccc... s3: Move check_sam_security to auth/check_sam.c
via 04f9e33... s3: Make check_sam_security public
via a0c175e... s3: Replace "auth_context" by "challenge" in
need_to_increment_bad_pw_count args
via 19c0086... s3: Replace "auth_context" by "challenge" in
sam_password_ok args
via 7ba21a3... s3: Move user_in_group() and
create_token_from_username() to token_utils.c
from 4d84dab... libcli/auth: Fix an uninitialized variable
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8e95db9eea8bfd6ec12a894d0d46705a3c414e4e
Author: Volker Lendecke <v...@samba.org>
Date: Sun Apr 11 15:25:55 2010 +0200
s3: Move serverinfo_to_SamInfoX to auth/server_info.c
commit b8829e74fd0386931c1a5845337efff25fec72c2
Author: Volker Lendecke <v...@samba.org>
Date: Sun Apr 11 15:25:06 2010 +0200
s3: Move [make|free]_user_info to auth/user_info.c
commit 18909879cc100b958d74c78ff9f84e9ba3318340
Author: Volker Lendecke <v...@samba.org>
Date: Sun Apr 11 22:41:59 2010 +0200
s3: Move make_server_info_sam to auth/server_info_sam.c
commit 2b1a50c2e537f690acd8eff1d0cf3102104144d3
Author: Volker Lendecke <v...@samba.org>
Date: Sun Apr 11 22:38:33 2010 +0200
s3: Move sanitize_username to lib/util_str.c
commit 80708b75f815d455c7cc00fc4cccfb6af91e9d85
Author: Volker Lendecke <v...@samba.org>
Date: Sun Apr 11 22:37:08 2010 +0200
s3: Move make_server_info to auth/server_info.c
commit 5792ccc7c85276edd86050b18b755e05cda7e1f1
Author: Volker Lendecke <v...@samba.org>
Date: Sun Apr 11 22:32:36 2010 +0200
s3: Move check_sam_security to auth/check_sam.c
commit 04f9e33de140235d387a254403909063b8c30f9e
Author: Volker Lendecke <v...@samba.org>
Date: Sun Apr 11 22:26:46 2010 +0200
s3: Make check_sam_security public
commit a0c175eca9d296e8434acbdb1a87241d64d86f7b
Author: Volker Lendecke <v...@samba.org>
Date: Sun Apr 11 22:23:08 2010 +0200
s3: Replace "auth_context" by "challenge" in need_to_increment_bad_pw_count
args
commit 19c00865537ff298e6306de4e81d376d3f068237
Author: Volker Lendecke <v...@samba.org>
Date: Sun Apr 11 14:07:12 2010 +0200
s3: Replace "auth_context" by "challenge" in sam_password_ok args
commit 7ba21a339c591f546085fcd8cfbf77c25dcfe11e
Author: Volker Lendecke <v...@samba.org>
Date: Sun Apr 11 13:48:55 2010 +0200
s3: Move user_in_group() and create_token_from_username() to token_utils.c
Goal is to be able to call check_sam_security from winbind
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 5 +-
source3/auth/auth_sam.c | 506 +-------------------------------
source3/auth/auth_util.c | 584 -------------------------------------
source3/auth/check_samsec.c | 512 ++++++++++++++++++++++++++++++++
source3/auth/server_info.c | 342 ++++++++++++++++++++++
source3/auth/server_info_sam.c | 151 ++++++++++
source3/auth/token_util.c | 315 ++++++++++++++++++++
source3/auth/user_info.c | 131 +++++++++
source3/include/proto.h | 23 ++
source3/lib/util_str.c | 8 +
source3/rpc_server/srv_pipe_hnd.c | 287 ------------------
11 files changed, 1502 insertions(+), 1362 deletions(-)
create mode 100644 source3/auth/check_samsec.c
create mode 100644 source3/auth/server_info.c
create mode 100644 source3/auth/server_info_sam.c
create mode 100644 source3/auth/user_info.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 55f3d40..4de937a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -755,7 +755,7 @@ DCUTIL_OBJ = libsmb/namequery_dc.o libsmb/trustdom_cache.o
libsmb/trusts_util.o
AUTH_BUILTIN_OBJ = auth/auth_builtin.o
AUTH_DOMAIN_OBJ = auth/auth_domain.o
-AUTH_SAM_OBJ = auth/auth_sam.o
+AUTH_SAM_OBJ = auth/auth_sam.o auth/check_samsec.o
AUTH_SERVER_OBJ = auth/auth_server.o
AUTH_UNIX_OBJ = auth/auth_unix.o
AUTH_WINBIND_OBJ = auth/auth_winbind.o
@@ -764,6 +764,9 @@ AUTH_SCRIPT_OBJ = auth/auth_script.o
AUTH_NETLOGOND_OBJ = auth/auth_netlogond.o
AUTH_OBJ = auth/auth.o @AUTH_STATIC@ auth/auth_util.o auth/token_util.o \
+ auth/server_info.o \
+ auth/server_info_sam.o \
+ auth/user_info.o \
auth/auth_compat.o auth/auth_ntlmssp.o \
$(PLAINTEXT_AUTH_OBJ) $(SLCACHE_OBJ) $(DCUTIL_OBJ)
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index cf121d1..4220b7a 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -26,492 +26,17 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
-/****************************************************************************
- Do a specific test for an smb password being correct, given a smb_password and
- the lanman and NT responses.
-****************************************************************************/
-
-static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
- TALLOC_CTX *mem_ctx,
- const char *username,
- uint32_t acct_ctrl,
- const uint8_t *lm_pw,
- const uint8_t *nt_pw,
- const struct auth_usersupplied_info *user_info,
- DATA_BLOB *user_sess_key,
- DATA_BLOB *lm_sess_key)
-{
- struct samr_Password _lm_hash, _nt_hash, _client_lm_hash,
_client_nt_hash;
- struct samr_Password *lm_hash = NULL;
- struct samr_Password *nt_hash = NULL;
- struct samr_Password *client_lm_hash = NULL;
- struct samr_Password *client_nt_hash = NULL;
-
- *user_sess_key = data_blob_null;
- *lm_sess_key = data_blob_null;
-
- if (acct_ctrl & ACB_PWNOTREQ) {
- if (lp_null_passwords()) {
- DEBUG(3,("Account for user '%s' has no password and
null passwords are allowed.\n", username));
- return NT_STATUS_OK;
- } else {
- DEBUG(3,("Account for user '%s' has no password and
null passwords are NOT allowed.\n", username));
- return NT_STATUS_LOGON_FAILURE;
- }
- }
-
- if (lm_pw) {
- memcpy(_lm_hash.hash, lm_pw, sizeof(_lm_hash.hash));
- lm_hash = &_lm_hash;
- }
- if (nt_pw) {
- memcpy(_nt_hash.hash, nt_pw, sizeof(_nt_hash.hash));
- nt_hash = &_nt_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));
- client_lm_hash = &_client_lm_hash;
- }
- 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));
- client_nt_hash = &_client_nt_hash;
- }
-
- if (client_lm_hash || client_nt_hash) {
- *user_sess_key = data_blob_talloc(mem_ctx, NULL, 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(),
- client_lm_hash,
- client_nt_hash,
- username,
- lm_hash,
- nt_hash);
- } 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_hash,
- nt_hash,
- user_sess_key, lm_sess_key);
- }
-}
-
-/****************************************************************************
- Check if a user is allowed to logon at this time. Note this is the
- 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 */
- const uint8 *hours;
- struct tm *utctime;
- time_t lasttime;
- const char *asct;
- uint8 bitmask, bitpos;
-
- hours = pdb_get_hours(sampass);
- if (!hours) {
- DEBUG(5,("logon_hours_ok: No hours restrictions for user
%s\n",pdb_get_username(sampass)));
- return True;
- }
-
- lasttime = time(NULL);
- utctime = gmtime(&lasttime);
- if (!utctime) {
- DEBUG(1, ("logon_hours_ok: failed to get gmtime. Failing logon
for user %s\n",
- pdb_get_username(sampass) ));
- return False;
- }
-
- /* find the corresponding byte and bit */
- bitpos = (utctime->tm_wday * 24 + utctime->tm_hour) % 168;
- bitmask = 1 << (bitpos % 8);
-
- if (! (hours[bitpos/8] & bitmask)) {
- struct tm *t = localtime(&lasttime);
- if (!t) {
- asct = "INVALID TIME";
- } else {
- asct = asctime(t);
- if (!asct) {
- 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 ));
- return False;
- }
-
- asct = asctime(utctime);
- DEBUG(5,("logon_hours_ok: user %s allowed to logon at this time (%s)\n",
- pdb_get_username(sampass), asct ? asct : "UNKNOWN TIME" ));
-
- return True;
-}
-
-/****************************************************************************
- Do a specific test for a struct samu being valid for this connection
- (ie not disabled, expired and the like).
-****************************************************************************/
-
-static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
- struct samu *sampass,
- const struct auth_usersupplied_info *user_info)
+static NTSTATUS auth_sam_ignoredomain_auth(const struct auth_context
*auth_context,
+ void *my_private_data,
+ TALLOC_CTX *mem_ctx,
+ const struct auth_usersupplied_info
*user_info,
+ struct auth_serversupplied_info
**server_info)
{
- 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. */
- if (acct_ctrl & ACB_DISABLED) {
- DEBUG(1,("sam_account_ok: Account for user '%s' was
disabled.\n", pdb_get_username(sampass)));
- return NT_STATUS_ACCOUNT_DISABLED;
- }
-
- /* Quit if the account was locked out. */
- if (acct_ctrl & ACB_AUTOLOCK) {
- DEBUG(1,("sam_account_ok: Account for user %s was locked
out.\n", pdb_get_username(sampass)));
- return NT_STATUS_ACCOUNT_LOCKED_OUT;
- }
-
- /* Quit if the account is not allowed to logon at this time. */
- if (! logon_hours_ok(sampass)) {
- return NT_STATUS_INVALID_LOGON_HOURS;
- }
-
- /* 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)));
- DEBUG(3,("sam_account_ok: Account expired at '%ld' unix
time.\n", (long)kickoff_time));
- return NT_STATUS_ACCOUNT_EXPIRED;
- }
-
- if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOEXP) &&
!(pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ)) {
- 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"
- * 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;
- }
-
- /* 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(talloc_tos(), must_change_time),
(long)must_change_time));
- return NT_STATUS_PASSWORD_EXPIRED;
- }
- }
-
- /* Test workstation. Workstation list is comma separated. */
-
- workstation_list = talloc_strdup(mem_ctx,
pdb_get_workstations(sampass));
- if (!workstation_list)
- return NT_STATUS_NO_MEMORY;
-
- if (*workstation_list) {
- bool invalid_ws = True;
- char *tok = NULL;
- const char *s = workstation_list;
- char *machine_name = talloc_asprintf(mem_ctx, "%s$",
user_info->wksta_name);
-
- if (machine_name == NULL)
- return NT_STATUS_NO_MEMORY;
-
- 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)) {
- invalid_ws = False;
- break;
- }
- if (tok[0] == '+') {
- DEBUG(10,("sam_account_ok: checking for
workstation %s in group: %s\n",
- machine_name, tok + 1));
- if (user_in_group(machine_name, tok + 1)) {
- invalid_ws = False;
- break;
- }
- }
- TALLOC_FREE(tok);
- }
- TALLOC_FREE(tok);
- TALLOC_FREE(machine_name);
-
- if (invalid_ws)
- return NT_STATUS_INVALID_WORKSTATION;
- }
-
- if (acct_ctrl & ACB_DOMTRUST) {
- 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)));
- return NT_STATUS_NOLOGON_SERVER_TRUST_ACCOUNT;
- }
- }
-
- if (acct_ctrl & ACB_WSTRUST) {
- if (!(user_info->logon_parameters &
MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT)) {
- DEBUG(2,("sam_account_ok: Wksta trust account %s denied
by server\n", pdb_get_username(sampass)));
- return NT_STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT;
- }
- }
- return NT_STATUS_OK;
-}
-
-/**
- * Check whether the given password is one of the last two
- * password history entries. If so, the bad pwcount should
- * not be incremented even thought the actual password check
- * failed.
- */
-static bool need_to_increment_bad_pw_count(
- const struct auth_context *auth_context,
- struct samu* sampass,
- const struct auth_usersupplied_info *user_info)
-{
- uint8_t i;
- const uint8_t *pwhistory;
- uint32_t pwhistory_len;
- uint32_t policy_pwhistory_len;
- uint32_t acct_ctrl;
- const char *username;
- TALLOC_CTX *mem_ctx = talloc_stackframe();
- bool result = true;
-
- pdb_get_account_policy(PDB_POLICY_PASSWORD_HISTORY,
- &policy_pwhistory_len);
- if (policy_pwhistory_len == 0) {
- goto done;
- }
-
- pwhistory = pdb_get_pw_history(sampass, &pwhistory_len);
- if (!pwhistory || pwhistory_len == 0) {
- goto done;
- }
-
- acct_ctrl = pdb_get_acct_ctrl(sampass);
- username = pdb_get_username(sampass);
-
- for (i=1; i < MIN(MIN(3, policy_pwhistory_len), pwhistory_len); i++) {
- static const uint8_t zero16[SALTED_MD5_HASH_LEN];
- const uint8_t *salt;
- const uint8_t *nt_pw;
- NTSTATUS status;
- DATA_BLOB user_sess_key = data_blob_null;
- DATA_BLOB lm_sess_key = data_blob_null;
-
- salt = &pwhistory[i*PW_HISTORY_ENTRY_LEN];
- nt_pw = salt + PW_HISTORY_SALT_LEN;
-
- if (memcmp(zero16, nt_pw, NT_HASH_LEN) == 0) {
- /* skip zero password hash */
- continue;
- }
-
- if (memcmp(zero16, salt, PW_HISTORY_SALT_LEN) != 0) {
- /* skip nonzero salt (old format entry) */
- continue;
- }
-
- status = sam_password_ok(auth_context, mem_ctx,
- username, acct_ctrl, NULL, nt_pw,
- user_info, &user_sess_key,
&lm_sess_key);
- if (NT_STATUS_IS_OK(status)) {
- result = false;
- break;
- }
- }
-
-done:
- TALLOC_FREE(mem_ctx);
- return result;
-}
-
-/****************************************************************************
-check if a username/password is OK assuming the password is a 24 byte
-SMB hash supplied in the user_info structure
-return an NT_STATUS constant.
-****************************************************************************/
-
-static NTSTATUS check_sam_security(const struct auth_context *auth_context,
- void *my_private_data,
- TALLOC_CTX *mem_ctx,
- const struct auth_usersupplied_info
*user_info,
- struct auth_serversupplied_info
**server_info)
-{
- struct samu *sampass=NULL;
- 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;
- const char *username;
- const uint8_t *nt_pw;
- const uint8_t *lm_pw;
-
if (!user_info || !auth_context) {
return NT_STATUS_UNSUCCESSFUL;
}
-
- /* the returned struct gets kept on the server_info, by means
- of a steal further down */
-
- sampass = samu_new(mem_ctx);
- if (sampass == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
-
- /* get the account information */
-
- become_root();
- ret = pdb_getsampwnam(sampass, user_info->internal_username);
- unbecome_root();
-
- if (ret == False) {
- DEBUG(3,("check_sam_security: Couldn't find user '%s' in "
- "passdb.\n", user_info->internal_username));
- TALLOC_FREE(sampass);
- return NT_STATUS_NO_SUCH_USER;
- }
-
- username = pdb_get_username(sampass);
- nt_pw = pdb_get_nt_passwd(sampass);
- lm_pw = pdb_get_lanman_passwd(sampass);
-
- /* see if autolock flag needs to be updated */
- if (pdb_get_acct_ctrl(sampass) & ACB_NORMAL)
- pdb_update_autolock_flag(sampass, &updated_autolock);
- /* Quit if the account was locked out. */
- if (pdb_get_acct_ctrl(sampass) & ACB_AUTOLOCK) {
- DEBUG(3,("check_sam_security: Account for user %s was locked
out.\n", username));
- return NT_STATUS_ACCOUNT_LOCKED_OUT;
- }
-
- nt_status = sam_password_ok(auth_context, mem_ctx,
- username, pdb_get_acct_ctrl(sampass),
lm_pw, nt_pw,
- 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 */
-
- update_login_attempts_status = pdb_update_login_attempts(sampass,
NT_STATUS_IS_OK(nt_status));
-
- if (!NT_STATUS_IS_OK(nt_status)) {
- bool increment_bad_pw_count = false;
-
- if (NT_STATUS_EQUAL(nt_status,NT_STATUS_WRONG_PASSWORD) &&
- pdb_get_acct_ctrl(sampass) & ACB_NORMAL &&
- NT_STATUS_IS_OK(update_login_attempts_status))
- {
- increment_bad_pw_count =
- need_to_increment_bad_pw_count(auth_context,
- sampass,
- user_info);
- }
-
- if (increment_bad_pw_count) {
- pdb_increment_bad_password_count(sampass);
- updated_badpw = True;
- } else {
- pdb_update_bad_password_count(sampass,
- &updated_badpw);
- }
- if (updated_autolock || updated_badpw){
- NTSTATUS status;
-
- become_root();
- status = pdb_update_sam_account(sampass);
- unbecome_root();
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to modify entry: %s\n",
- nt_errstr(status)));
- }
- }
- goto done;
- }
-
- if ((pdb_get_acct_ctrl(sampass) & ACB_NORMAL) &&
- (pdb_get_bad_password_count(sampass) > 0)){
- pdb_set_bad_password_count(sampass, 0, PDB_CHANGED);
- pdb_set_bad_password_time(sampass, 0, PDB_CHANGED);
- updated_badpw = True;
- }
-
- if (updated_autolock || updated_badpw){
- NTSTATUS status;
-
- become_root();
- status = pdb_update_sam_account(sampass);
- unbecome_root();
-
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1, ("Failed to modify entry: %s\n",
- nt_errstr(status)));
- }
- }
-
- nt_status = sam_account_ok(mem_ctx, sampass, user_info);
-
- if (!NT_STATUS_IS_OK(nt_status)) {
- goto done;
- }
-
- become_root();
- nt_status = make_server_info_sam(server_info, sampass);
- unbecome_root();
- /*
- * sampass has been stolen to server_info.
- * So NULL it out to prevent segfaults.
- */
- sampass = NULL;
-
--
Samba Shared Repository
