sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-09 01:44:21 +03:00
Code Activity

CVE-2022-2031 s4:auth: Use PAC to determine whether ticket is a TGT

Browse Source 
We use the presence or absence of a REQUESTER_SID PAC buffer to
determine whether the ticket is a TGT. We will later use this to reject
TGTs where a service ticket is expected.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15047
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15049

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Joseph Sutton
2022-06-10 19:18:35 +12:00
committed by Jule Anger
parent 6a10e890a0
commit 0d8995910f
1 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
source4/auth/kerberos/kerberos_pac.c
View File

@@ -282,6 +282,28 @@
return ret; return ret;
} }
static krb5_error_code kerberos_pac_buffer_present(krb5_context context,
const krb5_pac pac,
uint32_t type)
{
#ifdef SAMBA4_USES_HEIMDAL
return krb5_pac_get_buffer(context, pac, type, NULL);
#else /* MIT */
krb5_error_code ret;
krb5_data data;
/*
* MIT won't let us pass NULL for the data parameter, so we are forced
* to allocate a new buffer and then immediately free it.
*/
ret = krb5_pac_get_buffer(context, pac, type, &data);
if (ret == 0) {
krb5_free_data_contents(context, &data);
}
return ret;
#endif /* SAMBA4_USES_HEIMDAL */
}
krb5_error_code kerberos_pac_to_user_info_dc(TALLOC_CTX *mem_ctx, krb5_error_code kerberos_pac_to_user_info_dc(TALLOC_CTX *mem_ctx,
krb5_pac pac, krb5_pac pac,
krb5_context context, krb5_context context,
@@ -420,6 +442,28 @@ krb5_error_code kerberos_pac_to_user_info_dc(TALLOC_CTX *mem_ctx,
return EINVAL; return EINVAL;
} }
} }
/*
* Based on the presence of a REQUESTER_SID PAC buffer, ascertain
* whether the ticket is a TGT. This helps the KDC and kpasswd service
* ensure they do not accept tickets meant for the other.
*
* This heuristic will fail for older Samba versions and Windows prior
* to Nov. 2021 updates, which lack support for the REQUESTER_SID PAC
* buffer.
*/
ret = kerberos_pac_buffer_present(context, pac, PAC_TYPE_REQUESTER_SID);
if (ret == ENOENT) {
/* This probably isn't a TGT. */
user_info_dc_out->ticket_type = TICKET_TYPE_NON_TGT;
} else if (ret != 0) {
talloc_free(tmp_ctx);
return ret;
} else {
/* This probably is a TGT. */
user_info_dc_out->ticket_type = TICKET_TYPE_TGT;
}
*user_info_dc = user_info_dc_out; *user_info_dc = user_info_dc_out;
return 0; return 0;