kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

builder: fixPermissionsWindows(): use golang.org/x/sys/windows

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-03-09 12:42:08 +01:00
parent 3bba43b894
commit 70a4d886cd
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
builder/dockerfile/copy_windows.go
View file

@ -67,21 +67,17 @@ func fixPermissionsWindows(source, destination, SID string) error {
sddlString := system.SddlAdministratorsLocalSystem sddlString := system.SddlAdministratorsLocalSystem
sddlString += "(A;OICI;GRGWGXRCWDSD;;;" + SID + ")" sddlString += "(A;OICI;GRGWGXRCWDSD;;;" + SID + ")"
securityDescriptor, err := winio.SddlToSecurityDescriptor(sddlString) securityDescriptor, err := windows.SecurityDescriptorFromString(sddlString)
if err != nil { if err != nil {
return err return err
} }
var daclPresent uint32 dacl, _, err := securityDescriptor.DACL()
var daclDefaulted uint32
var dacl *byte
err = system.GetSecurityDescriptorDacl(&securityDescriptor[0], &daclPresent, &dacl, &daclDefaulted)
if err != nil { if err != nil {
return err return err
} }
return system.SetNamedSecurityInfo(windows.StringToUTF16Ptr(destination), windows.SE_FILE_OBJECT, windows.OWNER_SECURITY_INFORMATION|windows.DACL_SECURITY_INFORMATION, sid, nil, dacl, nil) return windows.SetNamedSecurityInfo(destination, windows.SE_FILE_OBJECT, windows.OWNER_SECURITY_INFORMATION|windows.DACL_SECURITY_INFORMATION, sid, nil, dacl, nil)
} }
func validateCopySourcePath(imageSource *imageMount, origPath, platform string) error { func validateCopySourcePath(imageSource *imageMount, origPath, platform string) error {