From 66fa6885551e3d16692f5dab23f9c7bdf0c52e66 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Mon, 1 Jan 2024 21:48:15 +1300 Subject: [PATCH] perftest: ndr_pack_performance gets more SD types Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett BUG: https://bugzilla.samba.org/show_bug.cgi?id=15574 (cherry picked from commit e802611743a9b899c18d6eeaa0a46323b676c296) --- .../dsdb/tests/python/ndr_pack_performance.py | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/source4/dsdb/tests/python/ndr_pack_performance.py b/source4/dsdb/tests/python/ndr_pack_performance.py index e7586028e90..0ff03a27f21 100644 --- a/source4/dsdb/tests/python/ndr_pack_performance.py +++ b/source4/dsdb/tests/python/ndr_pack_performance.py @@ -130,6 +130,23 @@ IOID;RP;5f202010-79a5-11d0-9020-00c04fc2d4cf;bf967aba-0de6-11d0-a285-00aa0030 0aa003049e2;RU)(OA;CIIOID;RP;b7c69e6d-2cc7-11d2-854e-00a0c983f608;bf967a86-0d e6-11d0-a285-00aa003049e2;ED)""".split()) + +CONDITIONAL_ACE_SDDL = ('O:SYG:SYD:(XA;OICI;CR;;;WD;' + '(@USER.ad://ext/AuthenticationSilo == "siloname"))') + +NON_OBJECT_SDDL = ( + "O:S-1-5-21-2212615479-2695158682-2101375468-512" + "G:S-1-5-21-2212615479-2695158682-2101375468-513" + "D:P(A;OICI;FA;;;S-1-5-21-2212615479-2695158682-2101375468-512)" + "(A;OICI;FA;;;S-1-5-21-2212615479-2695158682-2101375468-519)" + "(A;OICIIO;FA;;;CO)" + "(A;OICI;FA;;;S-1-5-21-2212615479-2695158682-2101375468-512)" + "(A;OICI;FA;;;SY)" + "(A;OICI;0x1200a9;;;AU)" + "(A;OICI;0x1200a9;;;ED)") + + + # set SCALE = 100 for normal test, or 1 for testing the test. SCALE = 100 @@ -195,6 +212,30 @@ class UserTests(samba.tests.TestCase): unpacked = self.get_desc(LITTLE_SD_SDDL) self._test_pack_unpack(unpacked) + def test_pack_conditional_ace_sd(self): + unpacked = self.get_desc(CONDITIONAL_ACE_SDDL) + self._test_pack(unpacked) + + def test_unpack_conditional_ace_sd(self): + blob = self.get_blob(CONDITIONAL_ACE_SDDL) + self._test_unpack(blob) + + def test_pack_unpack_conditional_ace_sd(self): + unpacked = self.get_desc(CONDITIONAL_ACE_SDDL) + self._test_pack_unpack(unpacked) + + def test_pack_non_object_sd(self): + unpacked = self.get_desc(NON_OBJECT_SDDL) + self._test_pack(unpacked) + + def test_unpack_non_object_sd(self): + blob = self.get_blob(NON_OBJECT_SDDL) + self._test_unpack(blob) + + def test_pack_unpack_non_object_sd(self): + unpacked = self.get_desc(NON_OBJECT_SDDL) + self._test_pack_unpack(unpacked) + def test_unpack_repl_sample(self): blob = self.get_file_blob('testdata/replication-ndrpack-example.gz') self._test_unpack(blob, cycles=20, cls=drsuapi.DsGetNCChangesCtr6) -- 2.34.1