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

pytest:sddl: show the correct handling of the "FA" SDDL flag

The "FA" flag should map to 0x1f01ff, and 0x1f01ff should be converted
back into "FA".

This will be fixed over the next couple of commits.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2023-04-26 17:00:17 +12:00
parent 334afc7157
commit 9fc6062bd3
2 changed files with 13 additions and 1 deletions

View File

@ -616,6 +616,13 @@ class SddlNonCanonical(SddlDecodeEncodeBase):
"(OU;CIIDSA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;" "(OU;CIIDSA;WP;f30e3bbf-9ff0-11d1-b603-0000f80367c1;"
"bf967aa5-0de6-11d0-a285-00aa003049e2;WD)")), "bf967aa5-0de6-11d0-a285-00aa003049e2;WD)")),
(("O:LAG:BAD:P(A;OICI;0x1f01ff;;;BA)"),
("O:LAG:BAD:P(A;OICI;FA;;;BA)")),
(("O:LAG:BAD:(A;;0x1ff;;;WD)",
("O:LAG:BAD:(A;;CCDCLCSWRPWPDTLOCR;;;WD)"))),
("D:(A;;FAGX;;;SY)", "D:(A;;0x201f01ff;;;SY)"),
] ]
@ -649,7 +656,10 @@ class SddlCanonical(SddlDecodeEncodeBase):
"O:S-1-2-512D:", "O:S-1-2-512D:",
"D:PARAI(A;;GA;;;SY)", "D:PARAI(A;;GA;;;SY)",
"D:P(A;;GA;;;LG)(A;;GX;;;AA)", "D:P(A;;GA;;;LG)(A;;GX;;;AA)",
"D:(A;;FA;;;WD)" "D:(A;;FA;;;WD)",
"D:(A;;CCDCLCSWRPWPDTLOCR;;;WD)",
"D:(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)"
] ]

View File

@ -1,3 +1,5 @@
^samba.tests.sddl.+.SddlCanonical.test_sddl_D:.A;;FA;;;WD..none ^samba.tests.sddl.+.SddlCanonical.test_sddl_D:.A;;FA;;;WD..none
^samba.tests.sddl.+.SddlNonCanonical.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.+.SddlNonCanonical.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.+.SddlNonCanonical.test_sddl_D:.A;;FAGX;;;SY..none
^samba.tests.sddl.+.SddlNonCanonical.test_sddl_O:LAG:BAD:P.A;OICI;0x1f01ff;;;BA..none
^samba.tests.sddl.+.SddlNonCanonical.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 ^samba.tests.sddl.+.SddlNonCanonical.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