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

CVE-2023-0614 s4-acl: Split out logic to remove access checking attributes

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15270

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton
2023-02-27 13:40:33 +13:00
committed by Jule Anger
parent 0b0d8a8ece
commit 95be170f99
1 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
source4/dsdb/samdb/ldb_modules/acl_read.c
View File

@@ -545,6 +545,39 @@ static int check_search_ops_access(struct aclread_context *ac,
return ret; return ret;
} }
/*
* Whether this attribute was added to perform access checks and must be
* removed.
*/
static bool should_remove_attr(const char *attr, const struct aclread_context *ac)
{
if (ac->added_nTSecurityDescriptor &&
ldb_attr_cmp("nTSecurityDescriptor", attr) == 0)
{
return true;
}
if (ac->added_objectSid &&
ldb_attr_cmp("objectSid", attr) == 0)
{
return true;
}
if (ac->added_instanceType &&
ldb_attr_cmp("instanceType", attr) == 0)
{
return true;
}
if (ac->added_objectClass &&
ldb_attr_cmp("objectClass", attr) == 0)
{
return true;
}
return false;
}
static int aclread_callback(struct ldb_request *req, struct ldb_reply *ares) static int aclread_callback(struct ldb_request *req, struct ldb_reply *ares)
{ {
struct ldb_context *ldb; struct ldb_context *ldb;
@@ -619,7 +652,6 @@ static int aclread_callback(struct ldb_request *req, struct ldb_reply *ares)
/* for every element in the message check RP */ /* for every element in the message check RP */
for (i=0; i < msg->num_elements; i++) { for (i=0; i < msg->num_elements; i++) {
const struct dsdb_attribute *attr; const struct dsdb_attribute *attr;
bool is_sd, is_objectsid, is_instancetype, is_objectclass;
uint32_t access_mask; uint32_t access_mask;
attr = dsdb_attribute_by_lDAPDisplayName(ac->schema, attr = dsdb_attribute_by_lDAPDisplayName(ac->schema,
msg->elements[i].name); msg->elements[i].name);
@@ -631,28 +663,8 @@ static int aclread_callback(struct ldb_request *req, struct ldb_reply *ares)
ret = LDB_ERR_OPERATIONS_ERROR; ret = LDB_ERR_OPERATIONS_ERROR;
goto fail; goto fail;
} }
is_sd = ldb_attr_cmp("nTSecurityDescriptor", /* Remove attributes added to perform access checks. */
msg->elements[i].name) == 0; if (should_remove_attr(msg->elements[i].name, ac)) {
is_objectsid = ldb_attr_cmp("objectSid",
msg->elements[i].name) == 0;
is_instancetype = ldb_attr_cmp("instanceType",
msg->elements[i].name) == 0;
is_objectclass = ldb_attr_cmp("objectClass",
msg->elements[i].name) == 0;
/* these attributes were added to perform access checks and must be removed */
if (is_objectsid && ac->added_objectSid) {
ldb_msg_element_mark_inaccessible(&msg->elements[i]);
continue;
}
if (is_instancetype && ac->added_instanceType) {
ldb_msg_element_mark_inaccessible(&msg->elements[i]);
continue;
}
if (is_objectclass && ac->added_objectClass) {
ldb_msg_element_mark_inaccessible(&msg->elements[i]);
continue;
}
if (is_sd && ac->added_nTSecurityDescriptor) {
ldb_msg_element_mark_inaccessible(&msg->elements[i]); ldb_msg_element_mark_inaccessible(&msg->elements[i]);
continue; continue;
} }