sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code
ac0c8ee01e
samba-mirror/librpc/ndr/ndr_sec_helper.c

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

388 lines
11 KiB
C
Raw Normal View History

librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
/*
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
Unix SMB/CIFS implementation.
fast routines for getting the wire size of security objects
Copyright (C) Andrew Tridgell 2003
s4: security.idl: split of dom_sid stuff into dom_sid.idl This prepares having a shared security.idl file metze
2008-11-07 18:45:37 +03:00
Copyright (C) Stefan Metzmacher 2006-2008
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
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
r23792: convert Samba4 to GPLv3 There are still a few tidyups of old FSF addresses to come (in both s3 and s4). More commits soon. (This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa)
2007-07-10 06:07:03 +04:00
the Free Software Foundation; either version 3 of the License, or
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
(at your option) any later version.
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
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.
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
You should have received a copy of the GNU General Public License
r23792: convert Samba4 to GPLv3 There are still a few tidyups of old FSF addresses to come (in both s3 and s4). More commits soon. (This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa)
2007-07-10 06:07:03 +04:00
along with this program. If not, see <http://www.gnu.org/licenses/>.
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
*/
#include "includes.h"
r14464: Don't include ndr_BASENAME.h files unless strictly required, instead try to include just the BASENAME.h files (containing only structs) (This used to be commit 3dd477ca5147f28a962b8437e2611a8222d706bd)
2006-03-16 03:23:11 +03:00
#include "librpc/gen_ndr/ndr_security.h"
libcli/security Provide a common, top level libcli/security/security.h This will reduce the noise from merges of the rest of the libcli/security code, without this commit changing what code is actually used. This includes (along with other security headers) dom_sid.h and security_token.h Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Tue Oct 12 05:54:10 UTC 2010 on sn-devel-104
2010-10-12 08:27:50 +04:00
#include "../libcli/security/security.h"
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
/*
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
* Find the wire size of a security_ace that has no trailing coda.
* This is used in ndr_pull_security_ace() generated from security.idl
* to work out where the coda starts (and in ndr_size_security_ace()
* just below).
*/
librpc:ndr: Introduce ‘libndr_flags’ type The LIBNDR_FLAG_ namespace is getting dangerously full, with only a single flag value (1 << 9) remaining for use. After that flag is put into use, we won’t be able to add any new flags without increasing the flag width to 64‐bit. Up to now we’ve used a haphazard mix of int, unsigned, and uint32_t to store these flags. Introduce a new type, ‘libndr_flags’, to be used consistently to hold LIBNDR flags. If in the future we find we need to move to 64‐bit flags, this type gives us an opportunity to do that. Bump the NDR version to 4.0.0 — an major version increment, for we’re changing the function ABI and adding the new symbol ndr_print_libndr_flags. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-10 06:47:03 +03:00
static size_t ndr_size_security_ace_core(const struct security_ace *ace, libndr_flags flags)
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
{
r20798: fix ndr_size_security_ace() it should include the optional sub object for ADS style ace's metze (This used to be commit 161fea1a141de085eb6c84efc5b120e00cf95943)
2007-01-15 12:54:08 +03:00
size_t ret;
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
if (!ace) return 0;
Finish removal of iconv_convenience in public API's.
2010-05-09 19:20:01 +04:00
ret = 8 + ndr_size_dom_sid(&ace->trustee, flags);
libcli/security: use sec_object_ace() in size_security_ace Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-08-23 02:25:41 +03:00
if (sec_ace_object(ace->type)) {
r20798: fix ndr_size_security_ace() it should include the optional sub object for ADS style ace's metze (This used to be commit 161fea1a141de085eb6c84efc5b120e00cf95943)
2007-01-15 12:54:08 +03:00
ret += 4; /* uint32 bitmap ace->object.object.flags */
if (ace->object.object.flags & SEC_ACE_OBJECT_TYPE_PRESENT) {
ret += 16; /* GUID ace->object.object.type.type */
}
if (ace->object.object.flags & SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT) {
librpc/ndr:ndr_sec_helper: fix a typo Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-08-23 02:24:46 +03:00
ret += 16; /* GUID ace->object.object.inherited_type.inherited_type */
r20798: fix ndr_size_security_ace() it should include the optional sub object for ADS style ace's metze (This used to be commit 161fea1a141de085eb6c84efc5b120e00cf95943)
2007-01-15 12:54:08 +03:00
}
}
return ret;
}
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
/*
return the wire size of a security_ace
*/
librpc:ndr: Introduce ‘libndr_flags’ type The LIBNDR_FLAG_ namespace is getting dangerously full, with only a single flag value (1 << 9) remaining for use. After that flag is put into use, we won’t be able to add any new flags without increasing the flag width to 64‐bit. Up to now we’ve used a haphazard mix of int, unsigned, and uint32_t to store these flags. Introduce a new type, ‘libndr_flags’, to be used consistently to hold LIBNDR flags. If in the future we find we need to move to 64‐bit flags, this type gives us an opportunity to do that. Bump the NDR version to 4.0.0 — an major version increment, for we’re changing the function ABI and adding the new symbol ndr_print_libndr_flags. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-10 06:47:03 +03:00
size_t ndr_size_security_ace(const struct security_ace *ace, libndr_flags flags)
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
{
ndr_sec_helper: ndr_size_security_ace: do less work Almost always the ACE has an `ignored` DATA_BLOB as the coda, and the length of the coda is the length field of the blob, which is usually zero. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-08-17 01:46:23 +03:00
size_t base = ndr_size_security_ace_core(ace, flags);
size_t ret = base;
if (sec_ace_callback(ace->type)) {
ret += ace->coda.conditions.length;
} else if (ace->type == SEC_ACE_TYPE_SYSTEM_RESOURCE_ATTRIBUTE) {
ret += ndr_size_security_ace_coda(&ace->coda, ace->type, flags);
} else {
ret += ace->coda.ignored.length;
}
ndr_sec_helper: ace length should be multiple of 4 Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-08-30 03:14:14 +03:00
/* round up to a multiple of 4 (MS-DTYP 2.4.4.1) */
ret = (ret + 3ULL) & ~3ULL;
ndr_sec_helper: ndr_size_security_ace: do less work Almost always the ACE has an `ignored` DATA_BLOB as the coda, and the length of the coda is the length field of the blob, which is usually zero. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-08-17 01:46:23 +03:00
if (unlikely(ret < base)) {
/* overflow, and there's not much we can do anyway */
return 0;
}
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
return ret;
}
ndr: shift ndr_pull_security_ace to manual code This was manual until commit c73034cf7c4392f5d3505319948bc84634c20fa5 (a few months ago). Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> BUG: https://bugzilla.samba.org/show_bug.cgi?id=15574
2023-12-31 03:03:32 +03:00
_PUBLIC_ enum ndr_err_code ndr_pull_security_ace(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct security_ace *r)
{
NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
if (ndr_flags & NDR_SCALARS) {
ndr: short-circuit ace coda if no bytes left The overwhelmingly common case is that there are no bytes left, and regardless of the ACE type we want to store an empty blob. We know the blob will be empty if there are no bytes, so we don't need to allocate a sub-ndr and tokens list and so forth. This can save almost half the time of a security descriptor pull. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> BUG: https://bugzilla.samba.org/show_bug.cgi?id=15574
2023-12-31 03:06:40 +03:00
ssize_t sub_size;
ndr: shift ndr_pull_security_ace to manual code This was manual until commit c73034cf7c4392f5d3505319948bc84634c20fa5 (a few months ago). Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> BUG: https://bugzilla.samba.org/show_bug.cgi?id=15574
2023-12-31 03:03:32 +03:00
NDR_CHECK(ndr_pull_align(ndr, 5));
NDR_CHECK(ndr_pull_security_ace_type(ndr, NDR_SCALARS, &r->type));
NDR_CHECK(ndr_pull_security_ace_flags(ndr, NDR_SCALARS, &r->flags));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->size));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->access_mask));
NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->object, sec_ace_object(r->type)));
NDR_CHECK(ndr_pull_security_ace_object_ctr(ndr, NDR_SCALARS, &r->object));
NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, &r->trustee));
ndr: short-circuit ace coda if no bytes left The overwhelmingly common case is that there are no bytes left, and regardless of the ACE type we want to store an empty blob. We know the blob will be empty if there are no bytes, so we don't need to allocate a sub-ndr and tokens list and so forth. This can save almost half the time of a security descriptor pull. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> BUG: https://bugzilla.samba.org/show_bug.cgi?id=15574
2023-12-31 03:06:40 +03:00
sub_size = ndr_subcontext_size_of_ace_coda(r, r->size, ndr->flags);
if (sub_size == 0) {
r->coda.ignored.data = NULL;
r->coda.ignored.length = 0;
} else {
ndr: shift ndr_pull_security_ace to manual code This was manual until commit c73034cf7c4392f5d3505319948bc84634c20fa5 (a few months ago). Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> BUG: https://bugzilla.samba.org/show_bug.cgi?id=15574
2023-12-31 03:03:32 +03:00
struct ndr_pull *_ndr_coda;
NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_coda, 0, sub_size));
NDR_CHECK(ndr_pull_set_switch_value(_ndr_coda, &r->coda, r->type));
NDR_CHECK(ndr_pull_security_ace_coda(_ndr_coda, NDR_SCALARS|NDR_BUFFERS, &r->coda));
NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_coda, 0, sub_size));
}
NDR_CHECK(ndr_pull_trailer_align(ndr, 5));
}
if (ndr_flags & NDR_BUFFERS) {
NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->object, sec_ace_object(r->type)));
NDR_CHECK(ndr_pull_security_ace_object_ctr(ndr, NDR_BUFFERS, &r->object));
}
return NDR_ERR_SUCCESS;
}
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
/*
* An ACE coda can't be bigger than the space allowed for by
* ace->size, so we need to check this from the context of the ACE.
*
* Usually the coda also can't be any smaller than the remaining
* space, because it is defined as a blob consuming everything it can.
*
* This is only used to find the size for the coda subcontext in
* security.idl.
*/
size_t ndr_subcontext_size_of_ace_coda(const struct security_ace *ace,
size_t ace_size,
librpc:ndr: Introduce ‘libndr_flags’ type The LIBNDR_FLAG_ namespace is getting dangerously full, with only a single flag value (1 << 9) remaining for use. After that flag is put into use, we won’t be able to add any new flags without increasing the flag width to 64‐bit. Up to now we’ve used a haphazard mix of int, unsigned, and uint32_t to store these flags. Introduce a new type, ‘libndr_flags’, to be used consistently to hold LIBNDR flags. If in the future we find we need to move to 64‐bit flags, this type gives us an opportunity to do that. Bump the NDR version to 4.0.0 — an major version increment, for we’re changing the function ABI and adding the new symbol ndr_print_libndr_flags. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-10 06:47:03 +03:00
libndr_flags flags)
security.idl: sometimes ACEs have some padding at the end metze
2008-11-07 12:49:59 +03:00
{
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
size_t core_size;
if (ace_size == 0) {
return 0;
security.idl: sometimes ACEs have some padding at the end metze
2008-11-07 12:49:59 +03:00
}
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
core_size = ndr_size_security_ace_core(ace, flags);
if (ace_size < core_size) {
return 0;
security.idl: sometimes ACEs have some padding at the end metze
2008-11-07 12:49:59 +03:00
}
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
return ace_size - core_size;
security.idl: sometimes ACEs have some padding at the end metze
2008-11-07 12:49:59 +03:00
}
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
/*
return the wire size of a security_acl
*/
librpc:ndr: Introduce ‘libndr_flags’ type The LIBNDR_FLAG_ namespace is getting dangerously full, with only a single flag value (1 << 9) remaining for use. After that flag is put into use, we won’t be able to add any new flags without increasing the flag width to 64‐bit. Up to now we’ve used a haphazard mix of int, unsigned, and uint32_t to store these flags. Introduce a new type, ‘libndr_flags’, to be used consistently to hold LIBNDR flags. If in the future we find we need to move to 64‐bit flags, this type gives us an opportunity to do that. Bump the NDR version to 4.0.0 — an major version increment, for we’re changing the function ABI and adding the new symbol ndr_print_libndr_flags. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-10 06:47:03 +03:00
size_t ndr_size_security_acl(const struct security_acl *theacl, libndr_flags flags)
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
{
size_t ret;
int i;
Quieten down a boatload of shadowed variable warnings on Solaris. Makes real problems easier to spot. Jeremy.
2009-02-24 02:03:29 +03:00
if (!theacl) return 0;
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
ret = 8;
Quieten down a boatload of shadowed variable warnings on Solaris. Makes real problems easier to spot. Jeremy.
2009-02-24 02:03:29 +03:00
for (i=0;i<theacl->num_aces;i++) {
Finish removal of iconv_convenience in public API's.
2010-05-09 19:20:01 +04:00
ret += ndr_size_security_ace(&theacl->aces[i], flags);
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
}
return ret;
}
/*
return the wire size of a security descriptor
*/
librpc:ndr: Introduce ‘libndr_flags’ type The LIBNDR_FLAG_ namespace is getting dangerously full, with only a single flag value (1 << 9) remaining for use. After that flag is put into use, we won’t be able to add any new flags without increasing the flag width to 64‐bit. Up to now we’ve used a haphazard mix of int, unsigned, and uint32_t to store these flags. Introduce a new type, ‘libndr_flags’, to be used consistently to hold LIBNDR flags. If in the future we find we need to move to 64‐bit flags, this type gives us an opportunity to do that. Bump the NDR version to 4.0.0 — an major version increment, for we’re changing the function ABI and adding the new symbol ndr_print_libndr_flags. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-10 06:47:03 +03:00
size_t ndr_size_security_descriptor(const struct security_descriptor *sd, libndr_flags flags)
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
{
size_t ret;
if (!sd) return 0;
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
ret = 20;
Finish removal of iconv_convenience in public API's.
2010-05-09 19:20:01 +04:00
ret += ndr_size_dom_sid(sd->owner_sid, flags);
ret += ndr_size_dom_sid(sd->group_sid, flags);
ret += ndr_size_security_acl(sd->dacl, flags);
ret += ndr_size_security_acl(sd->sacl, flags);
r6287: sorted out a small but surprisingly tricky dependency problem with the ndr code for handling sids and security descriptors now that we have a sid in the nbt IDL (This used to be commit f8e77fcdeac704aed5e501aa9108f3ed0ab26ca4)
2005-04-11 03:08:04 +04:00
return ret;
}
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
/*
return the wire size of a dom_sid
*/
librpc:ndr: Introduce ‘libndr_flags’ type The LIBNDR_FLAG_ namespace is getting dangerously full, with only a single flag value (1 << 9) remaining for use. After that flag is put into use, we won’t be able to add any new flags without increasing the flag width to 64‐bit. Up to now we’ve used a haphazard mix of int, unsigned, and uint32_t to store these flags. Introduce a new type, ‘libndr_flags’, to be used consistently to hold LIBNDR flags. If in the future we find we need to move to 64‐bit flags, this type gives us an opportunity to do that. Bump the NDR version to 4.0.0 — an major version increment, for we’re changing the function ABI and adding the new symbol ndr_print_libndr_flags. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-10 06:47:03 +03:00
size_t ndr_size_dom_sid(const struct dom_sid *sid, libndr_flags flags)
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
{
if (!sid) return 0;
return 8 + 4*sid->num_auths;
}
librpc:ndr: Introduce ‘libndr_flags’ type The LIBNDR_FLAG_ namespace is getting dangerously full, with only a single flag value (1 << 9) remaining for use. After that flag is put into use, we won’t be able to add any new flags without increasing the flag width to 64‐bit. Up to now we’ve used a haphazard mix of int, unsigned, and uint32_t to store these flags. Introduce a new type, ‘libndr_flags’, to be used consistently to hold LIBNDR flags. If in the future we find we need to move to 64‐bit flags, this type gives us an opportunity to do that. Bump the NDR version to 4.0.0 — an major version increment, for we’re changing the function ABI and adding the new symbol ndr_print_libndr_flags. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-10 06:47:03 +03:00
size_t ndr_size_dom_sid28(const struct dom_sid *sid, libndr_flags flags)
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
{
librpc: Use "all_zero" where appropriate ... Saves a few bytes of footprint Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
2016-12-31 15:45:51 +03:00
if (all_zero((const uint8_t *)sid, sizeof(struct dom_sid))) {
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
return 0;
}
librpc: Simplify ndr_size_dom_sid28() Don't duplicate the calculation Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
2022-08-31 18:35:42 +03:00
return ndr_size_dom_sid(sid, flags);
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
}
librpc:ndr: Introduce ‘libndr_flags’ type The LIBNDR_FLAG_ namespace is getting dangerously full, with only a single flag value (1 << 9) remaining for use. After that flag is put into use, we won’t be able to add any new flags without increasing the flag width to 64‐bit. Up to now we’ve used a haphazard mix of int, unsigned, and uint32_t to store these flags. Introduce a new type, ‘libndr_flags’, to be used consistently to hold LIBNDR flags. If in the future we find we need to move to 64‐bit flags, this type gives us an opportunity to do that. Bump the NDR version to 4.0.0 — an major version increment, for we’re changing the function ABI and adding the new symbol ndr_print_libndr_flags. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-10 06:47:03 +03:00
size_t ndr_size_dom_sid0(const struct dom_sid *sid, libndr_flags flags)
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
{
return ndr_size_dom_sid28(sid, flags);
}
/*
print a dom_sid
*/
void ndr_print_dom_sid(struct ndr_print *ndr, const char *name, const struct dom_sid *sid)
{
libndr: Use dom_sid_str_buf Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
2018-12-21 11:32:41 +03:00
struct dom_sid_buf buf;
ndr->print(ndr, "%-25s: %s", name, dom_sid_str_buf(sid, &buf));
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
}
void ndr_print_dom_sid2(struct ndr_print *ndr, const char *name, const struct dom_sid *sid)
{
ndr_print_dom_sid(ndr, name, sid);
}
void ndr_print_dom_sid28(struct ndr_print *ndr, const char *name, const struct dom_sid *sid)
{
ndr_print_dom_sid(ndr, name, sid);
}
void ndr_print_dom_sid0(struct ndr_print *ndr, const char *name, const struct dom_sid *sid)
{
ndr_print_dom_sid(ndr, name, sid);
}
/*
parse a dom_sid2 - this is a dom_sid but with an extra copy of the num_auths field
*/
librpc:ndr: Introduce ‘ndr_flags_type’ type Instead of ‘int’ or ‘uint32_t’, neither of which convey much meaning, consistently use a newly added type to hold NDR_ flags. Update the NDR 4.0.0 ABI. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-10-27 04:41:17 +03:00
enum ndr_err_code ndr_pull_dom_sid2(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct dom_sid *sid)
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
{
uint32_t num_auths;
if (!(ndr_flags & NDR_SCALARS)) {
return NDR_ERR_SUCCESS;
}
ndr: num_auths is an array size, thus a uint3264
2009-09-18 02:15:24 +04:00
NDR_CHECK(ndr_pull_uint3264(ndr, NDR_SCALARS, &num_auths));
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
NDR_CHECK(ndr_pull_dom_sid(ndr, ndr_flags, sid));
if (sid->num_auths != num_auths) {
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE,
librpc/ndr: Use portable format specifiers Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2021-05-11 01:28:07 +03:00
"Bad num_auths %"PRIu32"; should equal %"PRId8,
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
num_auths, sid->num_auths);
}
return NDR_ERR_SUCCESS;
}
/*
parse a dom_sid2 - this is a dom_sid but with an extra copy of the num_auths field
*/
librpc:ndr: Introduce ‘ndr_flags_type’ type Instead of ‘int’ or ‘uint32_t’, neither of which convey much meaning, consistently use a newly added type to hold NDR_ flags. Update the NDR 4.0.0 ABI. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-10-27 04:41:17 +03:00
enum ndr_err_code ndr_push_dom_sid2(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct dom_sid *sid)
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
{
if (!(ndr_flags & NDR_SCALARS)) {
return NDR_ERR_SUCCESS;
}
ndr: num_auths is an array size, thus a uint3264
2009-09-18 02:15:24 +04:00
NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, sid->num_auths));
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
return ndr_push_dom_sid(ndr, ndr_flags, sid);
}
/*
Spelling fixes s/ upto / up to / Signed-off-by: Mathieu Parent <math.parent@gmail.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
2019-08-29 23:19:42 +03:00
parse a dom_sid28 - this is a dom_sid in a fixed 28 byte buffer, so we need to ensure there are only up to 5 sub_auth
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
*/
librpc:ndr: Introduce ‘ndr_flags_type’ type Instead of ‘int’ or ‘uint32_t’, neither of which convey much meaning, consistently use a newly added type to hold NDR_ flags. Update the NDR 4.0.0 ABI. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-10-27 04:41:17 +03:00
enum ndr_err_code ndr_pull_dom_sid28(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct dom_sid *sid)
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
{
enum ndr_err_code status;
struct ndr_pull *subndr;
if (!(ndr_flags & NDR_SCALARS)) {
return NDR_ERR_SUCCESS;
}
subndr = talloc_zero(ndr, struct ndr_pull);
NDR_ERR_HAVE_NO_MEMORY(subndr);
subndr->flags = ndr->flags;
subndr->current_mem_ctx = ndr->current_mem_ctx;
subndr->data = ndr->data + ndr->offset;
subndr->data_size = 28;
subndr->offset = 0;
librpc:ndr: Fix leaks Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-08-07 04:46:50 +03:00
status = ndr_pull_advance(ndr, 28);
if (!NDR_ERR_CODE_IS_SUCCESS(status)) {
talloc_free(subndr);
return status;
}
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
status = ndr_pull_dom_sid(subndr, ndr_flags, sid);
if (!NDR_ERR_CODE_IS_SUCCESS(status)) {
/* handle a w2k bug which send random data in the buffer */
ZERO_STRUCTP(sid);
ndr: Comparing an array to null is always true. Reviewed-by: Alexander Bokovoy <ab@samba.org>
2013-02-18 20:08:21 +04:00
} else if (sid->num_auths == 0) {
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
ZERO_STRUCT(sid->sub_auths);
}
librpc:ndr: Fix leaks Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-08-07 04:46:50 +03:00
talloc_free(subndr);
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
return NDR_ERR_SUCCESS;
}
/*
push a dom_sid28 - this is a dom_sid in a 28 byte fixed buffer
*/
librpc:ndr: Introduce ‘ndr_flags_type’ type Instead of ‘int’ or ‘uint32_t’, neither of which convey much meaning, consistently use a newly added type to hold NDR_ flags. Update the NDR 4.0.0 ABI. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-10-27 04:41:17 +03:00
enum ndr_err_code ndr_push_dom_sid28(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct dom_sid *sid)
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
{
uint32_t old_offset;
uint32_t padding;
if (!(ndr_flags & NDR_SCALARS)) {
return NDR_ERR_SUCCESS;
}
if (sid->num_auths > 5) {
librpc/security.idl: adjust size calculations for upcoming ace types Soon we will get Conditional ACEs and Resource Attribute ACES, each of which have trailing bytes at the end of the ACE. Here's a diagram: ____ The ACE size field may indicate a size bigger .type / | than the known parts, even when you take .flags / | rounding to a multiple of four into account. .size --' | This extra data is meaningful in some ACEs. .access_mask | .trustee (sid) _| <- known data ends here. : "coda" ___: <- the trailing part, Zero size unless the size field points beyond the end of the known data. Probably empty for ordinary ACE types. Until now we have thrown away these extra bytes, because they have no meaning in the ACE types we recognise. But with conditional and resource attribute ACEs we need to catch and process these bytes, so we add an extra field for that. Thus we can drop the manually written ndr_pull_security_ace() that discarded the trailing bytes, because we just allow it to be pulled into an unused blob. In the very common case, the blob will be empty. Microsoft does not use a common name across different ACE types to describe this end-data -- "coda" is a Samba term. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-07-13 12:31:50 +03:00
return ndr_push_error(ndr, NDR_ERR_RANGE,
librpc/ndr: Use portable format specifiers Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2021-05-11 01:28:07 +03:00
"dom_sid28 allows only up to 5 sub auths [%"PRId8"]",
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
sid->num_auths);
}
old_offset = ndr->offset;
NDR_CHECK(ndr_push_dom_sid(ndr, ndr_flags, sid));
padding = 28 - (ndr->offset - old_offset);
if (padding > 0) {
NDR_CHECK(ndr_push_zero(ndr, padding));
}
return NDR_ERR_SUCCESS;
}
/*
parse a dom_sid0 - this is a dom_sid in a variable byte buffer, which is maybe empty
*/
librpc:ndr: Introduce ‘ndr_flags_type’ type Instead of ‘int’ or ‘uint32_t’, neither of which convey much meaning, consistently use a newly added type to hold NDR_ flags. Update the NDR 4.0.0 ABI. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-10-27 04:41:17 +03:00
enum ndr_err_code ndr_pull_dom_sid0(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct dom_sid *sid)
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
{
if (!(ndr_flags & NDR_SCALARS)) {
return NDR_ERR_SUCCESS;
}
if (ndr->data_size == ndr->offset) {
ZERO_STRUCTP(sid);
return NDR_ERR_SUCCESS;
}
return ndr_pull_dom_sid(ndr, ndr_flags, sid);
}
/*
push a dom_sid0 - this is a dom_sid in a variable byte buffer, which is maybe empty
*/
librpc:ndr: Introduce ‘ndr_flags_type’ type Instead of ‘int’ or ‘uint32_t’, neither of which convey much meaning, consistently use a newly added type to hold NDR_ flags. Update the NDR 4.0.0 ABI. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-10-27 04:41:17 +03:00
enum ndr_err_code ndr_push_dom_sid0(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct dom_sid *sid)
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
{
if (!(ndr_flags & NDR_SCALARS)) {
return NDR_ERR_SUCCESS;
}
if (!sid) {
return NDR_ERR_SUCCESS;
}
librpc: Use "all_zero" where appropriate ... Saves a few bytes of footprint Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
2016-12-31 15:45:51 +03:00
if (all_zero((const uint8_t *)sid, sizeof(struct dom_sid))) {
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
return NDR_ERR_SUCCESS;
}
return ndr_push_dom_sid(ndr, ndr_flags, sid);
}
librpc:ndr: Introduce ‘ndr_flags_type’ type Instead of ‘int’ or ‘uint32_t’, neither of which convey much meaning, consistently use a newly added type to hold NDR_ flags. Update the NDR 4.0.0 ABI. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-10-27 04:41:17 +03:00
_PUBLIC_ enum ndr_err_code ndr_push_dom_sid(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct dom_sid *r)
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
{
uint32_t cntr_sub_auths_0;
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->sid_rev_num));
NDR_CHECK(ndr_push_int8(ndr, NDR_SCALARS, r->num_auths));
NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->id_auth, 6));
ndr: range check on push of dom_sid blob this ensures we get an error if we try to push a dom_sid with too many sub_auths Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-05 10:41:21 +04:00
if (r->num_auths < 0 || r->num_auths > ARRAY_SIZE(r->sub_auths)) {
ndr: Display values for failed range checks BUG: https://bugzilla.samba.org/show_bug.cgi?id=9914 Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2021-05-04 05:09:44 +03:00
return ndr_push_error(ndr, NDR_ERR_RANGE, "value (%"PRId8") out of range (0 - %zu)", r->num_auths, ARRAY_SIZE(r->sub_auths));
ndr: range check on push of dom_sid blob this ensures we get an error if we try to push a dom_sid with too many sub_auths Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-05 10:41:21 +04:00
}
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
for (cntr_sub_auths_0 = 0; cntr_sub_auths_0 < r->num_auths; cntr_sub_auths_0++) {
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->sub_auths[cntr_sub_auths_0]));
}
}
return NDR_ERR_SUCCESS;
}
librpc:ndr: Introduce ‘ndr_flags_type’ type Instead of ‘int’ or ‘uint32_t’, neither of which convey much meaning, consistently use a newly added type to hold NDR_ flags. Update the NDR 4.0.0 ABI. Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2023-10-27 04:41:17 +03:00
_PUBLIC_ enum ndr_err_code ndr_pull_dom_sid(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct dom_sid *r)
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
{
uint32_t cntr_sub_auths_0;
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->sid_rev_num));
NDR_CHECK(ndr_pull_int8(ndr, NDR_SCALARS, &r->num_auths));
ndr: range check on push of dom_sid blob this ensures we get an error if we try to push a dom_sid with too many sub_auths Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-05 10:41:21 +04:00
if (r->num_auths < 0 || r->num_auths > ARRAY_SIZE(r->sub_auths)) {
ndr: Display values for failed range checks BUG: https://bugzilla.samba.org/show_bug.cgi?id=9914 Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2021-05-04 05:09:44 +03:00
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value (%"PRId8") out of range (0 - %zu)", r->num_auths, ARRAY_SIZE(r->sub_auths));
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
}
NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->id_auth, 6));
librpc/ndr: Initilaise the remainder of struct dom_sid after a pull This copes with the fact that r->sub_auths is a fixed-size array, not an allocated pointer, and so will still have some bytes no filled in if the sid did not have a MAX_SUB_AUTHS sub-authorities. Andrew Bartlett
2012-06-26 14:07:32 +04:00
ZERO_STRUCT(r->sub_auths);
Move dom_sid to the Samba 3 IDL file, remove the old definition.
2008-12-12 22:20:01 +03:00
for (cntr_sub_auths_0 = 0; cntr_sub_auths_0 < r->num_auths; cntr_sub_auths_0++) {
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sub_auths[cntr_sub_auths_0]));
}
}
return NDR_ERR_SUCCESS;
}
Copy Permalink