From: Douglas Bagnall Date: Tue, 25 Apr 2023 22:33:12 +0000 (+1200) Subject: pytest:sddl: test we only accept normal GUIDs X-Git-Tag: talloc-2.4.1~798 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e90ba7ec6f022264d6764774cfa22993a6d9ca9;p=thirdparty%2Fsamba.git pytest:sddl: test we only accept normal GUIDs By normal GUID, I mean ones like f30e3bbf-9ff0-11d1-b603-0000f80367c1, with four hyphens and no curly braces. Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/sddl.py b/python/samba/tests/sddl.py index b8750880d6d..c1996de75ce 100644 --- a/python/samba/tests/sddl.py +++ b/python/samba/tests/sddl.py @@ -657,6 +657,15 @@ class SddlShouldFail(SddlDecodeEncodeBase): "D:(A;;GA;; f30e3bbf-9ff0-11d1-b603-0000f80367c1;WD)", "D:(A;;GA;;f30e3bbf-9ff0-11d1-b603-0000f80367c1 ;WD)", + # Samba used to use GUID_from_string(), which would take + # anything GUID-ish, including {}-wrapped GUIDs, hyphen-less + # hexstrings, and 16 raw bytes. But we only want one kind. + "D:(A;;GA;;{f30e3bbf-9ff0-11d1-b603-0000f80367c1};WD)", + # would have been treated as raw bytes. + "D:(A;;GA;;0123456789abcdef;WD)", + # would have been 16 hex pairs. + "D:(A;;GA;;0123456789abcdef0123456789abcdef;WD)", + # space splits a flag in half. "D:AI(A;CI;RP LCLOR C;;;AU)", # tabs in flags diff --git a/selftest/knownfail.d/sddl b/selftest/knownfail.d/sddl index cf38e28bb4a..44c018ac8d7 100644 --- a/selftest/knownfail.d/sddl +++ b/selftest/knownfail.d/sddl @@ -1,3 +1,6 @@ -^samba.tests.sddl.+.SddlWindowsFlagsAreDifferent.test_sddl_D:.A;;0x001f01ff;;;WD..A;;0x001f01ff;;;S-1.+S +^samba.tests.sddl.+.SddlShouldFail.test_sddl_should_fail_D:.A;;GA;;0123456789abcdef0123456789abcdef;WD..none +^samba.tests.sddl.+.SddlShouldFail.test_sddl_should_fail_D:.A;;GA;;0123456789abcdef;WD..none +^samba.tests.sddl.+.SddlShouldFail.test_sddl_should_fail_D:.A;;GA;;{f30e3bbf-9ff0-11d1-b603-0000f80367c1};WD..none +^samba.tests.sddl.+.SddlWindowsFlagsAreDifferent.test_sddl_D:.A;;0x001f01ff;;;WD..A;;0x001f01ff;;;S-1-5-21-11111111-22222222-33333333-1001..A;;0x001f01ff;;;S-1.11522-more-characters.none ^samba.tests.sddl.+.SddlWindowsFlagsAreDifferent.test_sddl_D:.A;;FA;;;WD..none -^samba.tests.sddl.+.SddlWindowsFlagsAreDifferent.test_sddl_O:S-1-5-21-2212615479-2695158682-210137546.+: +^samba.tests.sddl.+.SddlWindowsFlagsAreDifferent.test_sddl_O:S-1-5-21-2212615479-2695158682-2101375468-512G:S-1-5-21-2212615479-2695158682-2101375468-513D:P.A;.482-more-characters.none