sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

libcli/security: don't allow two NULL string claims

Browse Source 
This restores the behaviour with regard to duplicate NULL strings that
existed before the last commit. I'm putting it separately, because it
seems so strange, and I not entirely certain the behaviour is
intentional.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2023-11-24 17:59:24 +13:00 committed by Andrew Bartlett
parent 1c88dfc6ac
commit 4ebb488e51
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libcli/security/claims-conversions.c
View File

@ -837,7 +837,7 @@ NTSTATUS token_claims_to_claims_v1(TALLOC_CTX *mem_ctx,
{
const struct CLAIM_STRING *values = &claim_entry->values.claim_string;
uint32_t k, m;
bool seen_empty = false;
n_values = values->value_count;
value_type = CLAIM_SECURITY_ATTRIBUTE_TYPE_STRING;
@ -861,6 +861,21 @@ NTSTATUS token_claims_to_claims_v1(TALLOC_CTX *mem_ctx,
}
claim_values[m].string_value = string_value;
m++;
} else {
/*
* We allow one NULL string
* per claim, but not two,
* because two would be a
* duplicate, and we don't
* want those (duplicates in
* actual values are checked
* later).
*/
if (seen_empty) {
talloc_free(claims);
return NT_STATUS_INVALID_PARAMETER;
}
seen_empty = true;
}
}
n_values = m;