Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[fuchsia] fdio_service_connect no longer provides rights which we need #39374

Merged
merged 1 commit into from
Feb 3, 2023
Merged

[fuchsia] fdio_service_connect no longer provides rights which we need #39374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions shell/platform/fuchsia/flutter/component_v1.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ ComponentV1::ComponentV1(

// Clone and check if client is servicing the directory.
directory_ptr_->Clone(fuchsia::io::OpenFlags::DESCRIBE |
fuchsia::io::OpenFlags::RIGHT_READABLE |
fuchsia::io::OpenFlags::RIGHT_WRITABLE,
fuchsia::io::OpenFlags::CLONE_SAME_RIGHTS,
cloned_directory_ptr_.NewRequest());

cloned_directory_ptr_.events().OnOpen = [this](zx_status_t status,
Expand All @@ -234,8 +233,11 @@ ComponentV1::ComponentV1(
for (auto& dir_str : other_dirs) {
fuchsia::io::DirectoryHandle dir;
auto request = dir.NewRequest().TakeChannel();
auto status = fdio_service_connect_at(directory_ptr_.channel().get(),
dir_str, request.release());
auto status = fdio_open_at(
directory_ptr_.channel().get(), dir_str,
static_cast<uint32_t>(fuchsia::io::OpenFlags::DIRECTORY |
fuchsia::io::OpenFlags::RIGHT_READABLE),
request.release());
if (status == ZX_OK) {
outgoing_dir_->AddEntry(
dir_str, std::make_unique<vfs::RemoteDir>(dir.TakeChannel()));
Expand Down
10 changes: 6 additions & 4 deletions shell/platform/fuchsia/flutter/component_v2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,7 @@ ComponentV2::ComponentV2(

// Clone and check if client is servicing the directory.
directory_ptr_->Clone(fuchsia::io::OpenFlags::DESCRIBE |
fuchsia::io::OpenFlags::RIGHT_READABLE |
fuchsia::io::OpenFlags::RIGHT_WRITABLE,
fuchsia::io::OpenFlags::CLONE_SAME_RIGHTS,
cloned_directory_ptr_.NewRequest());

// Collect our standard set of directories along with directories that are
Expand All @@ -291,8 +290,11 @@ ComponentV2::ComponentV2(
for (auto& dir_str : other_dirs) {
fuchsia::io::DirectoryHandle dir;
auto request = dir.NewRequest().TakeChannel();
auto status = fdio_service_connect_at(directory_ptr_.channel().get(),
dir_str.c_str(), request.release());
auto status = fdio_open_at(
directory_ptr_.channel().get(), dir_str.c_str(),
static_cast<uint32_t>(fuchsia::io::OpenFlags::DIRECTORY |
fuchsia::io::OpenFlags::RIGHT_READABLE),
request.release());
if (status == ZX_OK) {
outgoing_dir_->AddEntry(
dir_str.c_str(),
Expand Down