diff options
author | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 07:19:11 +0000 |
---|---|---|
committer | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-30 07:19:11 +0000 |
commit | 046062e82159edaeedbbf244731a4d306902d016 (patch) | |
tree | a08e8309b22aa1a45955735dda35ee7c83d2d9de /base/file_util_win.cc | |
parent | 2082cb3dbf0e611b109909fca14be2e217087970 (diff) | |
download | chromium_src-046062e82159edaeedbbf244731a4d306902d016.zip chromium_src-046062e82159edaeedbbf244731a4d306902d016.tar.gz chromium_src-046062e82159edaeedbbf244731a4d306902d016.tar.bz2 |
Revert 51231 - Loosen permission on extension temp dir when a flag is used.
Issue 35198 can not be reproduced locally. To enable users to do experiments, three command line flags are added to chrome:
--issue35198-crxdir-browser: Have the browser process create the directory in which the extension will be unzipped.
--issue35198-logging: Enable log messages from directory creation in the utility process to be moved to the browser process.
--issue35198-permission: Use the most permissive file permissions possible on the extension unpack directory.
BUG=35198
TEST=manual
Review URL: http://codereview.chromium.org/2802018
TBR=skerner@chromium.org
Review URL: http://codereview.chromium.org/2861039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_win.cc')
-rw-r--r-- | base/file_util_win.cc | 73 |
1 files changed, 3 insertions, 70 deletions
diff --git a/base/file_util_win.cc b/base/file_util_win.cc index 74db90cd..8a15370 100644 --- a/base/file_util_win.cc +++ b/base/file_util_win.cc @@ -63,56 +63,6 @@ bool DevicePathToDriveLetterPath(const FilePath& device_path, return true; } -// Build a security descriptor with the weakest possible file permissions. -bool InitLooseSecurityDescriptor(SECURITY_ATTRIBUTES *sa, - SECURITY_DESCRIPTOR *sd) { - DWORD last_error; - - if (!InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION)) { - last_error = GetLastError(); - LOG(ERROR) << "InitializeSecurityDescriptor failed: GetLastError() = " - << last_error; - return false; - } - - if (!SetSecurityDescriptorDacl(sd, - TRUE, // bDaclPresent: Add one to |sd|. - NULL, // pDacl: NULL means allow all access. - FALSE // bDaclDefaulted: Not defaulted. - )) { - last_error = GetLastError(); - LOG(ERROR) << "SetSecurityDescriptorDacl() failed: GetLastError() = " - << last_error; - return false; - } - - if (!SetSecurityDescriptorGroup(sd, - NULL, // pGroup: No no primary group. - FALSE // bGroupDefaulted: Not defaulted. - )) { - last_error = GetLastError(); - LOG(ERROR) << "SetSecurityDescriptorGroup() failed: GetLastError() = " - << last_error; - return false; - } - - if (!SetSecurityDescriptorSacl(sd, - FALSE, // bSaclPresent: No SACL. - NULL, - FALSE - )) { - last_error = GetLastError(); - LOG(ERROR) << "SetSecurityDescriptorSacl() failed: GetLastError() = " - << last_error; - return false; - } - - sa->nLength = sizeof(SECURITY_ATTRIBUTES); - sa->lpSecurityDescriptor = sd; - sa->bInheritHandle = TRUE; - return true; -} - } // namespace std::wstring GetDirectoryFromPath(const std::wstring& path) { @@ -600,19 +550,7 @@ bool CreateTemporaryFileInDir(const FilePath& dir, bool CreateTemporaryDirInDir(const FilePath& base_dir, const FilePath::StringType& prefix, - FilePath* new_dir, - bool loosen_permissions) { - SECURITY_ATTRIBUTES sa; - SECURITY_DESCRIPTOR sd; - - LPSECURITY_ATTRIBUTES directory_security_attributes = NULL; - if (loosen_permissions) { - if (InitLooseSecurityDescriptor(&sa, &sd)) - directory_security_attributes = &sa; - else - LOG(ERROR) << "Failed to init security attributes, fall back to NULL."; - } - + FilePath* new_dir) { FilePath path_to_create; srand(static_cast<uint32>(time(NULL))); @@ -627,8 +565,7 @@ bool CreateTemporaryDirInDir(const FilePath& base_dir, new_dir_name.append(IntToWString(rand() % kint16max)); path_to_create = path_to_create.Append(new_dir_name); - if (::CreateDirectory(path_to_create.value().c_str(), - directory_security_attributes)) + if (::CreateDirectory(path_to_create.value().c_str(), NULL)) break; count++; } @@ -638,7 +575,6 @@ bool CreateTemporaryDirInDir(const FilePath& base_dir, } *new_dir = path_to_create; - return true; } @@ -648,10 +584,7 @@ bool CreateNewTempDirectory(const FilePath::StringType& prefix, if (!GetTempDir(&system_temp_dir)) return false; - return CreateTemporaryDirInDir(system_temp_dir, - prefix, - new_temp_path, - false); + return CreateTemporaryDirInDir(system_temp_dir, prefix, new_temp_path); } bool CreateDirectory(const FilePath& full_path) { |