Skip to content

gh-118773: Use language-invariant SDDL string instead of aliases for ACLs. #118800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 3 commits into from
May 9, 2024
Merged

gh-118773: Use language-invariant SDDL string instead of aliases for ACLs. #118800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25afdd7
gh-118773: Use well-known constants instead of aliases for ACLs.
zooba May 8, 2024
99ae180
Switch to SDDL string
zooba May 9, 2024
9216aa3
Review feedback
zooba May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
gh-118773: Use well-known constants instead of aliases for ACLs.
  • Loading branch information
@zooba
zooba committed May 8, 2024
commit 25afdd7fbb60a811a085cc56fc405c13dbf2f942
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Security/2024-05-08-21-59-38.gh-issue-118773.7dFRJY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixes creation of ACLs in :func:`os.mkdir` on Windows to work correctly on
non-English machines.
46 changes: 24 additions & 22 deletions Modules/posixmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5587,9 +5587,18 @@ struct _Py_SECURITY_ATTRIBUTE_DATA {
PACL acl;
SECURITY_DESCRIPTOR sd;
EXPLICIT_ACCESS_W ea[4];
char sid[64];
BYTE sidAdmins[SECURITY_MAX_SID_SIZE];
BYTE sidSystem[SECURITY_MAX_SID_SIZE];
BYTE sidCreator[SECURITY_MAX_SID_SIZE];
};

static int
_initializeSid(BYTE *sid, WELL_KNOWN_SID_TYPE sidType)
{
DWORD cbSid = SECURITY_MAX_SID_SIZE;
return CreateWellKnownSid(sidType, NULL, sid, &cbSid) ? 1 : 0;
}

static int
initializeDefaultSecurityAttributes(
PSECURITY_ATTRIBUTES *securityAttributes,
Expand All @@ -5612,44 +5621,37 @@ initializeMkdir700SecurityAttributes(
*securityAttributes = NULL;
memset(data, 0, sizeof(*data));

SID_IDENTIFIER_AUTHORITY SidNtAuthority = SECURITY_NT_AUTHORITY;
if (!InitializeSecurityDescriptor(&data->sd, SECURITY_DESCRIPTOR_REVISION)
|| !SetSecurityDescriptorGroup(&data->sd, NULL, TRUE)) {
|| !SetSecurityDescriptorGroup(&data->sd, NULL, TRUE)
|| !_initializeSid(data->sidAdmins, WinBuiltinAdministratorsSid)
|| !_initializeSid(data->sidSystem, WinLocalSystemSid)
|| !_initializeSid(data->sidCreator, WinCreatorOwnerRightsSid)
) {
return GetLastError();
}

int use_alias = 0;
DWORD cbSid = sizeof(data->sid);
if (!CreateWellKnownSid(WinCreatorOwnerRightsSid, NULL, (PSID)data->sid, &cbSid)) {
use_alias = 1;
}

data->securityAttributes.nLength = sizeof(SECURITY_ATTRIBUTES);
data->ea[0].grfAccessPermissions = GENERIC_ALL;
data->ea[0].grfAccessMode = SET_ACCESS;
data->ea[0].grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT;
if (use_alias) {
data->ea[0].Trustee.TrusteeForm = TRUSTEE_IS_NAME;
data->ea[0].Trustee.TrusteeType = TRUSTEE_IS_ALIAS;
data->ea[0].Trustee.ptstrName = L"CURRENT_USER";
} else {
data->ea[0].Trustee.TrusteeForm = TRUSTEE_IS_SID;
data->ea[0].Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP;
data->ea[0].Trustee.ptstrName = (LPWCH)(SID*)data->sid;
}
data->ea[0].Trustee.TrusteeForm = TRUSTEE_IS_SID;
data->ea[0].Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP;
data->ea[0].Trustee.ptstrName = (LPWCH)data->sidSystem;

data->ea[1].grfAccessPermissions = GENERIC_ALL;
data->ea[1].grfAccessMode = SET_ACCESS;
data->ea[1].grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT;
data->ea[1].Trustee.TrusteeForm = TRUSTEE_IS_NAME;
data->ea[1].Trustee.TrusteeType = TRUSTEE_IS_ALIAS;
data->ea[1].Trustee.ptstrName = L"SYSTEM";
data->ea[1].Trustee.TrusteeForm = TRUSTEE_IS_SID;
data->ea[1].Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP;
data->ea[1].Trustee.ptstrName = (LPWCH)data->sidAdmins;

data->ea[2].grfAccessPermissions = GENERIC_ALL;
data->ea[2].grfAccessMode = SET_ACCESS;
data->ea[2].grfInheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT;
data->ea[2].Trustee.TrusteeForm = TRUSTEE_IS_NAME;
data->ea[2].Trustee.TrusteeForm = TRUSTEE_IS_SID;
data->ea[2].Trustee.TrusteeType = TRUSTEE_IS_ALIAS;
data->ea[2].Trustee.ptstrName = L"ADMINISTRATORS";
data->ea[2].Trustee.ptstrName = (LPWCH)data->sidCreator;

int r = SetEntriesInAclW(3, data->ea, NULL, &data->acl);
if (r) {
Expand Down