Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit25afdd7

Browse files
committed
gh-118773: Use well-known constants instead of aliases for ACLs.
1 parent8d84120 commit25afdd7

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fixes creation of ACLs in:func:`os.mkdir` on Windows to work correctly on
2+
non-English machines.

‎Modules/posixmodule.c‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5587,9 +5587,18 @@ struct _Py_SECURITY_ATTRIBUTE_DATA {
55875587
PACLacl;
55885588
SECURITY_DESCRIPTORsd;
55895589
EXPLICIT_ACCESS_Wea[4];
5590-
charsid[64];
5590+
BYTEsidAdmins[SECURITY_MAX_SID_SIZE];
5591+
BYTEsidSystem[SECURITY_MAX_SID_SIZE];
5592+
BYTEsidCreator[SECURITY_MAX_SID_SIZE];
55915593
};
55925594

5595+
staticint
5596+
_initializeSid(BYTE*sid,WELL_KNOWN_SID_TYPEsidType)
5597+
{
5598+
DWORDcbSid=SECURITY_MAX_SID_SIZE;
5599+
returnCreateWellKnownSid(sidType,NULL,sid,&cbSid) ?1 :0;
5600+
}
5601+
55935602
staticint
55945603
initializeDefaultSecurityAttributes(
55955604
PSECURITY_ATTRIBUTES*securityAttributes,
@@ -5612,44 +5621,37 @@ initializeMkdir700SecurityAttributes(
56125621
*securityAttributes=NULL;
56135622
memset(data,0,sizeof(*data));
56145623

5624+
SID_IDENTIFIER_AUTHORITYSidNtAuthority=SECURITY_NT_AUTHORITY;
56155625
if (!InitializeSecurityDescriptor(&data->sd,SECURITY_DESCRIPTOR_REVISION)
5616-
|| !SetSecurityDescriptorGroup(&data->sd,NULL, TRUE)) {
5626+
|| !SetSecurityDescriptorGroup(&data->sd,NULL, TRUE)
5627+
|| !_initializeSid(data->sidAdmins,WinBuiltinAdministratorsSid)
5628+
|| !_initializeSid(data->sidSystem,WinLocalSystemSid)
5629+
|| !_initializeSid(data->sidCreator,WinCreatorOwnerRightsSid)
5630+
) {
56175631
returnGetLastError();
56185632
}
56195633

5620-
intuse_alias=0;
5621-
DWORDcbSid=sizeof(data->sid);
5622-
if (!CreateWellKnownSid(WinCreatorOwnerRightsSid,NULL, (PSID)data->sid,&cbSid)) {
5623-
use_alias=1;
5624-
}
5625-
56265634
data->securityAttributes.nLength=sizeof(SECURITY_ATTRIBUTES);
56275635
data->ea[0].grfAccessPermissions=GENERIC_ALL;
56285636
data->ea[0].grfAccessMode=SET_ACCESS;
56295637
data->ea[0].grfInheritance=SUB_CONTAINERS_AND_OBJECTS_INHERIT;
5630-
if (use_alias) {
5631-
data->ea[0].Trustee.TrusteeForm=TRUSTEE_IS_NAME;
5632-
data->ea[0].Trustee.TrusteeType=TRUSTEE_IS_ALIAS;
5633-
data->ea[0].Trustee.ptstrName=L"CURRENT_USER";
5634-
}else {
5635-
data->ea[0].Trustee.TrusteeForm=TRUSTEE_IS_SID;
5636-
data->ea[0].Trustee.TrusteeType=TRUSTEE_IS_WELL_KNOWN_GROUP;
5637-
data->ea[0].Trustee.ptstrName= (LPWCH)(SID*)data->sid;
5638-
}
5638+
data->ea[0].Trustee.TrusteeForm=TRUSTEE_IS_SID;
5639+
data->ea[0].Trustee.TrusteeType=TRUSTEE_IS_WELL_KNOWN_GROUP;
5640+
data->ea[0].Trustee.ptstrName= (LPWCH)data->sidSystem;
56395641

56405642
data->ea[1].grfAccessPermissions=GENERIC_ALL;
56415643
data->ea[1].grfAccessMode=SET_ACCESS;
56425644
data->ea[1].grfInheritance=SUB_CONTAINERS_AND_OBJECTS_INHERIT;
5643-
data->ea[1].Trustee.TrusteeForm=TRUSTEE_IS_NAME;
5644-
data->ea[1].Trustee.TrusteeType=TRUSTEE_IS_ALIAS;
5645-
data->ea[1].Trustee.ptstrName=L"SYSTEM";
5645+
data->ea[1].Trustee.TrusteeForm=TRUSTEE_IS_SID;
5646+
data->ea[1].Trustee.TrusteeType=TRUSTEE_IS_WELL_KNOWN_GROUP;
5647+
data->ea[1].Trustee.ptstrName=(LPWCH)data->sidAdmins;
56465648

56475649
data->ea[2].grfAccessPermissions=GENERIC_ALL;
56485650
data->ea[2].grfAccessMode=SET_ACCESS;
56495651
data->ea[2].grfInheritance=SUB_CONTAINERS_AND_OBJECTS_INHERIT;
5650-
data->ea[2].Trustee.TrusteeForm=TRUSTEE_IS_NAME;
5652+
data->ea[2].Trustee.TrusteeForm=TRUSTEE_IS_SID;
56515653
data->ea[2].Trustee.TrusteeType=TRUSTEE_IS_ALIAS;
5652-
data->ea[2].Trustee.ptstrName=L"ADMINISTRATORS";
5654+
data->ea[2].Trustee.ptstrName=(LPWCH)data->sidCreator;
56535655

56545656
intr=SetEntriesInAclW(3,data->ea,NULL,&data->acl);
56555657
if (r) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp