mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: file selection when disallowed on macOS (#38557)

Browse source
This commit is contained in:
Shelley Vohr 2023-06-05 14:08:10 +02:00 • committed by GitHub
parent 905aad9cb6
commit 8d689c565a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
shell/browser/ui/file_dialog_mac.mm
View file

@ -281,11 +281,29 @@ void ReadDialogPathsWithBookmarks(NSOpenPanel* dialog,
std::vector<base::FilePath>* paths, std::vector<base::FilePath>* paths,
std::vector<std::string>* bookmarks) { std::vector<std::string>* bookmarks) {
NSArray* urls = [dialog URLs]; NSArray* urls = [dialog URLs];
for (NSURL* url in urls) for (NSURL* url in urls) {
if ([url isFileURL]) { if (![url isFileURL])
paths->emplace_back(base::SysNSStringToUTF8([url path])); continue;
bookmarks->push_back(GetBookmarkDataFromNSURL(url));
NSString* path = [url path];
// There's a bug in macOS where despite a request to disallow file
// selection, files/packages can be selected. If file selection
// was disallowed, drop any files selected. See crbug.com/1357523.
if (![dialog canChooseFiles]) {
BOOL is_directory;
BOOL exists =
[[NSFileManager defaultManager] fileExistsAtPath:path
isDirectory:&is_directory];
BOOL is_package =
[[NSWorkspace sharedWorkspace] isFilePackageAtPath:path];
if (!exists || !is_directory || is_package)
continue;
} }
paths->emplace_back(base::SysNSStringToUTF8(path));
bookmarks->push_back(GetBookmarkDataFromNSURL(url));
}
} }
void ReadDialogPaths(NSOpenPanel* dialog, std::vector<base::FilePath>* paths) { void ReadDialogPaths(NSOpenPanel* dialog, std::vector<base::FilePath>* paths) {