mirror of
https://github.com/restic/restic.git
synced 2026-02-03 12:29:37 -05:00
b9afdf795e
Some checks failed
Create and publish a Docker image / build-and-push-image (push) Has been cancelled
test / Linux Go 1.24.x (push) Has been cancelled
test / Linux (race) Go 1.25.x (push) Has been cancelled
test / Windows Go 1.25.x (push) Has been cancelled
test / macOS Go 1.25.x (push) Has been cancelled
test / Linux Go 1.25.x (push) Has been cancelled
test / Cross Compile for subset 0/3 (push) Has been cancelled
test / Cross Compile for subset 1/3 (push) Has been cancelled
test / Cross Compile for subset 2/3 (push) Has been cancelled
test / lint (push) Has been cancelled
test / docker (push) Has been cancelled
Create and publish a Docker image / provenance (push) Has been cancelled
test / Analyze results (push) Has been cancelled
* Fix: Correctly restore ACL inheritance state When restoring a file or directory on Windows, the `IsInherited` property of its Access Control Entries (ACEs) was always being set to `False`, even if the ACEs were inherited in the original backup. This was caused by the restore process calling the `SetNamedSecurityInfo` API without providing context about the object's inheritance policy. By default, this API applies the provided Discretionary Access Control List (DACL) as an explicit set of permissions, thereby losing the original inheritance state. This commit fixes the issue by inspecting the `Control` flags of the saved Security Descriptor during restore. Based on whether the `SE_DACL_PROTECTED` flag is present, the code now adds the appropriate `PROTECTED_DACL_SECURITY_INFORMATION` or `UNPROTECTED_DACL_SECURITY_INFORMATION` flag to the `SetNamedSecurityInfo` API call. By providing this crucial inheritance context, the Windows API can now correctly reconstruct the ACL, ensuring the `IsInherited` status of each ACE is preserved as it was at the time of backup. * Fix: Correctly restore ACL inheritance flags This commit resolves an issue where the ACL inheritance state (`IsInherited` property) was not being correctly restored for files and directories on Windows. The root cause was that the `SECURITY_INFORMATION` flags used in the `SetNamedSecurityInfo` API call contained both the `PROTECTED_DACL_SECURITY_INFORMATION` and `UNPROTECTED_DACL_SECURITY_INFORMATION` flags simultaneously. When faced with this conflicting information, the Windows API defaulted to the more restrictive `PROTECTED` behavior, incorrectly disabling inheritance on restored items. The fix modifies the `setNamedSecurityInfoHigh` function to first clear all existing inheritance-related flags from the `securityInfo` bitmask. It then adds the single, correct flag (`PROTECTED` or `UNPROTECTED`) based on the `SE_DACL_PROTECTED` control bit from the original, saved Security Descriptor. This ensures that the API receives unambiguous instructions, allowing it to correctly preserve the inheritance state as it was at the time of backup. The accompanying test case for ACL inheritance now passes with this change. * Fix inheritance flag handling in low-privilege security descriptor restore When restoring files without admin privileges, the IsInherited property of Access Control Entries (ACEs) was not being preserved correctly. The low-privilege restore path (setNamedSecurityInfoLow) was using a static PROTECTED_DACL_SECURITY_INFORMATION flag, which always marked the restored DACL as explicitly set rather than inherited. This commit updates setNamedSecurityInfoLow to dynamically determine the correct inheritance flag based on the SE_DACL_PROTECTED control flag from the original security descriptor, matching the behavior of the high-privilege path (setNamedSecurityInfoHigh). Changes: - Update setNamedSecurityInfoLow to accept control flags parameter - Add logic to set either PROTECTED_DACL_SECURITY_INFORMATION or UNPROTECTED_DACL_SECURITY_INFORMATION based on the original SD - Add TestRestoreSecurityDescriptorInheritanceLowPrivilege to verify inheritance is correctly restored in low-privilege scenarios This ensures that both admin and non-admin restore operations correctly preserve the inheritance state of ACLs, maintaining the original permissions flow on child objects. Addresses review feedback on PR for issue #5427 * Refactor security flags into separate backup/restore variants Split highSecurityFlags into highBackupSecurityFlags and highRestoreSecurityFlags to avoid runtime bitwise operations. This makes the code cleaner and more maintainable by using appropriate flags for GET vs SET operations. Addresses review feedback on PR for issue #5427 --------- Co-authored-by: Aneesh Nireshwalia <anireshw@akamai.com> |
||
|---|---|---|
| .. | ||
| const.go | ||
| const_unix.go | ||
| const_windows.go | ||
| doc.go | ||
| ea_windows.go | ||
| ea_windows_test.go | ||
| file.go | ||
| file_unix.go | ||
| file_unix_test.go | ||
| file_windows.go | ||
| file_windows_test.go | ||
| fs_local.go | ||
| fs_local_test.go | ||
| fs_local_unix_test.go | ||
| fs_local_vss.go | ||
| fs_local_vss_test.go | ||
| fs_reader.go | ||
| fs_reader_command.go | ||
| fs_reader_command_test.go | ||
| fs_reader_test.go | ||
| fs_track.go | ||
| interface.go | ||
| mknod_unix.go | ||
| node.go | ||
| node_freebsd.go | ||
| node_linux.go | ||
| node_linux_test.go | ||
| node_noxattr.go | ||
| node_test.go | ||
| node_unix.go | ||
| node_unix_notlinux.go | ||
| node_unix_test.go | ||
| node_windows.go | ||
| node_windows_test.go | ||
| node_xattr.go | ||
| node_xattr_all_test.go | ||
| node_xattr_test.go | ||
| path_prefix.go | ||
| path_prefix_test.go | ||
| preallocate_darwin.go | ||
| preallocate_linux.go | ||
| preallocate_other.go | ||
| preallocate_test.go | ||
| priv.go | ||
| priv_windows.go | ||
| priv_windows_test.go | ||
| sd_windows.go | ||
| sd_windows_test.go | ||
| sd_windows_test_helpers.go | ||
| setflags_linux.go | ||
| setflags_linux_test.go | ||
| setflags_other.go | ||
| stat.go | ||
| stat_bsd.go | ||
| stat_darwin.go | ||
| stat_darwin_test.go | ||
| stat_test.go | ||
| stat_unix.go | ||
| stat_windows.go | ||
| stat_windows_test.go | ||
| vss.go | ||
| vss_windows.go | ||