Chromium Code Reviews| Index: base/test/test_file_util_win.cc |
| diff --git a/base/test/test_file_util_win.cc b/base/test/test_file_util_win.cc |
| index d546c228455f71cb10bb168ffd68bfda85bc333e..0d336105af618f3a1cf4ffbc17cd825c610ff497 100644 |
| --- a/base/test/test_file_util_win.cc |
| +++ b/base/test/test_file_util_win.cc |
| @@ -4,16 +4,19 @@ |
| #include "base/test/test_file_util.h" |
| -#include <windows.h> |
| #include <aclapi.h> |
| #include <shlwapi.h> |
| #include <stddef.h> |
| +#include <wchar.h> |
| +#include <windows.h> |
| +#include <memory> |
| #include <vector> |
| #include "base/files/file_path.h" |
| #include "base/files/file_util.h" |
| #include "base/logging.h" |
| +#include "base/memory/ptr_util.h" |
| #include "base/strings/string_split.h" |
| #include "base/threading/platform_thread.h" |
| #include "base/win/scoped_handle.h" |
| @@ -27,42 +30,6 @@ struct PermissionInfo { |
| ACL dacl; |
| }; |
| -// Deny |permission| on the file |path|, for the current user. |
| -bool DenyFilePermission(const FilePath& path, DWORD permission) { |
| - PACL old_dacl; |
| - PSECURITY_DESCRIPTOR security_descriptor; |
| - if (GetNamedSecurityInfo(const_cast<wchar_t*>(path.value().c_str()), |
| - SE_FILE_OBJECT, |
| - DACL_SECURITY_INFORMATION, NULL, NULL, &old_dacl, |
| - NULL, &security_descriptor) != ERROR_SUCCESS) { |
| - return false; |
| - } |
| - |
| - EXPLICIT_ACCESS change; |
| - change.grfAccessPermissions = permission; |
| - change.grfAccessMode = DENY_ACCESS; |
| - change.grfInheritance = 0; |
| - change.Trustee.pMultipleTrustee = NULL; |
| - change.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; |
| - change.Trustee.TrusteeForm = TRUSTEE_IS_NAME; |
| - change.Trustee.TrusteeType = TRUSTEE_IS_USER; |
| - change.Trustee.ptstrName = const_cast<wchar_t*>(L"CURRENT_USER"); |
| - |
| - PACL new_dacl; |
| - if (SetEntriesInAcl(1, &change, old_dacl, &new_dacl) != ERROR_SUCCESS) { |
| - LocalFree(security_descriptor); |
| - return false; |
| - } |
| - |
| - DWORD rc = SetNamedSecurityInfo(const_cast<wchar_t*>(path.value().c_str()), |
| - SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, |
| - NULL, NULL, new_dacl, NULL); |
| - LocalFree(security_descriptor); |
| - LocalFree(new_dacl); |
| - |
| - return rc == ERROR_SUCCESS; |
| -} |
| - |
| // Gets a blob indicating the permission information for |path|. |
| // |length| is the length of the blob. Zero on failure. |
| // Returns the blob pointer, or NULL on failure. |
| @@ -109,6 +76,14 @@ bool RestorePermissionInfo(const FilePath& path, void* info, size_t length) { |
| return rc == ERROR_SUCCESS; |
| } |
| +template <class T> |
| +std::unique_ptr<T[]> ToCStr(const std::basic_string<T>& str) { |
|
Peter Kasting
2016/07/28 20:09:49
Don't templatize this. Use "std::wstring" directl
WC Leung
2016/08/01 18:03:06
Done.
|
| + size_t size = str.size() + 1; |
| + std::unique_ptr<T[]> ptr = base::MakeUnique<T[]>(size); |
| + wcsncpy(ptr.get(), str.c_str(), size); |
| + return ptr; |
| +} |
| + |
| } // namespace |
| bool DieFileDie(const FilePath& file, bool recurse) { |
| @@ -149,6 +124,42 @@ bool EvictFileFromSystemCache(const FilePath& file) { |
| return true; |
| } |
| +// Deny |permission| on the file |path|, for the current user. |
| +bool DenyFilePermission(const FilePath& path, DWORD permission) { |
| + PACL old_dacl; |
| + PSECURITY_DESCRIPTOR security_descriptor; |
| + |
| + std::unique_ptr<TCHAR[]> path_ptr = ToCStr(path.value()); |
| + if (GetNamedSecurityInfo(path_ptr.get(), SE_FILE_OBJECT, |
| + DACL_SECURITY_INFORMATION, nullptr, nullptr, |
| + &old_dacl, nullptr, |
| + &security_descriptor) != ERROR_SUCCESS) { |
| + return false; |
| + } |
| + |
| + std::unique_ptr<TCHAR[]> current_user = ToCStr(std::wstring(L"CURRENT_USER")); |
| + EXPLICIT_ACCESS new_access = { |
| + permission, |
| + DENY_ACCESS, |
| + 0, |
| + {nullptr, NO_MULTIPLE_TRUSTEE, TRUSTEE_IS_NAME, TRUSTEE_IS_USER, |
| + current_user.get()}}; |
| + |
| + PACL new_dacl; |
| + if (SetEntriesInAcl(1, &new_access, old_dacl, &new_dacl) != ERROR_SUCCESS) { |
| + LocalFree(security_descriptor); |
| + return false; |
| + } |
| + |
| + DWORD rc = SetNamedSecurityInfo(path_ptr.get(), SE_FILE_OBJECT, |
| + DACL_SECURITY_INFORMATION, nullptr, nullptr, |
| + new_dacl, nullptr); |
| + LocalFree(security_descriptor); |
| + LocalFree(new_dacl); |
| + |
| + return rc == ERROR_SUCCESS; |
| +} |
| + |
| // Checks if the volume supports Alternate Data Streams. This is required for |
| // the Zone Identifier implementation. |
| bool VolumeSupportsADS(const FilePath& path) { |